From 5f00d66445c353f94dad1460c8f2a61ff7aac56d Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Fri, 11 Aug 2023 23:22:44 +0300 Subject: [PATCH] treewide: stop using inputs' and self' --- home/default.nix | 2 +- home/editors/helix/default.nix | 4 ++-- home/profiles/default.nix | 9 ++------- home/programs/eww/default.nix | 4 ++-- home/programs/games.nix | 4 ++-- home/programs/spicetify.nix | 10 ++++++++-- home/shell/nix.nix | 4 ++-- home/wayland/anyrun.nix | 7 ++++--- home/wayland/default.nix | 4 ++-- home/wayland/hyprland/default.nix | 4 ++-- hosts/default.nix | 20 ++------------------ hosts/io/default.nix | 2 +- hosts/kiiro/hardware-configuration.nix | 8 +++++++- modules/core.nix | 2 +- modules/desktop.nix | 8 +++----- modules/linux-enable-ir-emitter.nix | 4 ++-- modules/nix.nix | 5 ++--- modules/power-switcher.nix | 4 ++-- 18 files changed, 47 insertions(+), 58 deletions(-) diff --git a/home/default.nix b/home/default.nix index d3a469b9..f78c6843 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,7 +2,7 @@ home = { username = "mihai"; homeDirectory = "/home/mihai"; - stateVersion = "20.09"; + stateVersion = "23.11"; extraOutputsToInstall = ["doc" "devdoc"]; }; diff --git a/home/editors/helix/default.nix b/home/editors/helix/default.nix index e6382a03..4dc8d1c9 100644 --- a/home/editors/helix/default.nix +++ b/home/editors/helix/default.nix @@ -1,5 +1,5 @@ { - inputs', + inputs, pkgs, ... }: { @@ -7,7 +7,7 @@ programs.helix = { enable = true; - package = inputs'.helix.packages.default.overrideAttrs (self: { + package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: { makeWrapperArgs = with pkgs; self.makeWrapperArgs or [] diff --git a/home/profiles/default.nix b/home/profiles/default.nix index 7eec6a33..6cd5c3ac 100644 --- a/home/profiles/default.nix +++ b/home/profiles/default.nix @@ -4,20 +4,15 @@ module_args, ... }: let - sharedModules = withSystem "x86_64-linux" ({ - inputs', - self', - ... - }: [ + sharedModules = [ ../. ../shell module_args - {_module.args = {inherit inputs' self';};} inputs.anyrun.homeManagerModules.default inputs.nix-index-db.hmModules.nix-index inputs.spicetify-nix.homeManagerModule inputs.hyprland.homeManagerModules.default - ]); + ]; homeImports = { "mihai@io" = [./io] ++ sharedModules; diff --git a/home/programs/eww/default.nix b/home/programs/eww/default.nix index 3a252288..0f210c5a 100644 --- a/home/programs/eww/default.nix +++ b/home/programs/eww/default.nix @@ -2,13 +2,13 @@ config, pkgs, lib, - inputs', + inputs, ... }: let dependencies = with pkgs; [ cfg.package - inputs'.gross.packages.gross + inputs.gross.packages.${pkgs.system}.gross config.wayland.windowManager.hyprland.package bash diff --git a/home/programs/games.nix b/home/programs/games.nix index 8733bad9..fca0a4a9 100644 --- a/home/programs/games.nix +++ b/home/programs/games.nix @@ -1,12 +1,12 @@ { pkgs, - inputs', + inputs, ... }: # games { home.packages = with pkgs; [ - inputs'.nix-gaming.packages.osu-lazer-bin + inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin gamescope prismlauncher # (lutris.override {extraPkgs = p: [p.libnghttp2];}) diff --git a/home/programs/spicetify.nix b/home/programs/spicetify.nix index be190906..1dbff4a2 100644 --- a/home/programs/spicetify.nix +++ b/home/programs/spicetify.nix @@ -1,7 +1,11 @@ -{inputs', ...}: { +{ + inputs, + pkgs, + ... +}: { # themable spotify programs.spicetify = let - spicePkgs = inputs'.spicetify-nix.packages.default; + spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default; in { enable = true; @@ -11,6 +15,8 @@ enabledExtensions = with spicePkgs.extensions; [ fullAppDisplay + history + genre hidePodcasts shuffle ]; diff --git a/home/shell/nix.nix b/home/shell/nix.nix index ee11f25a..87662198 100644 --- a/home/shell/nix.nix +++ b/home/shell/nix.nix @@ -1,6 +1,6 @@ { pkgs, - self', + self, ... }: # nix tooling @@ -9,7 +9,7 @@ alejandra deadnix statix - self'.packages.repl + self.packages.${pkgs.system}.repl ]; programs.direnv = { diff --git a/home/wayland/anyrun.nix b/home/wayland/anyrun.nix index bc031a01..ea6d29f7 100644 --- a/home/wayland/anyrun.nix +++ b/home/wayland/anyrun.nix @@ -1,5 +1,6 @@ { - inputs', + pkgs, + inputs, osConfig, ... }: { @@ -7,14 +8,14 @@ enable = true; config = { - plugins = with inputs'.anyrun.packages; [ + plugins = with inputs.anyrun.packages.${pkgs.system}; [ applications randr rink shell symbols translate - inputs'.anyrun-nixos-options.packages.default + inputs.anyrun-nixos-options.packages.${pkgs.system}.default ]; width.fraction = 0.3; diff --git a/home/wayland/default.nix b/home/wayland/default.nix index 33adb057..350ed75c 100644 --- a/home/wayland/default.nix +++ b/home/wayland/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, - inputs', + inputs, ... }: # Wayland config @@ -28,7 +28,7 @@ in { programs.eww-hyprland = { enable = true; - package = inputs'.eww.packages.eww-wayland; + package = inputs.eww.packages.${pkgs.system}.eww-wayland; }; home.packages = with pkgs; [ diff --git a/home/wayland/hyprland/default.nix b/home/wayland/hyprland/default.nix index d6fc77e7..b30bb7a9 100644 --- a/home/wayland/hyprland/default.nix +++ b/home/wayland/hyprland/default.nix @@ -1,5 +1,5 @@ { - inputs', + inputs, lib, pkgs, ... @@ -9,7 +9,7 @@ home.packages = with pkgs; [ jaq xorg.xprop - inputs'.hyprland-contrib.packages.grimblast + inputs.hyprland-contrib.packages.${pkgs.system}.grimblast ]; # start swayidle as part of hyprland, not sway diff --git a/hosts/default.nix b/hosts/default.nix index eb544eda..68069b10 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,22 +1,13 @@ { inputs, - withSystem, sharedModules, homeImports, ... }: { - flake.nixosConfigurations = withSystem "x86_64-linux" ({ - system, - self', - inputs', - ... - }: let - systemInputs = {_module.args = {inherit self' inputs';};}; + flake.nixosConfigurations = let inherit (inputs.nixpkgs.lib) nixosSystem; in { io = nixosSystem { - inherit system; - modules = [ ./io @@ -27,14 +18,11 @@ ../modules/lanzaboote.nix ../modules/power-switcher.nix {home-manager.users.mihai.imports = homeImports."mihai@io";} - systemInputs ] ++ sharedModules; }; rog = nixosSystem { - inherit system; - modules = [ ./rog @@ -45,21 +33,17 @@ ../modules/lanzaboote.nix ../modules/power-switcher.nix {home-manager.users.mihai.imports = homeImports."mihai@rog";} - systemInputs ] ++ sharedModules; }; kiiro = nixosSystem { - inherit system; - modules = [ ./kiiro {home-manager.users.mihai.imports = homeImports.server;} - systemInputs ] ++ sharedModules; }; - }); + }; } diff --git a/hosts/io/default.nix b/hosts/io/default.nix index 92eace34..4afe9a50 100644 --- a/hosts/io/default.nix +++ b/hosts/io/default.nix @@ -13,7 +13,7 @@ }; boot = { - binfmt.emulatedSystems = ["aarch64-linux"]; + binfmt.emulatedSystems = ["aarch64-linux" "riscv64-linux"]; # load modules on boot kernelModules = ["acpi_call"]; diff --git a/hosts/kiiro/hardware-configuration.nix b/hosts/kiiro/hardware-configuration.nix index 96d30d16..4056c032 100644 --- a/hosts/kiiro/hardware-configuration.nix +++ b/hosts/kiiro/hardware-configuration.nix @@ -1,7 +1,11 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{modulesPath, ...}: { +{ + modulesPath, + lib, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -27,4 +31,6 @@ device = "/dev/disk/by-uuid/7B5A-471E"; fsType = "vfat"; }; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/core.nix b/modules/core.nix index d44f3716..66532018 100644 --- a/modules/core.nix +++ b/modules/core.nix @@ -43,7 +43,7 @@ security.sudo.wheelNeedsPassword = false; # don't touch this - system.stateVersion = lib.mkDefault "20.09"; + system.stateVersion = lib.mkDefault "23.11"; time.timeZone = lib.mkDefault "Europe/Bucharest"; diff --git a/modules/desktop.nix b/modules/desktop.nix index bf56d8ee..bf0015d8 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -1,13 +1,12 @@ { - inputs', pkgs, self, - self', + inputs, ... }: { boot.plymouth = { enable = true; - themePackages = [self'.packages.catppuccin-plymouth]; + themePackages = [self.packages.${pkgs.system}.catppuccin-plymouth]; theme = "catppuccin-mocha"; }; @@ -95,7 +94,6 @@ }; nix = { - # package = inputs'.nix-super.packages.nix; settings = { substituters = [ "https://nix-gaming.cachix.org" @@ -139,7 +137,7 @@ # keyboard remapping kmonad = { enable = true; - package = inputs'.kmonad.packages.default; + package = inputs.kmonad.packages.${pkgs.system}.default; keyboards = { one2mini = { device = "/dev/input/by-id/usb-Ducky_Ducky_One2_Mini_RGB_DK-V1.17-190813-event-kbd"; diff --git a/modules/linux-enable-ir-emitter.nix b/modules/linux-enable-ir-emitter.nix index 4af4db28..18fa1355 100644 --- a/modules/linux-enable-ir-emitter.nix +++ b/modules/linux-enable-ir-emitter.nix @@ -1,7 +1,7 @@ { config, lib, - self', + self, pkgs, ... }: @@ -18,7 +18,7 @@ in { package = mkOption { type = types.package; - default = pkgs.linux-enable-ir-emitter or self'.packages.linux-enable-ir-emitter; + default = pkgs.linux-enable-ir-emitter or self.packages.${pkgs.system}.linux-enable-ir-emitter; defaultText = "pkgs.linux-enable-ir-emitter"; description = '' Package to use for the Linux Enable IR Emitter service. diff --git a/modules/nix.nix b/modules/nix.nix index 7c555f2b..2aa40a02 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -2,15 +2,14 @@ config, pkgs, inputs, - inputs', lib, - self, ... }: { environment.systemPackages = [ # we need git for flakes pkgs.git - inputs'.nh.packages.default + # cool helper for rebuild + inputs.nh.packages.${pkgs.system}.default ]; environment.variables.FLAKE = "/home/mihai/Documents/code/dotfiles"; diff --git a/modules/power-switcher.nix b/modules/power-switcher.nix index ad1a6c08..a1e8cca0 100644 --- a/modules/power-switcher.nix +++ b/modules/power-switcher.nix @@ -1,12 +1,12 @@ { pkgs, lib, - inputs', + inputs, ... }: # run certain commands depending whether the system is on AC or on battery let - programs = lib.makeBinPath [inputs'.hyprland.packages.default]; + programs = lib.makeBinPath [inputs.hyprland.packages.${pkgs.system}.default]; unplugged = pkgs.writeShellScript "unplugged" '' export PATH=$PATH:${programs}