diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-08-19 17:47:51 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-08-19 17:47:51 +0200 |
| commit | 7e2e4de1a42e37234cf5d5a692573a8426bec4ca (patch) | |
| tree | d33b2db75ed555e0184f7d9ae2f843f96ebffe63 /modules | |
| parent | modules/direnv/pre-cache: Also use the nixpkgs rev as cache key (diff) | |
| download | nixos-config-7e2e4de1a42e37234cf5d5a692573a8426bec4ca.zip | |
There was no real reason to still have `npins` around. I just kept it
because of historical reasons.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/by-name/di/direnv/module.nix | 3 | ||||
| -rw-r--r-- | modules/by-name/ni/nix/module.nix | 2 | ||||
| -rw-r--r-- | modules/by-name/ni/nixos-shell/module.nix | 2 | ||||
| -rw-r--r-- | modules/by-name/qu/qutebrowser/module.nix | 2 | ||||
| -rw-r--r-- | modules/by-name/ve/version/module.nix | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/modules/by-name/di/direnv/module.nix b/modules/by-name/di/direnv/module.nix index 55a694cf..baa0d954 100644 --- a/modules/by-name/di/direnv/module.nix +++ b/modules/by-name/di/direnv/module.nix @@ -16,8 +16,7 @@ }: let cfg = config.soispha.programs.direnv; - devshells = sources.loadFlake "devshells"; - nixpkgs = sources.loadFlake "nixpkgs"; + inherit (sources) devshells nixpkgs; pre-cache = pkgs.runCommand "pre-cache.sh" {} '' cat "${./pre-cache.sh}" > $out diff --git a/modules/by-name/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix index 7caa8a8e..b7e64989 100644 --- a/modules/by-name/ni/nix/module.nix +++ b/modules/by-name/ni/nix/module.nix @@ -19,7 +19,7 @@ externalDependencies, ... }: let - nixpkgs = sources.loadFlake "nixpkgs"; + inherit (sources) nixpkgs; cfg = config.soispha.nix; in { diff --git a/modules/by-name/ni/nixos-shell/module.nix b/modules/by-name/ni/nixos-shell/module.nix index 3556a98b..1a0190c8 100644 --- a/modules/by-name/ni/nixos-shell/module.nix +++ b/modules/by-name/ni/nixos-shell/module.nix @@ -15,7 +15,7 @@ ... }: let cfg = config.soispha.nixos-shell; - nixpkgs = sources.loadFlake "nixpkgs"; + inherit (sources) nixpkgs; in { options.soispha.nixos-shell = { enable = lib.mkEnableOption "nixos-shell"; diff --git a/modules/by-name/qu/qutebrowser/module.nix b/modules/by-name/qu/qutebrowser/module.nix index 51c1b239..d7689793 100644 --- a/modules/by-name/qu/qutebrowser/module.nix +++ b/modules/by-name/qu/qutebrowser/module.nix @@ -80,7 +80,7 @@ in { config = lib.mkIf cfg.enable { home-manager.users.soispha = { disabledModules = [ - "${sources.sources.home-manager}/modules/programs/qutebrowser.nix" + "${sources.home-manager}/modules/programs/qutebrowser.nix" ]; imports = [ ./module.hm.nix diff --git a/modules/by-name/ve/version/module.nix b/modules/by-name/ve/version/module.nix index 28328d1d..d666695d 100644 --- a/modules/by-name/ve/version/module.nix +++ b/modules/by-name/ve/version/module.nix @@ -15,7 +15,7 @@ }: let cfg = config.soispha.version; - nixpkgs = sources.loadFlake "nixpkgs"; + inherit (sources) nixpkgs; in { options.soispha.version = { enable = lib.mkEnableOption "storing the git revision in /etc/nixpkgs-git-revision"; |