diff options
| author | Soispha <soispha@vhack.eu> | 2023-04-10 10:58:33 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-05-09 19:30:01 +0200 |
| commit | 04e269a1e25ff8b75099f2113edee728d04429a8 (patch) | |
| tree | f2fed6efd2938fb86b98681655395f1e42cbd790 /flake | |
| parent | Feat(flake): Activate content-addressed derivations (diff) | |
| download | nixos-config-04e269a1e25ff8b75099f2113edee728d04429a8.tar.gz nixos-config-04e269a1e25ff8b75099f2113edee728d04429a8.zip | |
Fix(treewide): Remove the reference to inputs
Diffstat (limited to 'flake')
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 1240d5e4..d8663f85 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -1,9 +1,22 @@ # vim: ts=2 { - inputs, system, pkgs, sysLib, + yambar_cpu, + yambar_memory, + strip_js_comments, + river_init_lesser, + grades, + shell-library, + # external deps + user_js, + neovim_config, + snap-sync, + # modules + impermanence, + home-manager, + agenix, ... }: let homeManagerConfig = { @@ -13,18 +26,13 @@ users.soispha = import ../../home-manager; extraSpecialArgs = { inherit - inputs pkgs sysLib # extra information - - system - ; - inherit - (inputs) + system # bins - + yambar_cpu yambar_memory strip_js_comments @@ -32,12 +40,12 @@ grades shell-library # external deps - + user_js neovim_config snap-sync # modules - + impermanence ; }; @@ -45,21 +53,18 @@ }; ageConfig = import ../../secrets; defaultModules = [ - inputs.agenix.nixosModules.default + agenix.nixosModules.default ageConfig - # inputs.home-manager.nixosModules.home-manager - (import "${inputs.home-manager}/nixos") + home-manager.nixosModules.home-manager + #(import "${inputs.home-manager}/nixos") # inputs.impermanence.nixosModules.home-manager.impermanence homeManagerConfig ]; in { - tiamat = inputs.nixpkgs.lib.nixosSystem { + tiamat = pkgs.lib.nixosSystem { inherit system; - specialArgs = - pkgs.lib.recursiveUpdate inputs - sysLib; modules = [ ../../hosts/tiamat/configuration.nix @@ -67,30 +72,23 @@ in { ++ defaultModules; }; - mammun = inputs.nixpkgs.lib.nixosSystem { + mammun = pkgs.lib.nixosSystem { inherit system; - specialArgs = - pkgs.lib.recursiveUpdate inputs - sysLib; modules = [ ../../hosts/mammun/configuration.nix ] ++ defaultModules; }; - lahmu = inputs.nixpkgs.lib.nixosSystem { + lahmu = pkgs.lib.nixosSystem { inherit system; - specialArgs = - pkgs.lib.recursiveUpdate inputs - sysLib; modules = [ ../../hosts/lahmu/configuration.nix ] ++ defaultModules; }; - spawn = inputs.nixpkgs.lib.nixosSystem { - specialArgs = inputs; + spawn = pkgs.lib.nixosSystem { modules = [../../hosts/spawn/configuration.nix]; }; } |