feat: stylix-maxxing and removing uwsmupdate-unstable

4 files changed, 33 insertions, 19 deletions

diff --git a/common/variables.nix b/common/variables.nix
index 76ebbfb..3b3ea73 100644
--- a/common/variables.nix
+++ b/common/variables.nix
@@ -1,11 +1,10 @@
-{ config
-, pkgs
-, lib
-, ...
-}:
+{ config, pkgs, lib, ... }:
 let
   monitorMaxBrightness = "255";
   monitorMinBrightness = "32";
+  stylixBG = config.lib.stylix.colors.base00;
+  stylixFG = config.lib.stylix.colors.base07;
+  stylixPrimaryBG = config.lib.stylix.colors.base12;
 in
 {
   # Type definitions for nix variables used in this configuration
@@ -39,9 +38,11 @@ in
     myDisplayName = "Zhongheng Liu";
     myEmail = "z.liu@outlook.com.gr";
     specialisation."powersave".configuration = {
-      myAutostartCommands = [ "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}" ];
+      myAutostartCommands =
+        [ "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}" ];
     };
-    myConfigLocation = "/home/${myUserName}/Development/Nix/nixos-configuration";
+    myConfigLocation =
+      "/home/${myUserName}/Development/Nix/nixos-configuration";
     desktopFontFullName = "JetBrainsMono Nerd Font:style=Regular";
     myAutostartCommands = [
       "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMaxBrightness}"
@@ -54,7 +55,8 @@ in
     defaultApplications = {
       terminal = "${pkgs.foot}/bin/footclient";
       fileManager = "${pkgs.nemo}/bin/nemo";
-      appLauncher = "${pkgs.wmenu}/bin/wmenu-run -b";
+      appLauncher =
+        "${pkgs.wmenu}/bin/wmenu-run -p \"Launch a program...\" -N ${stylixBG} -n ${stylixFG} -S ${stylixPrimaryBG}";
     };
     usingMusicPlayerDaemon = true;
   };
diff --git a/home-manager/stvnliu/hypr/hyprland/default.nix b/home-manager/stvnliu/hypr/hyprland/default.nix
index a623d49..2aa63db 100644
--- a/home-manager/stvnliu/hypr/hyprland/default.nix
+++ b/home-manager/stvnliu/hypr/hyprland/default.nix
@@ -22,10 +22,9 @@ in
     xwayland.enable = true;
     settings = {
       plugins = import ./hyprbars.nix { inherit config; };
-      env = [ "AQ_DRM_DEVICES, /dev/dri/card1:/dev/dri/card0" ];
+      # env = [ "AQ_DRM_DEVICES, /dev/dri/card0" ];
       xwayland = { force_zero_scaling = true; };
       monitor = [
-        #"eDP-1, 1920x1080@165,0x0,1"
         "desc:Xiaomi Corporation Mi 27 NFGL 3215000032603, 1920x1080@75, 2560x0, 1"
         "desc:BOE 0x0B40,preferred, auto, ${
           builtins.toString config.displayScale
@@ -44,7 +43,6 @@ in
       decoration = { rounding = 5; };
       input = {
         # xset rate 250 50 replacement on wayland...
-        # FAST MODE LET'S GOOO
         repeat_rate = 50;
         repeat_delay = 250;
         accel_profile = "flat";
@@ -54,11 +52,16 @@ in
         inherit pkgs;
         inherit inputs;
       });
+      cursor = {
+        # Fixes https://github.com/hyprwm/Hyprland/issues/9324
+        # Needed because by default, Hyprland enabled Nvidia hardware cursors.
+        no_hardware_cursors = true;
+      };
       misc = {
         disable_hyprland_logo = true;
         disable_splash_rendering = true;
         font_family = "monospace";
-        focus_on_activate = true; # see if fixes mako daemon not focusing
+        focus_on_activate = true;
       };
       "$mod" = "SUPER";
       binde = import ./xf86_binds.nix { inherit pkgs; };
@@ -76,7 +79,7 @@ in
     };
     # Optional
     # Whether to enable hyprland-session.target on hyprland startup
-    systemd = { enable = false; }; # set to false due to UWSM
+    systemd = { enable = true; }; # set to false due to UWSM
   };
   # ...
 }
diff --git a/home-manager/stvnliu/services/waybar.nix b/home-manager/stvnliu/services/waybar.nix
index 723ad33..fdd573a 100644
--- a/home-manager/stvnliu/services/waybar.nix
+++ b/home-manager/stvnliu/services/waybar.nix
@@ -16,11 +16,9 @@
         modules-left = [ "hyprland/workspaces" "hyprland/submap" ];
         modules-center = [ "mpd" ];
         modules-right = [
-          "tray"
           "clock"
-          "battery"
-          "cpu"
-          "memory"
+          "group/trays"
+          "group/monitor"
           "wireplumber"
           "temperature"
         ];
@@ -36,8 +34,19 @@
           "icon-size" = 18;
           "spacing" = 10;
         };
+        "custom/tray-label" = { "format" = "[TRAY]"; };
+        "custom/monitor-label" = { "format" = "[HW]"; };
+        "group/trays" = {
+          "orientation" = "inherit";
+          "modules" = [ "custom/tray-label" "tray" ];
+          "drawer" = { };
+        };
+        "group/monitor" = {
+          "orientation" = "inherit";
+          "modules" = [ "custom/monitor-label" "battery" "cpu" "memory" ];
+          "drawer" = { };
+        };
         "mpd" = {
-          "max-length" = 50;
           "format" =
             "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ";
           "format-disconnected" = "Disconnected ";
diff --git a/nixos/spec.nix b/nixos/spec.nix
index 504eee2..2df9e6a 100644
--- a/nixos/spec.nix
+++ b/nixos/spec.nix
@@ -5,7 +5,7 @@
         programs = {
           hyprland = {
             enable = true; # enables Hyprland DM.
-            withUWSM = true; # NEW Universal Wayland Session Manager
+            #withUWSM = true; # NEW Universal Wayland Session Manager
           };
         };
       };