From af6df248316ea2dc4bdec8f9520ea377f52c3d2a Mon Sep 17 00:00:00 2001
From: martyTF <marty@marty.tf>
Date: Thu, 18 Dec 2025 12:52:29 +0100
Subject: [PATCH] all your home manager are belong to us

---
 hosts/marty-latitude.nix                  | 13 +++++++
 hosts/marty-pc.nix                        | 13 +++++++
 hosts/marty-server.nix                    | 13 +++++++
 modules/development/default.nix           |  4 --
 modules/home.nix                          |  1 +
 modules/terminal/default.nix              | 14 +++++++
 modules/terminal/kitty.nix                | 22 +++++++++++
 modules/window_manager/bar.nix            | 26 -------------
 modules/window_manager/default.nix        |  6 +--
 modules/window_manager/hyprland.nix       | 40 +++++++++++++++++++
 modules/window_manager/launcher.nix       | 13 -------
 modules/window_manager/walker.nix         | 23 +++++++++++
 modules/window_manager/waybar.nix         | 22 +++++++++++
 modules/window_manager/window_manager.nix | 47 -----------------------
 system/import_system.nix                  |  1 -
 system/terminal.nix                       |  9 -----
 16 files changed, 164 insertions(+), 103 deletions(-)
 create mode 100644 modules/terminal/default.nix
 create mode 100644 modules/terminal/kitty.nix
 delete mode 100644 modules/window_manager/bar.nix
 create mode 100644 modules/window_manager/hyprland.nix
 delete mode 100644 modules/window_manager/launcher.nix
 create mode 100644 modules/window_manager/walker.nix
 create mode 100644 modules/window_manager/waybar.nix
 delete mode 100644 modules/window_manager/window_manager.nix
 delete mode 100644 system/terminal.nix

diff --git a/hosts/marty-latitude.nix b/hosts/marty-latitude.nix
index 6ae4789..8afba0c 100644
--- a/hosts/marty-latitude.nix
+++ b/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;
diff --git a/hosts/marty-pc.nix b/hosts/marty-pc.nix
index dea9d14..ad01246 100644
--- a/hosts/marty-pc.nix
+++ b/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;
diff --git a/hosts/marty-server.nix b/hosts/marty-server.nix
index 2b08512..aae0053 100644
--- a/hosts/marty-server.nix
+++ b/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;
diff --git a/modules/development/default.nix b/modules/development/default.nix
index e17afa2..34c5a08 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -6,10 +6,6 @@
 }:
 
 {
-  development = {
-    vscodium.enable = true;
-    git.enable = true;
-  };
   imports = [
     ./git.nix
     ./vscodium.nix
diff --git a/modules/home.nix b/modules/home.nix
index d8c1656..8f61a28 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -84,6 +84,7 @@
   imports = [
     ./window_manager
     ./development
+    ./terminal
     inputs.walker.homeManagerModules.default
 
   ];
diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix
new file mode 100644
index 0000000..172004f
--- /dev/null
+++ b/modules/terminal/default.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./kitty.nix
+    ./vscodium.nix
+
+  ];
+}
diff --git a/modules/terminal/kitty.nix b/modules/terminal/kitty.nix
new file mode 100644
index 0000000..58ce344
--- /dev/null
+++ b/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;
+      };
+    };
+  };
+}
diff --git a/modules/window_manager/bar.nix b/modules/window_manager/bar.nix
deleted file mode 100644
index f29a875..0000000
--- a/modules/window_manager/bar.nix
+++ /dev/null
@@ -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;
-    };
-  };
-}
diff --git a/modules/window_manager/default.nix b/modules/window_manager/default.nix
index af42df2..422a202 100644
--- a/modules/window_manager/default.nix
+++ b/modules/window_manager/default.nix
@@ -7,8 +7,8 @@
 
 {
   imports = [
-    ./window_manager.nix
-    ./launcher.nix
-    ./bar.nix
+    ./hyprland.nix
+    ./walker.nix
+    ./waybar.nix
   ];
 }
diff --git a/modules/window_manager/hyprland.nix b/modules/window_manager/hyprland.nix
new file mode 100644
index 0000000..16c9cad
--- /dev/null
+++ b/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";
+  };
+}
diff --git a/modules/window_manager/launcher.nix b/modules/window_manager/launcher.nix
deleted file mode 100644
index 46a2757..0000000
--- a/modules/window_manager/launcher.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-
-{
-  programs.walker = {
-    enable = true;
-    runAsService = true;
-  };
-}
diff --git a/modules/window_manager/walker.nix b/modules/window_manager/walker.nix
new file mode 100644
index 0000000..cb42bf4
--- /dev/null
+++ b/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;
+      };
+    };
+  };
+}
diff --git a/modules/window_manager/waybar.nix b/modules/window_manager/waybar.nix
new file mode 100644
index 0000000..383b64b
--- /dev/null
+++ b/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;
+      };
+    };
+  };
+}
diff --git a/modules/window_manager/window_manager.nix b/modules/window_manager/window_manager.nix
deleted file mode 100644
index db26c66..0000000
--- a/modules/window_manager/window_manager.nix
+++ /dev/null
@@ -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";
-}
diff --git a/system/import_system.nix b/system/import_system.nix
index 196ba87..7ee9903 100644
--- a/system/import_system.nix
+++ b/system/import_system.nix
@@ -9,7 +9,6 @@
   imports = [
     ./boot.nix
     ./shell.nix
-    ./terminal.nix
     ./networking.nix
     ./dm.nix
   ];
diff --git a/system/terminal.nix b/system/terminal.nix
deleted file mode 100644
index 4de526d..0000000
--- a/system/terminal.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment = {
-    systemPackages = with pkgs; [
-      kitty
-    ];
-  };
-}