3 files changed, 40 insertions, 144 deletions

diff --git a/flake.nix b/flake.nix
index dfb356d7..4b05e87d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,6 @@
     shell-library,
     ...
   } @ inputs: let
-    # pkgs = nixpkgs.legacyPackages.x86_64-linux;
     sysLib = import ./lib {inherit pkgs shell-library;};
     system = "x86_64-linux";
     pkgs = import inputs.nixpkgs {
@@ -67,44 +66,7 @@
       };
     };
   in {
-    nixosConfigurations.tiamat = nixpkgs.lib.nixosSystem {
-      inherit system;
-      specialArgs =
-        pkgs.lib.recursiveUpdate inputs
-        sysLib;
-      modules = [
-        ./hosts/tiamat/configuration.nix
-        agenix.nixosModules.default
-
-        home-manager.nixosModules.home-manager
-        {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.soispha = import ./home-manager;
-            extraSpecialArgs = {
-              inherit
-                pkgs
-                sysLib
-                strip_js_comments
-                user_js
-                system
-                neovim_config
-                impermanence
-                snap-sync
-                ;
-            };
-          };
-        }
-      ];
-    };
-
-    nixosConfigurations.mammun = self.outputs.nixosConfigurations.tiamat;
-    nixosConfigurations.spawn = nixpkgs.lib.nixosSystem {
-      specialArgs = inputs;
-      modules = [./hosts/spawn/configuration.nix];
-    };
-
+    nixosConfigurations = import ./flake/nixosConfigurations {inherit inputs system pkgs sysLib;};
     packages."${system}" = {
       install = import ./bootstrap/install {
         inherit pkgs;
diff --git a/flake/inputs/default.nix b/flake/inputs/default.nix
deleted file mode 100644
index d3300cad..00000000
--- a/flake/inputs/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{_}: {
-  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  home-manager = {
-    url = "github:nix-community/home-manager/master";
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  agenix = {
-    url = "github:ryantm/agenix";
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
-  impermanence = {
-    url = "github:nix-community/impermanence";
-  };
-
-  neovim_config = {
-    url = "git+https://codeberg.org/ene/neovim-config.git";
-    flake = false;
-  };
-
-  strip_js_comments = {
-    url = "git+https://codeberg.org/ene/strip_js_comments.git";
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
-  shell-library = {
-    url = "git+https://git.sils.li/ene/lib-sh.git";
-    flake = false;
-  };
-  user_js = {
-    url = "github:arkenfox/user.js";
-    flake = false;
-  };
-  snap-sync = {
-    url = "github:qubidt/snap-sync";
-    flake = false;
-  };
-}
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index e5aa8020..562222b7 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -1,78 +1,49 @@
-# vim: ts=2
 {
-  system,
   inputs,
+  system,
+  pkgs,
+  sysLib,
   ...
-}: let
-  sysLib = import ../../lib {
-    inherit pkgs;
-    inherit (inputs) shell-library;
-  };
-  lib = inputs.nixpkgs.lib.extend (_: _: {
-    inherit (sysLib) makeShellScriptWithLibrary;
-  });
-
-  inherit (inputs.nixpkgs.lib) nixosSystem;
-
-  pkgs = import inputs.nixpkgs {
+}: {
+  tiamat = inputs.nixpkgs.lib.nixosSystem {
     inherit system;
-    config = {
-      allowUnfreePredicate = pkg:
-        builtins.elem (lib.getName pkg) [
-          "steam"
-          "steam-original"
-        ];
-    };
-  };
-  homeManagerConfig = {
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-      users.soispha = import ./home-manager;
-      extraSpecialArgs = {
-        inherit pkgs;
-        inherit
-          (inputs)
-          user_js
-          system
-          neovim_config
-          impermanence
-          snap-sync
-          ;
-      };
-    };
-  };
-  defaultModules = [
-    inputs.agenix.nixosModules.default
+    specialArgs =
+      pkgs.lib.recursiveUpdate inputs
+      sysLib;
+    modules = [
+      ../../hosts/tiamat/configuration.nix
+      inputs.agenix.nixosModules.default
 
-    inputs.home-manager.nixosModules.home-manager
-    homeManagerConfig
-  ];
-in {
-  # full systems
-  tiamat = nixosSystem {
-    inherit system;
-    specialArgs = {inherit inputs pkgs;};
-    modules =
-      [
-        ./hosts/tiamat/configuration.nix
-      ]
-      ++ defaultModules;
-  };
-  mammun = nixosSystem {
-    inherit system;
-    specialArgs = {inherit inputs pkgs;};
-    modules =
-      [
-        ./hosts/mammun/configuration.nix
-      ]
-      ++ defaultModules;
+      inputs.home-manager.nixosModules.home-manager
+      {
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.soispha = import ../../home-manager;
+          extraSpecialArgs = {
+            inherit
+              pkgs
+              sysLib
+              ;
+
+            inherit
+              (inputs)
+              strip_js_comments
+              user_js
+              system
+              neovim_config
+              impermanence
+              snap-sync
+              ;
+          };
+        };
+      }
+    ];
   };
 
-  # minimal ones
-  spawn = nixosSystem {
-    inherit system;
+# mammun = self.outputs.nixosConfigurations.tiamat;
+  spawn = inputs.nixpkgs.lib.nixosSystem {
     specialArgs = inputs;
-    modules = [./hosts/spawn/configuration.nix];
+    modules = [../../hosts/spawn/configuration.nix];
   };
 }