about summary refs log tree commit diff stats
path: root/flake/nixosConfigurations
diff options
context:
space:
mode:
Diffstat (limited to 'flake/nixosConfigurations')
-rw-r--r--flake/nixosConfigurations/default.nix52
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];
   };
 }