From a5cd3713e7ddd2df333606994bf509103612e88e Mon Sep 17 00:00:00 2001
From: marc <marc@sastre.cat>
Date: Tue, 3 Dec 2024 20:03:23 +0100
Subject: [PATCH] Desktop environment refactor

---
 hosts/reykjavik/default.nix             |  6 +-
 modules/app/alacritty.nix               |  8 +--
 modules/app/firefox.nix                 |  8 +--
 modules/app/spotify.nix                 |  8 +--
 modules/desktop/desktop.nix             | 62 +----------------
 modules/desktop/env/grapheio.nix        | 91 +++++++++++++++++++++++++
 modules/desktop/greeter/greetd.nix      | 50 ++++++++++++++
 modules/desktop/{ => tools}/eww.nix     | 18 ++---
 modules/desktop/{ => tools}/polybar.nix | 20 +++---
 modules/desktop/{ => tools}/rofi.nix    | 17 +++--
 modules/desktop/{ => wm}/hyprland.nix   | 56 ++-------------
 modules/desktop/{ => wm}/i3.nix         |  8 ++-
 modules/dev/devenv.nix                  |  4 +-
 modules/editors/emacs.nix               |  8 +--
 modules/system/bluetooth.nix            |  2 +-
 modules/system/pass.nix                 |  8 +--
 16 files changed, 210 insertions(+), 164 deletions(-)
 create mode 100644 modules/desktop/env/grapheio.nix
 create mode 100644 modules/desktop/greeter/greetd.nix
 rename modules/desktop/{ => tools}/eww.nix (70%)
 rename modules/desktop/{ => tools}/polybar.nix (75%)
 rename modules/desktop/{ => tools}/rofi.nix (67%)
 rename modules/desktop/{ => wm}/hyprland.nix (72%)
 rename modules/desktop/{ => wm}/i3.nix (97%)

diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix
index 61db599..82a3e23 100644
--- a/hosts/reykjavik/default.nix
+++ b/hosts/reykjavik/default.nix
@@ -68,10 +68,8 @@ in
     # - Desktop ----------------------------------
     desktop = {
       inherit wallpaper;
-      enable = true;
-      laptop = true;
-      hyprland = {
-        enable = true;
+      env.grapheio.enable = true;
+      wm.hyprland = {
         kb_layout = "es,gr";
       };
     };
diff --git a/modules/app/alacritty.nix b/modules/app/alacritty.nix
index f2310c2..1c59a0b 100644
--- a/modules/app/alacritty.nix
+++ b/modules/app/alacritty.nix
@@ -2,8 +2,8 @@
 
 let
   cfg = config.samfelag.modules.app.alacritty;
-  i3Cfg = config.samfelag.modules.desktop.i3;
-  hyprCfg = config.samfelag.modules.desktop.hyprland;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
+  hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
 in
 {
   options.samfelag.modules.app.alacritty = {
@@ -57,12 +57,12 @@ in
     white =   "0x${config.colorScheme.palette.base07}"
     '';
 
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
       "${i3Cfg.mod}+Return"       =  "exec ${pkgs.alacritty}/bin/alacritty";
       "${i3Cfg.mod}+Shift+Return" =  "exec ${pkgs.alacritty}/bin/alacritty -t floating-term";
     };
 
-    samfelag.modules.desktop.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
+    samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
       "${hyprCfg.mod}, Return, exec, ${pkgs.alacritty}/bin/alacritty"
       "${hyprCfg.mod} SHIFT, Return, exec, [float] ${pkgs.alacritty}/bin/alacritty"
     ];
diff --git a/modules/app/firefox.nix b/modules/app/firefox.nix
index fbd812a..b1905c8 100644
--- a/modules/app/firefox.nix
+++ b/modules/app/firefox.nix
@@ -2,8 +2,8 @@
 
 let
   cfg = config.samfelag.modules.app.firefox;
-  i3Cfg = config.samfelag.modules.desktop.i3;
-  hyprCfg = config.samfelag.modules.desktop.hyprland;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
+  hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
 in
 {
   options.samfelag.modules.app.firefox = {
@@ -27,11 +27,11 @@ in
       };
     };
 
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
       "${i3Cfg.mod}+Shift+i" =  "exec ${pkgs.firefox}/bin/firefox";
     };
 
-    samfelag.modules.desktop.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
+    samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
       "${hyprCfg.mod} SHIFT, i, exec, ${pkgs.firefox}/bin/firefox"
     ];
   };
diff --git a/modules/app/spotify.nix b/modules/app/spotify.nix
index 320883a..b369213 100644
--- a/modules/app/spotify.nix
+++ b/modules/app/spotify.nix
@@ -2,8 +2,8 @@
 
 let
   cfg = config.samfelag.modules.app.spotify;
-  i3Cfg = config.samfelag.modules.desktop.i3;
-  hyprCfg = config.samfelag.modules.desktop.hyprland;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
+  hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
 in
 {
   options.samfelag.modules.app.spotify = {
@@ -14,11 +14,11 @@ in
       spotify
     ];
 
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
       "${i3Cfg.mod}+Shift+m" =  "exec ${pkgs.spotify}/bin/spotify";
     };
 
-    samfelag.modules.desktop.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
+    samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
       "${hyprCfg.mod} SHIFT, m, exec, ${pkgs.spotify}/bin/spotify"
     ];
   };
diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix
index e1df891..5b1b3ba 100644
--- a/modules/desktop/desktop.nix
+++ b/modules/desktop/desktop.nix
@@ -3,71 +3,11 @@
 with lib;
 let
   cfg = config.samfelag.modules.desktop;
-  laptopPkgs = with pkgs; [
-  ];
 in
 {
   options.samfelag.modules.desktop = {
-
-    enable = mkEnableOption "desktop environment";
-
-    laptop = mkOption {
-      description = "Enable features for a laptop (trackpad, battery, etc...)";
-      type = types.bool;
-      default = false;
-    };
+    # Define generic desktop options to be used by the environments
 
     wallpaper = my.mkOpt' types.path ../../data/wallpaper/flors "Path to wallpaper(s)";
   };
-
-  config = mkIf cfg.enable {
-
-    # - Packages ---------------------------------
-
-    environment.systemPackages = with pkgs; [
-      pamixer
-      i3lock-blur
-      brightnessctl
-      playerctl
-      feh
-    ] ++ optionals cfg.laptop laptopPkgs;
-
-    # - Audio ------------------------------------
-
-    services = {
-      pipewire = {
-        enable = true;
-      };
-    };
-
-    # - Compositor -------------------------------
-
-    services.picom.enable = true;
-
-    # - Modules ----------------------------------
-
-    samfelag.modules = {
-
-      app.alacritty.enable = true;
-      app.firefox.enable = true;
-
-      desktop.rofi.enable = true;
-      desktop.polybar.enable = true;
-
-      desktop.i3 = {
-        laptop = cfg.laptop;
-
-        extraStartup = [
-          { command = "systemctl --user restart polybar"; always = true; notification = false; }
-          { command = "feh --bg-fill -B \"#${config.colorScheme.palette.base00}\" -z --no-fehbg ${cfg.wallpaper}"; always = true; notification = false; }
-        ];
-
-        extraKeybindings = {
-          "${cfg.i3.mod}+space" = "exec $HOME/.config/rofi/menus/launcher/launcher.sh";
-          "${cfg.i3.mod}+End" = "exec $HOME/.config/rofi/menus/powermenu/powermenu.sh";
-        };
-      };
-
-    };
-  };
 }
diff --git a/modules/desktop/env/grapheio.nix b/modules/desktop/env/grapheio.nix
new file mode 100644
index 0000000..6bc8cc8
--- /dev/null
+++ b/modules/desktop/env/grapheio.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;
+let
+  cfg = config.samfelag.modules.desktop.env.grapheio;
+in
+{
+  options.samfelag.modules.desktop.env.grapheio = {
+    enable = mkEnableOption "Grapheio desktop environment - hyprland based";
+  };
+
+  config = mkIf cfg.enable {
+
+    # - Packages ---------------------------------
+
+    environment.systemPackages = with pkgs; [
+      # - System ---------------------------------
+      # - Audio
+      alsa-utils
+      playerctl
+      brightnessctl
+
+      # - Appearance -----------------------------
+      # - Cursor
+      inputs.hyprcursor-rose-pine.packages.${pkgs.system}.default
+      # - Wallpaper
+      hyprpaper
+    ];
+
+    # - Audio ------------------------------------
+
+    services = {
+      pipewire = {
+        enable = true;
+      };
+    };
+
+    # - Hyprpaper --------------------------------
+    hm.xdg.configFile."hypr/hyprpaper.conf".text = ''
+      preload = ${config.samfelag.modules.desktop.wallpaper}
+      wallpaper = ,${config.samfelag.modules.desktop.wallpaper}
+    '';
+
+    # - Cursor -----------------------------------
+    hm.home.pointerCursor = {
+      gtk.enable = true;
+      package = pkgs.rose-pine-cursor;
+      name = "BreezeX Cursor";
+      size = 24;
+    };
+
+    hm.gtk = {
+      enable = true;
+      cursorTheme = {
+        package = pkgs.rose-pine-cursor;
+        name = "BreezeX Cursor";
+      };
+    };
+
+    # - Modules ----------------------------------
+
+    samfelag.modules = {
+
+      desktop = {
+        # Window Manager
+        wm.hyprland.enable = true;
+
+        # Greeter (login screen)
+        greeter.greetd = {
+          enable = true;
+          wm_cmd = "Hyprland";
+        };
+
+        tools = {
+          # Status bars
+          eww.enable = true;
+          # Launcher
+          rofi.enable = true;
+        };
+      };
+
+      system.kanata.enable = true;
+
+      app = {
+        alacritty.enable = true;
+        firefox.enable = true;
+      };
+
+    };
+  };
+}
diff --git a/modules/desktop/greeter/greetd.nix b/modules/desktop/greeter/greetd.nix
new file mode 100644
index 0000000..d3b66a0
--- /dev/null
+++ b/modules/desktop/greeter/greetd.nix
@@ -0,0 +1,50 @@
+{ inputs, config, lib, pkgs, ... }:
+
+let
+  cfg = config.samfelag.modules.desktop.greeter.greetd;
+in {
+
+  options.samfelag.modules.desktop.greeter.greetd = with lib; {
+    enable = mkEnableOption "Greetd based greeter";
+    wm_cmd = lib.my.mkOpt' types.str "" "Window manager command";
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      greetd.gtkgreet
+      cage
+    ];
+
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${pkgs.cage}/bin/cage -d -s ${pkgs.greetd.gtkgreet}/bin/gtkgreet -- -c ${cfg.wm_cmd} -s /etc/greetd/greetd.css";
+          user = config.user.name;
+        };
+      };
+    };
+
+    environment.etc."greetd/environments".text = ''
+      ${cfg.wm_cmd}
+    '';
+
+    environment.etc."greetd/greetd.css".text = ''
+      window {
+          background-image: url("file://${config.samfelag.modules.desktop.wallpaper}");
+          background-size: cover;
+          background-position: center;
+          font-family: Iosevka;
+          color: #${config.colorScheme.palette.base00};
+      }
+
+      box#body {
+          background-color: #${config.colorScheme.palette.base06};
+          opacity: 0.75;
+          border-radius: 10px;
+          padding: 50px;
+      }
+    '';
+  };
+}
diff --git a/modules/desktop/eww.nix b/modules/desktop/tools/eww.nix
similarity index 70%
rename from modules/desktop/eww.nix
rename to modules/desktop/tools/eww.nix
index 3356ee7..3268e89 100644
--- a/modules/desktop/eww.nix
+++ b/modules/desktop/tools/eww.nix
@@ -1,14 +1,14 @@
 { config, lib, pkgs, ... }:
 
 let 
-  cfg = config.samfelag.modules.desktop.eww;
-  hyprCfg = config.samfelag.modules.desktop.hyprland;
+  cfg = config.samfelag.modules.desktop.tools.eww;
+  hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
   # Paths
   paths = {
   };
 in {
 
-  options.samfelag.modules.desktop.eww = {
+  options.samfelag.modules.desktop.tools.eww = {
     enable = lib.mkEnableOption "eww";
   };
 
@@ -23,11 +23,11 @@ in {
       socat
     ];
 
-    hm.xdg.configFile."eww/eww.yuck".source = ../../config/eww/eww.yuck;
-    hm.xdg.configFile."eww/eww.scss".source = ../../config/eww/eww.scss;
-    hm.xdg.configFile."eww/bars".source = ../../config/eww/bars;
-    hm.xdg.configFile."eww/widgets".source = ../../config/eww/widgets;
-    hm.xdg.configFile."eww/scripts".source = ../../config/eww/scripts;
+    hm.xdg.configFile."eww/eww.yuck".source = ../../../config/eww/eww.yuck;
+    hm.xdg.configFile."eww/eww.scss".source = ../../../config/eww/eww.scss;
+    hm.xdg.configFile."eww/bars".source = ../../../config/eww/bars;
+    hm.xdg.configFile."eww/widgets".source = ../../../config/eww/widgets;
+    hm.xdg.configFile."eww/scripts".source = ../../../config/eww/scripts;
 
     # - Themeing ---------------------------------
     hm.xdg.configFile."eww/colour-scheme.scss".text = ''
@@ -50,7 +50,7 @@ in {
     '';
 
     # - Dependencies -----------------------------
-    samfelag.modules.desktop.rofi.enable = true;
+    samfelag.modules.desktop.tools.rofi.enable = true;
 
   };
 }
diff --git a/modules/desktop/polybar.nix b/modules/desktop/tools/polybar.nix
similarity index 75%
rename from modules/desktop/polybar.nix
rename to modules/desktop/tools/polybar.nix
index 0d3ce70..054fd63 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/tools/polybar.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
 let 
-  cfg = config.samfelag.modules.desktop.polybar;
-  i3Cfg = config.samfelag.modules.desktop.i3;
+  cfg = config.samfelag.modules.desktop.tools.polybar;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
   polybar_pkg = pkgs.polybar.override {
     i3Support = true;
     pulseSupport = true;
@@ -13,13 +13,13 @@ let
   '';
   # Paths
   paths = {
-    config = ../../config/polybar/config.ini;
-    bars = ../../config/polybar/bars;
-    scripts = ../../config/polybar/scripts;
+    config = ../../../config/polybar/config.ini;
+    bars = ../../../config/polybar/bars;
+    scripts = ../../../config/polybar/scripts;
   };
 in {
 
-  options.samfelag.modules.desktop.polybar = {
+  options.samfelag.modules.desktop.tools.polybar = {
     enable = lib.mkEnableOption "polybar";
   };
 
@@ -59,10 +59,14 @@ in {
     # - Dependencies -----------------------------
 
     # The polybar modules use rofi
-    samfelag.modules.desktop.rofi.enable = true;
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+    samfelag.modules.desktop.tools.rofi.enable = true;
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
       "${i3Cfg.mod}+Shift+w" = "exec $HOME/.config/rofi/menus/wifi/wifi.sh";
     };
+    samfelag.modules.desktop.wm.i3.extraStartup = lib.mkIf i3Cfg.enable [
+      { command = "systemctl --user restart polybar"; always = true; notification = false; }
+      { command = "feh --bg-fill -B \"#${config.colorScheme.palette.base00}\" -z --no-fehbg ${cfg.wallpaper}"; always = true; notification = false; }
+    ];
 
     # - Services ---------------------------------
 
diff --git a/modules/desktop/rofi.nix b/modules/desktop/tools/rofi.nix
similarity index 67%
rename from modules/desktop/rofi.nix
rename to modules/desktop/tools/rofi.nix
index 3bd420d..c9d92ee 100644
--- a/modules/desktop/rofi.nix
+++ b/modules/desktop/tools/rofi.nix
@@ -1,12 +1,13 @@
 { config, lib, pkgs, inputs, ... }:
 
 let
-  cfg = config.samfelag.modules.desktop.rofi;
-  hyprCfg = config.samfelag.modules.desktop.hyprland;
+  cfg = config.samfelag.modules.desktop.tools.rofi;
+  hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
   nix-colors-lib = inputs.nix-colors.lib-contrib { inherit pkgs; };
 in
 {
-  options.samfelag.modules.desktop.rofi = {
+  options.samfelag.modules.desktop.tools.rofi = {
     enable = lib.mkEnableOption "rofi";
   };
   config = lib.mkIf cfg.enable {
@@ -17,7 +18,7 @@ in
         rofi
       ];
 
-    hm.xdg.configFile."rofi/menus".source = ../../config/rofi/menus;
+    hm.xdg.configFile."rofi/menus".source = ../../../config/rofi/menus;
     hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme {
       scheme = config.colorScheme;
       width = 600;
@@ -38,11 +39,17 @@ in
       }
     '';
 
-    samfelag.modules.desktop.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
+    samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
       "${hyprCfg.mod}, SPACE, exec, $HOME/.config/rofi/menus/launcher/launcher.sh"
       "${hyprCfg.mod}, END, exec, $HOME/.config/rofi/menus/powermenu/powermenu.sh"
       "${hyprCfg.mod} SHIFT, W, exec, $HOME/.config/rofi/menus/wifi/wifi.sh"
     ];
 
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+      "${i3Cfg.mod}+space" = "exec $HOME/.config/rofi/menus/launcher/launcher.sh";
+      "${i3Cfg.mod}+End" = "exec $HOME/.config/rofi/menus/powermenu/powermenu.sh";
+      "${i3Cfg.mod}+Shift+w" = "exec $HOME/.config/rofi/menus/wifi/wifi.sh";
+    };
+
   };
 }
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/wm/hyprland.nix
similarity index 72%
rename from modules/desktop/hyprland.nix
rename to modules/desktop/wm/hyprland.nix
index 0e04e46..77ee40a 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/wm/hyprland.nix
@@ -1,11 +1,11 @@
 { inputs, config, lib, pkgs, ... }:
 
 let
-  cfg = config.samfelag.modules.desktop.hyprland;
+  cfg = config.samfelag.modules.desktop.wm.hyprland;
   mod = "Mod4";
 in {
 
-  options.samfelag.modules.desktop.hyprland = with lib; {
+  options.samfelag.modules.desktop.wm.hyprland = with lib; {
     enable = mkEnableOption "hyprland window manager";
 
     mod = my.mkOpt' types.str "Mod4" "Main modifier key for hyprland";
@@ -19,60 +19,11 @@ in {
   config = lib.mkIf cfg.enable {
 
     environment.systemPackages = with pkgs; [
-      # Cursor
-      inputs.hyprcursor-rose-pine.packages.${pkgs.system}.default
-      # Wallpaper
-      hyprpaper
-      # Greeter
-      greetd.gtkgreet
-      cage
     ];
 
-    # - Login screen -----------------------------
-    services.greetd = {
-      enable = true;
-      settings = {
-        default_session = {
-          command = "${pkgs.cage}/bin/cage -d -s ${pkgs.greetd.gtkgreet}/bin/gtkgreet -- -c Hyprland -s /etc/greetd/greetd.css";
-          user = config.user.name;
-        };
-      };
-    };
-
-    environment.etc."greetd/environments".text = ''
-      Hyprland
-    '';
-
-    environment.etc."greetd/greetd.css".text = ''
-      window {
-          background-image: url("file://${config.samfelag.modules.desktop.wallpaper}");
-          background-size: cover;
-          background-position: center;
-          font-family: Iosevka;
-          color: #${config.colorScheme.palette.base00};
-      }
-
-      box#body {
-          background-color: #${config.colorScheme.palette.base06};
-          opacity: 0.75;
-          border-radius: 10px;
-          padding: 50px;
-      }
-    '';
-
-    # - Dependencies -----------------------------
-    samfelag.modules.desktop.rofi.enable = true;
-    samfelag.modules.desktop.eww.enable = true;
-    samfelag.modules.system.kanata.enable = true;
-
     # - Configuration -----------------------------
 
-    # Hyprpaper
-    hm.xdg.configFile."hypr/hyprpaper.conf".text = ''
-      preload = ${config.samfelag.modules.desktop.wallpaper}
-      wallpaper = ,${config.samfelag.modules.desktop.wallpaper}
-    '';
-
+    # Hyprland config
     programs.hyprland = {
       enable = true;
       xwayland.enable = true;
@@ -99,6 +50,7 @@ in {
 
         env = [
           "HYPRCURSOR_THEME,rose-pine-hyprcursor"
+          "HYPRCURSOR_SIZE,24"
         ];
 
         input = {
diff --git a/modules/desktop/i3.nix b/modules/desktop/wm/i3.nix
similarity index 97%
rename from modules/desktop/i3.nix
rename to modules/desktop/wm/i3.nix
index 61b9784..9077b03 100644
--- a/modules/desktop/i3.nix
+++ b/modules/desktop/wm/i3.nix
@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.samfelag.modules.desktop.i3;
+  cfg = config.samfelag.modules.desktop.wm.i3;
   mod = "Mod4";
 in {
 
-  options.samfelag.modules.desktop.i3 = with lib; {
+  options.samfelag.modules.desktop.wm.i3 = with lib; {
     enable = mkEnableOption "i3 window manager";
 
     mod = my.mkOpt' types.str "Mod4" "Main modifier key for i3";
@@ -23,8 +23,12 @@ in {
 
     environment.systemPackages = with pkgs; [
       playerctl
+      i3lock-blur
+      feh
     ];
 
+    samfelag.modules.desktop.tools.polybar.enable = true;
+
     fonts.packages = with pkgs; [
       iosevka
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
diff --git a/modules/dev/devenv.nix b/modules/dev/devenv.nix
index f8b7202..f1fcbc3 100644
--- a/modules/dev/devenv.nix
+++ b/modules/dev/devenv.nix
@@ -5,7 +5,7 @@
 
 let
   cfg = config.samfelag.modules.dev.devenv;
-  i3Cfg = config.samfelag.modules.desktop.i3;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
 in
 {
   options.samfelag.modules.dev.devenv = {
@@ -21,7 +21,7 @@ in
     };
 
     # TODO: This assumes we have alacritty and a python311 devenv set up (may want to fix this at some point)
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
       "${i3Cfg.mod}+Shift+P" =  "exec ${pkgs.alacritty}/bin/alacritty -t floating-term -e zsh -c \"direnv exec ~/sandbox/python311 ipython\"";
     };
 
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 8bcb4e0..9335c16 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -3,8 +3,8 @@
 with lib;
 let
   cfg = config.samfelag.modules.editors.emacs;
-  i3Cfg = config.samfelag.modules.desktop.i3;
-  hyprCfg = config.samfelag.modules.desktop.hyprland;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
+  hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
   emacsPackages = epkgs: [
     epkgs.vterm
   ];
@@ -103,11 +103,11 @@ in {
       '';
     };
 
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
       "${i3Cfg.mod}+Shift+e" =  "exec ${emacsWithPackages}/bin/emacs";
     };
 
-    samfelag.modules.desktop.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
+    samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
       "${hyprCfg.mod} SHIFT, e, exec, ${emacsWithPackages}/bin/emacs"
     ];
 
diff --git a/modules/system/bluetooth.nix b/modules/system/bluetooth.nix
index 96de4db..85d0482 100644
--- a/modules/system/bluetooth.nix
+++ b/modules/system/bluetooth.nix
@@ -12,7 +12,7 @@ in
     hardware.bluetooth.enable = true;
     services.blueman.enable = true;
 
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf desktopCfg.enable {
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf desktopCfg.enable {
       "${desktopCfg.i3.mod}+b" = "exec $HOME/.config/rofi/menus/bluetooth/bluetooth.sh";
     };
   };
diff --git a/modules/system/pass.nix b/modules/system/pass.nix
index 75a27a6..e0c2551 100644
--- a/modules/system/pass.nix
+++ b/modules/system/pass.nix
@@ -2,8 +2,8 @@
 
 let
   cfg = config.samfelag.modules.system.pass;
-  i3Cfg = config.samfelag.modules.desktop.i3;
-  hyprCfg = config.samfelag.modules.desktop.hyprland;
+  i3Cfg = config.samfelag.modules.desktop.wm.i3;
+  hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
 in
 {
   options.samfelag.modules.system.pass = {
@@ -36,11 +36,11 @@ in
       '';
     };
 
-    samfelag.modules.desktop.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
+    samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
       "${i3Cfg.mod}+p" = "exec rofi-pass";
     };
 
-    samfelag.modules.desktop.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
+    samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
       "${hyprCfg.mod}, P, exec, rofi-pass"
     ];
   };