more progress on custom options config

modules/hosts/kitagawa/kitagawa.nix

@@ -8,15 +8,17 @@
   };
 
   flake.nixosModules.kitagawa = { config, pkgs, ... }: {
-    system.stateVersion = "26.05";
+    info = {
+      hostName = "kitagawa";
+      stateVersion = "26.05";
+    };
 
-    networking.hostName = "kitagawa";
-
-    imports = with self.nixosModules; [
-      ly
-      niri
-      noctalia
-    ];
+    components = {
+      bootLoader = "limine";
+      displayManager = "ly";
+      windowManagers = "niri";
+      shells = "noctalia";
+    };
 
     features = {
       nixos = {
@@ -39,7 +41,30 @@
             enable = true;
             spicetify.enable = true;
           };
+          kitty.enable = true;
+          vscode.enable = true;
+          floorp.enable = true;
+          equibop.enable = true;
+          remmina.enable = true;
         };
+
+        extraPackages = with pkgs; [
+          github-desktop
+          moonlight-qt
+        ];
+
+        extraUserPackages = with pkgs; [
+          obsidian
+          thunderbird
+          jetbrains.clion
+          jetbrains.idea
+          proton-vpn
+          ente-auth
+          signal-desktop
+          xarchiver
+          kdePackages.filelight
+          loupe
+        ];
       };
     };
 
@@ -64,11 +89,6 @@
       openFirewall = true;
     };
 
-    environment.systemPackages = with pkgs; [
-      github-desktop
-      moonlight-qt
-    ];
-
     hardware.steam-hardware.enable = true;
 
     boot = {
@@ -80,26 +100,13 @@
         "rd.udev.log_level=3"
         "rd.systemd.show_status=auto"
       ];
-
-      loader.limine = {
-        enable = true;
-        maxGenerations = 10;
-      };
     };
   };
 
   flake.homeModules.kitagawa = { config, pkgs, inputs, lib, ... }: {
-    home.stateVersion = "26.05";
-
     imports = with self.homeModules; [
       global
       graphics
-      niri
-      noctalia
-      vscode
-      kitty
-      floorp
-      equibop
     ];
 
     /*
@@ -109,42 +116,6 @@
     ];
     */
 
-    home.packages = with pkgs; [
-      obsidian
-      thunderbird
-      jetbrains.clion
-      jetbrains.idea
-      proton-vpn
-      ente-auth
-      signal-desktop
-      xarchiver
-      kdePackages.filelight
-      remmina
-      freerdp
-      loupe
-    ];
-
-    stylix.targets.floorp.profileNames = [ "default" ];
-
-    dconf.settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-    };
-
-    gtk = {
-      enable = true;
-      gtk3.bookmarks = [
-        "file:///home/grey/nixos NixOS"
-        "file:///home/grey/Downloads Downloads"
-        "file:///home/grey/Documents Documents"
-        "file:///home/grey/Pictures Pictures"
-        "file:///home/grey/Music Music"
-        "file:///home/grey/Videos Videos"
-        "file:/// Root"
-      ];
-    };
-
     services.udiskie = {
       enable = true;
       settings = {
@@ -192,17 +163,5 @@
         };
       };
     };
-
-    /*
-    home.activation = {
-      linkRemminaPresets = lib.hm.dag.entryAfter ["writeBoundary"] ''
-        #!/bin/bash
-        if [ -d /home/grey/.local/share/remmina ]; then
-          rm -rf /home/grey/.local/share/remmina
-        fi
-        ln -s /home/grey/nixos/assets/dotfiles/remmina-presets /home/grey/.local/share/remmina
-      '';
-    };
-    */
   };
 }