refactor config layout

Author: debugloop

flake.nix

@@ -11,11 +11,11 @@
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    impermanence.url = "github:nix-community/impermanence";
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    impermanence.url = "github:nix-community/impermanence";
     niri-unstable = {
       url = "github:YaLTeR/niri/2761922210a6c92dc22bbc5c8dce8c3771b02a54";
       flake = false;
@@ -25,36 +25,21 @@
       inputs.niri-unstable.follows = "niri-unstable";
     };
     # neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
+    # private flakes
     gridx = {
       url = "git+ssh://[email protected]/debugloop/gridx";
       # url = "path:/home/danieln/code/gridx";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     wunschkonzert-install = {
       url = "git+ssh://[email protected]/debugloop/wunschkonzert-install";
+      # url = "path:/home/danieln/code/wunschkonzert-install";
     };
   };
 
-  outputs = inputs @ {
-    nixpkgs,
-    home-manager,
-    ...
-  }: {
+  outputs = inputs @ {nixpkgs, ...}: {
     formatter = {
-      x86_64-linux = nixpkgs.legacyPackages.${nixpkgs.system}.alejandra;
-    };
-    homeConfigurations = let
-      pkgs = nixpkgs.legacyPackages.${nixpkgs.system};
-    in {
-      "danieln" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        modules = [
-          ./home
-        ];
-        extraSpecialArgs = {
-          inherit inputs;
-        };
-      };
+      x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
     };
     nixosConfigurations = {
       simmons = nixpkgs.lib.nixosSystem {
@@ -67,17 +52,6 @@
           ./hosts/common
           ./hosts/common/laptops.nix
           ./hosts/simmons
-          ({...}: {
-            home-manager.users.danieln = (
-              {...}: {
-                imports = [
-                  ./home
-                  ./home/wayland
-                ];
-              }
-            );
-          })
-          inputs.niri.nixosModules.niri
         ];
       };
 
@@ -92,17 +66,12 @@
           ./hosts/common/laptops.nix
           ./hosts/lusus
           ({...}: {
-            home-manager.users.danieln = (
-              {...}: {
-                imports = [
-                  ./home
-                  ./home/wayland
-                  inputs.gridx.home-module
-                ];
-              }
-            );
+            home-manager.users.danieln = {
+              imports = [
+                inputs.gridx.home-module
+              ];
+            };
           })
-          inputs.niri.nixosModules.niri
         ];
       };
 
@@ -116,16 +85,6 @@
           ./hosts/common
           ./hosts/common/servers.nix
           ./hosts/hyperion
-          ({...}: {
-            home-manager.users.danieln = (
-              {...}: {
-                imports = [
-                  ./home
-                  ./home/headless.nix
-                ];
-              }
-            );
-          })
         ];
       };
     };

home/wayland/kitty.nix

@@ -10,8 +10,7 @@
       size = 12;
     };
     settings = {
-      symbol_map =
-        "U+23fb-U+23fe,U+2665,U+26a1,U+2b58,U+e000-U+e00a,U+e0a0-U+e0a2,U+e0a3,U+e0b0-U+e0b3,U+e0b4-U+e0c8,U+e0ca,U+e0cc-U+e0d7,U+e200-U+e2a9,U+e300-U+e3e3,U+e5fa-U+e6b5,U+e700-U+e7c5,U+ea60-U+ec1e,U+ed00-U+efc1,U+f000-U+f2ff,U+f300-U+f372,U+f400-U+f533,U+f500-U+fd46,U+f0001-U+f1af0,U+276c-U+2771,U+2500-U+259f,U+274C Symbols Nerd Font Mono";
+      symbol_map = "U+23fb-U+23fe,U+2665,U+26a1,U+2b58,U+e000-U+e00a,U+e0a0-U+e0a2,U+e0a3,U+e0b0-U+e0b3,U+e0b4-U+e0c8,U+e0ca,U+e0cc-U+e0d7,U+e200-U+e2a9,U+e300-U+e3e3,U+e5fa-U+e6b5,U+e700-U+e7c5,U+ea60-U+ec1e,U+ed00-U+efc1,U+f000-U+f2ff,U+f300-U+f372,U+f400-U+f533,U+f500-U+fd46,U+f0001-U+f1af0,U+276c-U+2771,U+2500-U+259f,U+274C Symbols Nerd Font Mono";
 
       # make the font slightly wider
       # modify_font = "cell_width 105%";

hosts/common/laptops.nix

@@ -1,8 +1,20 @@
 {
   pkgs,
   lib,
+  inputs,
   ...
 }: {
+  imports = [
+    inputs.niri.nixosModules.niri
+  ];
+
+  home-manager.users.danieln = {
+    imports = [
+      ../../home
+      ../../home/wayland
+    ];
+  };
+
   networking = {
     networkmanager = {
       enable = true;

hosts/common/servers.nix

@@ -1,4 +1,11 @@
 {lib, ...}: {
+  home-manager.users.danieln = {
+    imports = [
+      ../../home
+      ../../home/headless.nix
+    ];
+  };
+
   services = {
     prometheus.exporters = {
       node = {