README.md

@@ -48,7 +48,6 @@
   - [ichiyo](hosts/ichiyo/): Laptop (ichiyo) specific configuration
   - [violet](hosts/violet/): Server (violet) specific configuration
   - [dandelion](hosts/dandelion/): Server (dandelion) specific configuration
-  - [lily](hosts/lily/): Router (lily) specific configuration
 - [modules](modules): modularized NixOS configurations
   - [core](modules/core/): core NixOS configuration
   - [homes](modules/home/): my [Home-Manager](https://github.com/nix-community/home-manager) config

flake.nix

@@ -9,7 +9,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
+  
     hyprland = {
       url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -32,113 +32,74 @@
     nix-gaming.url = "github:fufexan/nix-gaming";
   };
 
-  outputs =
+  outputs = { self, nixpkgs, catppuccin, agenix, ...} @ inputs:
-    {
+  let
-      self,
+    overlays = import ./overlays/default.nix;
-      nixpkgs,
+    username = "liv";
-      catppuccin,
+    system = "x86_64-linux";
-      agenix,
+    pkgs = import nixpkgs {
-      ...
+      inherit system;
-    }@inputs:
+    };
-    let
+    lib = nixpkgs.lib;
-      overlays = import ./overlays/default.nix;
+  in
-      username = "liv";
+  {
-      system = "x86_64-linux";
+    overlays.default = overlays.addition;
-      pkgs = import nixpkgs {
+    nixosConfigurations = {
+      desktop = nixpkgs.lib.nixosSystem {
         inherit system;
+        modules = [(
+          import ./hosts/desktop
+        )];
+        specialArgs = { host="desktop"; inherit self inputs username ; };
+      };
+      sakura = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          (import ./hosts/sakura)
+          agenix.nixosModules.default
+        ];
+        specialArgs = { host="sakura"; inherit self inputs username ; };
+      };
+      yoshino = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          (import ./hosts/yoshino)
+          agenix.nixosModules.default
+        ];
+        specialArgs = { host="yoshino"; inherit self inputs username ; };
+      };
+      ichiyo = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          (import ./hosts/ichiyo)
+          agenix.nixosModules.default
+        ];
+        specialArgs = { host="ichiyo"; inherit self inputs username ; };
+      };
+      violet = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          (import ./hosts/violet)
+          agenix.nixosModules.default
+        ];
+        specialArgs = { host="violet"; inherit self inputs username; };
+      };
+      dandelion = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          (import ./hosts/dandelion)
+          agenix.nixosModules.default
+        ];
+        specialArgs = { host="dandelion"; inherit self inputs username; };
       };
-      lib = nixpkgs.lib;
-    in
-    {
-      overlays.default = overlays.addition;
-      nixosConfigurations = {
-        desktop = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            (import ./hosts/desktop)
-          ];
-          specialArgs = {
-            host = "desktop";
-            inherit self inputs username;
-          };
-        };
-        sakura = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            (import ./hosts/sakura)
-            agenix.nixosModules.default
-          ];
-          specialArgs = {
-            host = "sakura";
-            inherit self inputs username;
-          };
-        };
-        yoshino = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            (import ./hosts/yoshino)
-            agenix.nixosModules.default
-          ];
-          specialArgs = {
-            host = "yoshino";
-            inherit self inputs username;
-          };
-        };
-        ichiyo = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            (import ./hosts/ichiyo)
-            agenix.nixosModules.default
-          ];
-          specialArgs = {
-            host = "ichiyo";
-            inherit self inputs username;
-          };
-        };
-        violet = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            (import ./hosts/violet)
-            agenix.nixosModules.default
-          ];
-          specialArgs = {
-            host = "violet";
-            inherit self inputs username;
-          };
-        };
-        dandelion = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            (import ./hosts/dandelion)
-            agenix.nixosModules.default
-          ];
-          specialArgs = {
-            host = "dandelion";
-            inherit self inputs username;
-          };
-        };
-        lily = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            (import ./hosts/lily)
-            agenix.nixosModules.default
-          ];
-          specialArgs = {
-            host = "lily";
-            inherit self inputs username;
-          };
-        };
 
-        vm = nixpkgs.lib.nixosSystem {
+      vm = nixpkgs.lib.nixosSystem {
-          inherit system;
+        inherit system;
-          modules = [
+        modules = [(
-            (import ./hosts/vm)
+          import ./hosts/vm
-          ];
+        )];
-          specialArgs = {
+        specialArgs = { host="vm"; inherit self inputs username ; };
-            host = "vm";
-            inherit self inputs username;
-          };
-        };
       };
     };
+  };
 }