From d18e1476dd19d0be4b33872e44b4924a2214906e Mon Sep 17 00:00:00 2001 From: voidarc Date: Tue, 7 Jul 2026 13:53:09 +0100 Subject: [PATCH] realised how self' is supposed to work and removed all stdenv bullshit --- modules/empty.nix | 19 +++++++----- modules/features/gotify-desktop/default.nix | 28 ++++++------------ modules/features/hypr/default.nix | 26 +++++++---------- modules/features/kitty/default.nix | 32 +++++++++------------ modules/features/nvim/default.nix | 25 ++++------------ modules/features/otter-launcher/default.nix | 24 ++++++---------- modules/features/steam/default.nix | 15 +++++----- modules/features/zsh/default.nix | 11 +++---- 8 files changed, 73 insertions(+), 107 deletions(-) diff --git a/modules/empty.nix b/modules/empty.nix index ef034aa..85d01c1 100644 --- a/modules/empty.nix +++ b/modules/empty.nix @@ -1,18 +1,23 @@ { - self, - inputs, + wrappers, + self, + moduleWithSystem, ... }: { - flake.nixosModules.name = { + flake.nixosModules.name = moduleWithSystem ({ pkgs, - lib, + self', + inputs', ... - }: { + }: let + modules = with self.nixosModules; []; + in { + imports = modules; programs.name = { enable = true; - package = self.packages.${pkgs.stdenv.hostPlatform.system}.hello; + package = self'.packages.hello; }; - }; + }); perSystem = { pkgs, lib, diff --git a/modules/features/gotify-desktop/default.nix b/modules/features/gotify-desktop/default.nix index a3aa8ad..a0c1d14 100644 --- a/modules/features/gotify-desktop/default.nix +++ b/modules/features/gotify-desktop/default.nix @@ -1,21 +1,16 @@ { - self, - inputs, + wrappers, + moduleWithSystem, ... }: { - flake.nixosModules.gotify-desktop = { - pkgs, - lib, - ... - }: { - environment.systemPackages = [ - self.packages.${pkgs.stdenv.hostPlatform.system}.gotify-desktop + flake.nixosModules.gotify-desktop = moduleWithSystem ({self', ...}: { + environment.systemPackages = with self'.packages; [ + gotify-desktop ]; - }; + }); perSystem = { pkgs, - lib, - self', + inputs', ... }: { packages = { @@ -29,14 +24,9 @@ min_priority = 1 ''; in - inputs.wrappers.lib.wrapPackage ({ - config, - wlib, - lib, - ... - }: { + wrappers.lib.wrapPackage ({...}: { inherit pkgs; - package = inputs.gotify-desktop.packages.${pkgs.stdenv.hostPlatform.system}.default; + package = inputs'.gotify-desktop.default; flags = { "-c" = config-file; }; diff --git a/modules/features/hypr/default.nix b/modules/features/hypr/default.nix index 274d315..b2b7f91 100644 --- a/modules/features/hypr/default.nix +++ b/modules/features/hypr/default.nix @@ -1,11 +1,12 @@ { + wrappers, + moduleWithSystem, self, - inputs, ... }: { - flake.nixosModules.hyprland = { + flake.nixosModules.hyprland = moduleWithSystem ({ + self', pkgs, - lib, ... }: let modules = with self.nixosModules; [ @@ -16,25 +17,25 @@ imports = modules; programs.hyprland = { enable = true; - package = self.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + package = self'.packages.hyprland; }; services.xserver.enable = true; security.polkit.enable = true; environment.systemPackages = with pkgs; [ hyprlock - gsettings-desktop-schemas + gsettings-desktop-schemas ]; - }; + }); perSystem = { pkgs, - lib, self', + inputs', ... }: { packages = { - hyprland = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default.override { + hyprland = inputs'.hyprland.packages.default.override { runtimePackages = - inputs.hyprland.lib.defaultRuntimePkgs.${pkgs.stdenv.hostPlatform.system} + inputs'.hyprland.lib.defaultRuntimePkgs // { wpaperd = self'.packages.wpaperd; kitty = self'.packages.kitty; @@ -57,12 +58,7 @@ path = "${./wallpapers/topo3.png}" ''; in - inputs.wrappers.lib.wrapPackage ({ - config, - wlib, - lib, - ... - }: { + wrappers.lib.wrapPackage ({...}: { inherit pkgs; package = pkgs.wpaperd; flags = { diff --git a/modules/features/kitty/default.nix b/modules/features/kitty/default.nix index 4668a0a..012309a 100644 --- a/modules/features/kitty/default.nix +++ b/modules/features/kitty/default.nix @@ -1,30 +1,26 @@ { - self, - inputs, + wrappers, + moduleWithSystem, ... }: { - flake.nixosModules.kitty = { - pkgs, - lib, - ... - }: { - environment.systemPackages = [ - self.packages.${pkgs.stdenv.hostPlatform.system}.kitty - ]; - }; - perSystem = { - pkgs, - lib, - self', - ... - }: { + flake.nixosModules.kitty = moduleWithSystem ( + { + pkgs, + self', + }: { + environment.systemPackages = with self'.packages; [ + kitty + ]; + } + ); + perSystem = {pkgs, ...}: { packages.kitty = let fira-mono = pkgs.nerd-fonts.fira-mono; fontsConf = pkgs.makeFontsConf { fontDirectories = [fira-mono]; }; in - inputs.wrappers.wrappers.kitty.wrap { + wrappers.wrappers.kitty.wrap { inherit pkgs; environment = { "FONTCONFIG_FILE" = "${fontsConf}"; diff --git a/modules/features/nvim/default.nix b/modules/features/nvim/default.nix index 8824abf..8ece7fa 100644 --- a/modules/features/nvim/default.nix +++ b/modules/features/nvim/default.nix @@ -1,24 +1,11 @@ -{ - self, - inputs, - ... -}: { - flake.nixosModules.nvim = { - pkgs, - lib, - ... - }: { +{moduleWithSystem, ...}: { + flake.nixosModules.nvim = moduleWithSystem ({self', ...}: { programs.nvim = { enable = true; - package = self.packages.${pkgs.stdenv.hostPlatform.system}.nvim; + package = self'.packages.nvim; }; - }; - perSystem = { - pkgs, - lib, - self', - ... - }: { - packages.nvim = inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.default; + }); + perSystem = {inputs', ...}: { + packages.nvim = inputs'.nvim.packages.default; }; } diff --git a/modules/features/otter-launcher/default.nix b/modules/features/otter-launcher/default.nix index ea86855..190dbc8 100644 --- a/modules/features/otter-launcher/default.nix +++ b/modules/features/otter-launcher/default.nix @@ -1,21 +1,18 @@ { - self, - inputs, + wrappers, + moduleWithSystem, ... }: { - flake.nixosModules.otter-launcher = { - pkgs, - lib, - ... - }: { + flake.nixosModules.otter-launcher = moduleWithSystem ({self', ...}: { environment.systemPackages = [ - self.packages.${pkgs.stdenv.hostPlatform.system}.otter-launcher + self'.packages.otter-launcher ]; - }; + }); perSystem = { pkgs, lib, self', + inputs', ... }: { packages = { @@ -32,14 +29,9 @@ ${extra-config} ''; in - inputs.wrappers.lib.wrapPackage ({ - config, - wlib, - lib, - ... - }: { + wrappers.lib.wrapPackage ({...}: { inherit pkgs; - package = inputs.otter-launcher.packages.${pkgs.stdenv.hostPlatform.system}.default; + package = inputs'.otter-launcher.packages.default; runtimePkgs = with pkgs; [ fsel bluetui diff --git a/modules/features/steam/default.nix b/modules/features/steam/default.nix index a799f77..576e4c5 100644 --- a/modules/features/steam/default.nix +++ b/modules/features/steam/default.nix @@ -1,16 +1,15 @@ { - self, - inputs, + moduleWithSystem, ... }: { - flake.nixosModules.steam = { + flake.nixosModules.steam = moduleWithSystem ({ pkgs, - lib, + inputs', ... }: { # If buying isn't owning than piracy isn't stealing environment.systemPackages = [ - inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped + inputs'.sls-steam.packages.default ]; programs.steam = { enable = true; @@ -21,12 +20,12 @@ package = pkgs.steam.override { extraEnv = { LD_AUDIT = "${ - inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam + inputs'.sls-steam.packages.sls-steam }/library-inject.so:${ - inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam + inputs'.sls-steam.packages.sls-steam }/SLSsteam.so"; }; }; }; - }; + }); } diff --git a/modules/features/zsh/default.nix b/modules/features/zsh/default.nix index ab4b0a6..f0a0dee 100644 --- a/modules/features/zsh/default.nix +++ b/modules/features/zsh/default.nix @@ -1,16 +1,17 @@ { self, inputs, + moduleWithSystem, ... }: { - flake.nixosModules.zsh = { + flake.nixosModules.zsh = moduleWithSystem ({ pkgs, - lib, + self', ... }: { nixpkgs.overlays = [ (final: prev: { - zsh = self.packages.${pkgs.stdenv.hostPlatform.system}.zsh; + zsh = self'.packages.zsh; }) ]; programs.zsh = { @@ -22,7 +23,7 @@ histSize = 10000; }; users.defaultUserShell = pkgs.zsh; - }; + }); perSystem = { pkgs, lib, @@ -54,7 +55,7 @@ export EDITOR=nvim eval "$(${lib.getExe pkgs.devenv} hook zsh)" - eval "$(${lib.getExe self.packages.${pkgs.host.stdenv.hostPlatform.system}.ohMyPosh} init zsh)" + eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)" ${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin '';