all your home manager are belong to us

hosts/marty-latitude.nix

@@ -13,6 +13,19 @@
     hostName = "marty-latitude";
   };
 
+  development = {
+    vscodium.enable = true;
+    git.enable = true;
+  };
+  terminal = {
+    kitty.enable = true;
+  };
+  window_manager = {
+    hyprland.enable = true;
+    waybar.enable = true;
+    walker.enable = true;
+  };
+
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     useGlobalPkgs = true;

hosts/marty-pc.nix

@@ -21,6 +21,19 @@
     };
   };
 
+  development = {
+    vscodium.enable = true;
+    git.enable = true;
+  };
+  terminal = {
+    kitty.enable = true;
+  };
+  window_manager = {
+    hyprland.enable = true;
+    waybar.enable = true;
+    walker.enable = true;
+  };
+
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     useGlobalPkgs = true;

hosts/marty-server.nix

@@ -21,6 +21,19 @@
     };
   };
 
+  development = {
+    vscodium.enable = false;
+    git.enable = true;
+  };
+  terminal = {
+    kitty.enable = false;
+  };
+  window_manager = {
+    hyprland.enable = false;
+    waybar.enable = false;
+    walker.enable = false;
+  };
+
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     useGlobalPkgs = true;

modules/development/default.nix

@@ -6,10 +6,6 @@
 }:
 
 {
-  development = {
-    vscodium.enable = true;
-    git.enable = true;
-  };
   imports = [
     ./git.nix
     ./vscodium.nix

modules/home.nix

@@ -84,6 +84,7 @@
   imports = [
     ./window_manager
     ./development
+    ./terminal
     inputs.walker.homeManagerModules.default
 
   ];

modules/terminal/default.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./kitty.nix
+    ./vscodium.nix
+
+  ];
+}

modules/terminal/kitty.nix

@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    terminal = {
+      kitty.enable = lib.mkEnableOption "enable git";
+    };
+  };
+
+  config = lib.mkIf config.terminal.kitty.enable {
+    programs = {
+      kitty = {
+        enable = true;
+      };
+    };
+  };
+}

modules/window_manager/bar.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  enable_waybar =
-    if config.networking.hostName == "marty-pc" then
-      true
-    else if config.networking.hostName == "marty-latitude" then
-      true
-    else if config.networking.hostName == "marty-server" then
-      false
-    else
-      false;
-in
-
-{
-  programs = {
-    waybar = {
-      enable = true;
-    };
-  };
-}

modules/window_manager/default.nix

@@ -7,8 +7,8 @@
 
 {
   imports = [
-    ./window_manager.nix
+    ./hyprland.nix
-    ./launcher.nix
+    ./walker.nix
-    ./bar.nix
+    ./waybar.nix
   ];
 }

modules/window_manager/hyprland.nix

@@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    window_manager = {
+      hyprland.enable = lib.mkEnableOption "enable hyprland";
+    };
+  };
+
+  config = lib.mkIf config.window_manager.hyprland.enable {
+    xdg.portal = {
+      enable = true;
+      configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
+      extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
+    };
+    programs = {
+      hyprlock = {
+        enable = true;
+      };
+    };
+    wayland.windowManager.hyprland = {
+      enable = true;
+      settings = {
+        exec-once = [
+        ];
+        "$mod" = "SUPER";
+        bind = [
+          "$mod, D, exec, walker"
+          "$mod, return, exec, kitty"
+        ];
+      };
+    };
+    home.sessionVariables.NIXOS_OZONE_WL = "1";
+  };
+}

modules/window_manager/launcher.nix

@@ -1,13 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-
-{
-  programs.walker = {
-    enable = true;
-    runAsService = true;
-  };
-}

modules/window_manager/walker.nix

@@ -0,0 +1,23 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
+
+{
+  options = {
+    window_manager = {
+      walker.enable = lib.mkEnableOption "enable walker";
+    };
+  };
+
+  config = lib.mkIf config.window_manager.walker.enable {
+    programs = {
+      walker = {
+        enable = true;
+        runAsService = true;
+      };
+    };
+  };
+}

modules/window_manager/waybar.nix

@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    window_manager = {
+      waybar.enable = lib.mkEnableOption "enable waybar";
+    };
+  };
+
+  config = lib.mkIf config.window_manager.waybar.enable {
+    programs = {
+      waybar = {
+        enable = true;
+      };
+    };
+  };
+}

modules/window_manager/window_manager.nix

@@ -1,47 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  enable_hyprland =
-    if config.networking.hostName == "marty-pc" then
-      true
-    else if config.networking.hostName == "marty-latitude" then
-      true
-    else if config.networking.hostName == "marty-server" then
-      false
-    else
-      false;
-in
-
-{
-  xdg.portal = {
-    enable = true;
-    configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
-    extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
-  };
-  programs = {
-    kitty = {
-      enable = true;
-    };
-    hyprlock = {
-      enable = true;
-    };
-  };
-  wayland.windowManager.hyprland = {
-    enable = true;
-    settings = {
-      exec-once = [
-      ];
-      "$mod" = "SUPER";
-      bind = [
-        "$mod, D, exec, walker"
-        "$mod, return, exec, kitty"
-      ];
-    };
-  };
-  home.sessionVariables.NIXOS_OZONE_WL = "1";
-}

system/import_system.nix

@@ -9,7 +9,6 @@
   imports = [
     ./boot.nix
     ./shell.nix
-    ./terminal.nix
     ./networking.nix
     ./dm.nix
   ];

system/terminal.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment = {
-    systemPackages = with pkgs; [
-      kitty
-    ];
-  };
-}