2 files changed, 53 insertions, 40 deletions

diff --git a/flake.nix b/flake.nix
index 35fc36b2..4d35926f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,14 +84,14 @@
     yambar_cpu,
     grades,
     ...
-  } @ inputs: let
+  }: let
     sysLib = import ./lib {inherit pkgs shell-library;};
     system = "x86_64-linux";
-    pkgs = import inputs.nixpkgs {
+    pkgs = import nixpkgs {
       config = {
         contentAddressedByDefault = true;
         config.allowUnfreePredicate = pkg:
-          builtins.elem (inputs.nixpkgs.lib.getName pkg) [
+          builtins.elem (nixpkgs.lib.getName pkg) [
             "steam"
             "steam-original"
           ];
@@ -101,32 +101,47 @@
   in {
     nixosConfigurations = import ./flake/nixosConfigurations {
       inherit
-        inputs
         system
         pkgs
         sysLib
+        home-manager
+        agenix
+        impermanence
         river_init_lesser
         yambar_memory
         yambar_cpu
         grades
+        neovim_config
+        strip_js_comments
+        shell-library
+        user_js
+        snap-sync
         ;
     };
     packages."${system}" = {
       install = import ./bootstrap/install {
-        inherit pkgs;
-        inherit (inputs) shell-library;
+        inherit
+          pkgs
+          shell-library
+          ;
       };
       activate = import ./bootstrap/activate {
-        inherit pkgs;
-        inherit (inputs) shell-library;
+        inherit
+          pkgs
+          shell-library
+          ;
       };
       setup = import ./bootstrap/setup {
-        inherit pkgs;
-        inherit (inputs) shell-library;
+        inherit
+          pkgs
+          shell-library
+          ;
       };
       config_setup = import ./bootstrap/config_setup {
-        inherit pkgs;
-        inherit (inputs) shell-library;
+        inherit
+          pkgs
+          shell-library
+          ;
       };
     };
 
@@ -151,7 +166,7 @@
     };
     devShells."${system}" = {
       default = pkgs.mkShell {
-        packages = with pkgs; [nil alejandra statix inputs.ragenix.packages."${system}".default];
+        packages = with pkgs; [nil alejandra statix ragenix.packages."${system}".default];
       };
     };
   };
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];
   };
 }