profiles/applications/home-apps.nix

@@ -9,7 +9,6 @@
         # syntaxes = {};
         # themes = {};
       };
-      bottom.enable = true;
       fzf.enable = true;
       fzf.enableZshIntegration = true;
       gitui = {

profiles/workspace/catppuccin.nix

@@ -7,9 +7,8 @@ let
     (lib.toUpper (builtins.substring 0 1 str)) +
     (builtins.substring 1 (builtins.stringLength str) str);
 
-  accent = "mauve";
-  # accent = "lavender";
-  flavor = "mocha";
+  accent = config.home-manager.users.${config.mainuser}.catppuccin.accent;
+  flavor = config.home-manager.users.${config.mainuser}.catppuccin.flavor;
   size = "standard"; # "standard" "compact"
   tweaks = [ "normal" ]; # "black" "rimless" "normal"
   flavorUpper = mkUpper flavor;
@@ -18,22 +17,14 @@ let
   gtkTheme = if flavor == "latte" then "Light" else "Dark";
 in
 {
-  imports = [ inputs.catppuccin.nixosModules.catppuccin ];
-  catppuccin.accent = accent;
-  catppuccin.flavor = flavor;
-  boot.loader.grub.catppuccin.enable = true;
-  console.catppuccin.enable = true;
-
   home-manager.users.${config.mainuser} = rec {
     imports = [ inputs.catppuccin.homeManagerModules.catppuccin ];
-    catppuccin.accent = accent;
-    catppuccin.flavor = flavor;
-
     qt.style.catppuccin.enable = true;
     qt.style.catppuccin.apply = true;
     services.mako.catppuccin.enable = true;
     programs = {
       bat.catppuccin.enable = true;
+      bottom.enable = true;
       bottom.catppuccin.enable = true;
       fzf.catppuccin.enable = true;
       gitui.catppuccin.enable = true;
@@ -75,6 +66,7 @@ in
           })
         ];
         userSettings = {
+          "gopls.ui.semanticTokens" = lib.mkForce true;
           "editor.semanticHighlighting.enabled" = lib.mkForce true;
           "terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
           "window.titleBarStyle" = lib.mkForce "custom";
@@ -85,7 +77,7 @@ in
     };
 
     wayland.windowManager.hyprland.extraConfig = ''
-      exec=hyprctl setcursor catppuccin-${flavor}-${accent}-cursors ${toString thm.cursorSize}
+      exec-once=hyprctl setcursor catppuccin-${flavor}-${accent}-cursors ${toString thm.cursorSize}
     '';
 
     # GTK
@@ -126,6 +118,6 @@ in
     iconPackage = lib.mkForce (pkgs.catppuccin-papirus-folders.override { inherit accent flavor; });
     cursorPackage = lib.mkForce (pkgs.catppuccin-cursors.${flavor + accentUpper});
     cursorTheme = lib.mkForce "catppuccin-${flavor}-${accent}-cursors";
-    cursorSize = lib.mkForce 32;
+    cursorSize = lib.mkForce 24;
   };
 }

profiles/workspace/hyprland/default.nix

@@ -149,7 +149,6 @@ in with config.deviceSpecific; with lib; {
           bind=${modifier},f11,exec,sleep 1 && hyprctl dispatch dpms off
           bind=${modifier},f12,exec,sleep 1 && hyprctl dispatch dpms on
 
-          bind=${modifier},p,exec,${pkgs.wlogout}/bin/wlogout -b 5
           bind=${modifier},escape,exec,${apps.monitor.cmd}
           bind=${modifier},w,exec,${apps.dmenu.desktop} -show run
           bind=${modifier}CTRL,w,exec,${apps.dmenu.desktop} -show drun -modi drun -show-icons
@@ -282,11 +281,10 @@ in with config.deviceSpecific; with lib; {
           env=QT_AUTO_SCREEN_SCALE_FACTOR=1
           env=QT_WAYLAND_DISABLE_WINDOWDECORATION=1
           env=QT_QPA_PLATFORMTHEME=qt5ct
-          env=GSETTINGS_SCHEMA_DIR=${pkgs.glib.getSchemaPath pkgs.gsettings-desktop-schemas}
         '' ''
           exec=${importGsettings}
           exec-once=${hyprpaper-pkg}/bin/hyprpaper
-          exec=hyprctl setcursor ${config.lib.base16.theme.cursorTheme} ${toString config.lib.base16.theme.cursorSize}
+          exec-once=hyprctl setcursor ${config.lib.base16.theme.cursorTheme} ${toString config.lib.base16.theme.cursorSize}
           exec-once=${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1
           exec-once=${pkgs.wl-clipboard}/bin/wl-paste --type text --watch ${pkgs.cliphist}/bin/cliphist store
           exec-once=${pkgs.wl-clipboard}/bin/wl-paste --type image --watch ${pkgs.cliphist}/bin/cliphist store

profiles/workspace/waybar/default.nix

@@ -72,7 +72,7 @@ with config.deviceSpecific; {
         };
         cpu = {
           interval = 4;
-          format = "<span color=\"#7aa2f7\">      </span>{usage}%";
+          format = "<span color=\"@base\">      </span>{usage}%";
         };
         disk = {
           interval = 60;

profiles/workspace/wlogout/default.nix

@@ -1,96 +0,0 @@
-{ config, lib, ... }: {
-  home-manager.users.${config.mainuser} = let
-    inherit (config.home-manager.users.${config.mainuser}.catppuccin) sources flavor accent;
-
-    thm = config.lib.base16.theme;
-    palette = (lib.importJSON "${sources.palette}/palette.json").${flavor}.colors;
-  in {
-    programs.wlogout = {
-      enable = true;
-      layout = [{
-        label = "lock";
-        action = "";
-        text = "Lock";
-      } {
-        label = "reboot";
-        action = "systemctl reboot";
-        text = "Reboot";
-      } {
-        label = "shutdown";
-        action = "systemctl poweroff";
-        text = "Shutdown";
-      } {
-        label = "logout";
-        action = "hyprctl dispatch exit 0";
-        text = "Logout";
-      } {
-        label = "suspend";
-        action = "systemctl suspend";
-        text = "Suspend";
-      }];
-      style = ''
-        window {
-          font-family: "${thm.fonts.mono.family}";
-          font-size: 18pt;
-          color: ${palette.text.hex};
-          background-color: rgba(${toString palette.base.rgb.r}, ${toString palette.base.rgb.g}, ${toString palette.base.rgb.b}, 0.8);
-        }
-        button {
-          background-repeat: no-repeat;
-          background-position: center;
-          background-size: 25%;
-          border: none;
-          background-color: rgba(${toString palette.base.rgb.r}, ${toString palette.base.rgb.g}, ${toString palette.base.rgb.b}, 0);
-          color: ${palette.${accent}.hex};
-        }
-        button:hover {
-          background-color: rgba(${toString palette.surface0.rgb.r}, ${toString palette.surface0.rgb.g}, ${toString palette.surface0.rgb.b}, 0.1);
-        }
-        button:focus {
-          background-color: ${palette.${accent}.hex};
-          color: ${palette.base.hex};
-        }
-        #lock {
-          background-image: image(url("${./lock.png}"));
-          padding: 35px;
-        }
-        #lock:focus {
-          background-image: image(url("${./lock-hover.png}"));
-          padding: 35px;
-        }
-        #logout {
-          background-image: image(url("${./logout.png}"));
-          padding: 30px;
-        }
-        #logout:focus {
-          background-image: image(url("${./logout-hover.png}"));
-          padding: 30px;
-        }
-        #suspend {
-          background-image: image(url("${./sleep.png}"));
-          padding: 30px;
-        }
-        #suspend:focus {
-          background-image: image(url("${./sleep-hover.png}"));
-          padding: 30px;
-        }
-        #shutdown {
-          background-image: image(url("${./power.png}"));
-          padding: 30px;
-        }
-        #shutdown:focus {
-          background-image: image(url("${./power-hover.png}"));
-          padding: 30px;
-        }
-        #reboot {
-          background-image: image(url("${./restart.png}"));
-          padding: 30px;
-        }
-        #reboot:focus {
-          background-image: image(url("${./restart-hover.png}"));
-          padding: 30px;
-        }
-      '';
-    };
-  };
-}

roles/desktop.nix

@@ -40,7 +40,6 @@
     proxy
     hyprland
     waybar
-    wlogout
     xdg
     vpn