From 51116ed17e2febc06dc795e5893d3a31e97962e9 Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@gmail.com>
Date: Fri, 6 Feb 2026 15:52:14 -0800
Subject: server and desktop configurations are working fully and booting

---
 nix/modules/home/default.nix  |  2 +-
 nix/modules/home/fcitx.nix    |  4 +--
 nix/modules/home/hyprland.nix | 65 ++++++++++++++++++++++++++++---------------
 nix/modules/home/zsh.nix      |  1 -
 4 files changed, 45 insertions(+), 27 deletions(-)

(limited to 'nix/modules/home')

diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix
index f8a1ad5..c991927 100644
--- a/nix/modules/home/default.nix
+++ b/nix/modules/home/default.nix
@@ -186,7 +186,7 @@
 			                imagemagick
                       supercollider
 			                inkscape
-			                kdePackages.kdenlive
+			                # kdePackages.kdenlive
 			                # kicad
                       murmur
 					          ]) else []);
diff --git a/nix/modules/home/fcitx.nix b/nix/modules/home/fcitx.nix
index b4bb965..1907590 100644
--- a/nix/modules/home/fcitx.nix
+++ b/nix/modules/home/fcitx.nix
@@ -3,12 +3,12 @@
   i18n.inputMethod = {
     type = "fcitx5";
     enable = lib.mkDefault config.monorepo.profiles.graphics.enable;
-    fcitx5.addons = with pkgs; [
+    fcitx5.addons = if config.monorepo.profiles.graphics.enable then (with pkgs; [
       fcitx5-gtk
       qt6Packages.fcitx5-chinese-addons
       qt6Packages.fcitx5-configtool
       fcitx5-mozc
       fcitx5-rime
-    ];
+    ]) else [];
   };
 }
diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix
index de343b5..b649e96 100644
--- a/nix/modules/home/hyprland.nix
+++ b/nix/modules/home/hyprland.nix
@@ -32,34 +32,53 @@
         "__GLX_VENDOR_LIBRARY_NAME,nvidia"
         "ELECTRON_OZONE_PLATFORM_HINT,auto"
       ];
-      # layerrule = [
-      #   "blur:top,waybar"
-      # ];
+
       monitor = [
         "DP-4,2560x1440@165.000000,0x0,1"
         "Unknown-1,disable"
       ];
-      windowrulev2 = [
-        "workspace 1, class:^(emacs)$"
-        "workspace 2, class:^(firefox)$"
-        "workspace 2, title:^(.*Tor Browser.*)$"
-        "workspace 2, title:^(.*Chromium-browser.*)$"
-        "workspace 2, class:^(chromium)$"
-        "workspace 3, class:^(discord)$"
-        "workspace 3, class:^(vesktop)$"
-        "workspace 3, title:^(.*fluffychat.*)$"
-        "workspace 3, class:^(.*element-desktop.*)$"
-        "workspace 4, class:^(.*qpwgraph.*)$"
-        "workspace 4, class:^(.*pavucontrol.*)$"
-        "workspace 4, class:^(.*mpv.*)$"
-        "workspace 5, title:^(.*Monero.*)$"
-        "workspace 5, title:^(.*org\.bitcoin\..*)$"
-        "workspace 5, title:^(.*Bitcoin Core - preston.*)$"
-        "workspace 5, title:^(.*org\.getmonero\..*)$"
-        "workspace 5, title:^(.*Monero - preston.*)$"
-        "workspace 5, title:^(.*electrum.*)$"
-        "pseudo,title:fcitx"
+
+      layerrule = [
+        {
+          name = "waybar blur";
+          "match:namespace" = "waybar";
+          blur = "on";
+        }
       ];
+
+      windowrule = [ 
+        {
+          name = "emacs";
+          "match:class" = "emacs";
+          workspace = 1;
+        }
+        {
+          name = "firefox";
+          "match:class" = "firefox";
+          workspace = 2;
+        }
+        {
+          name = "vesktop";
+          "match:class" = "vesktop";
+          workspace = 3;
+        }
+        {
+          name = "pavucontrol";
+          "match:class" = "pavucontrol";
+          workspace = 4;
+        }
+        {
+          name = "qpwgraph";
+          "match:class" = "qpwgraph";
+          workspace = 4;
+        }
+        {
+          name = "mpv";
+          "match:class" = "mpv";
+          workspace = 4;
+        }
+      ];
+
       bind = [
         "$mod, F, exec, firefox"
         "$mod, Return, exec, kitty"
diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix
index 31468e1..62dcbd5 100644
--- a/nix/modules/home/zsh.nix
+++ b/nix/modules/home/zsh.nix
@@ -37,7 +37,6 @@
       usite
       = "cd ~/src/publish-org-roam-ui && bash local.sh && rm -rf ~/website_html/graph_view; cp -r ~/src/publish-org-roam-ui/out ~/website_html/graph_view && rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.monorepo.vars.remoteHost}:/var/www/${config.monorepo.vars.internetName}-website/";
       sai = "eval \"$(ssh-agent -s)\" && ssh-add ~/.ssh/id_ed25519 && ssh-add -l";
-      i3 = "exec ${pkgs.i3}/bin/i3";
     };
     loginExtra = ''
       if [[ "$(tty)" = "/dev/tty1" ]]; then
-- 
cgit v1.3