flake up

modules/home/programs/waybar/default.nix

@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf mkEnableOption;
   cfg = config.home.programs.waybar;
-  uwsm = lib.getExe pkgs.uwsm;
+  # uwsm = lib.getExe pkgs.uwsm;
   waybar = lib.getExe pkgs.waybar;
 
   waybarAssets = pkgs.runCommand "waybar-config-assets" {} ''
@@ -22,15 +22,14 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.waybar = {
       Unit = {
+        Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
         After = ["graphical-session.target"];
-        ConditionEnvironment = "WAYLAND_DISPLAY";
-        Description = "waybar";
       };
       Service = {
-        ExecStart = "${uwsm} app -- ${waybar} -c ${waybarAssets}/config.jsonc -s ${waybarAssets}/style.css";
+        Type = "exec";
+        ExecStart = "${waybar} -c ${waybarAssets}/config.jsonc -s ${waybarAssets}/style.css";
+        Restart = "on-failure";
         Slice = "app-graphical.slice";
-        Restart = "always";
-        RestartSec = 30;
       };
       Install = {
         WantedBy = ["graphical-session.target"];

modules/nixos/programs/hyprland/inputs.nix

@@ -65,7 +65,7 @@ in {
     (mkIf (host == "cnixtop") {
       programs.hyprland.settings = {
         render = {
-          direct_scanout = false;
+          direct_scanout = 1;
         };
         cursor = {
           no_hardware_cursors = 2;
@@ -75,6 +75,7 @@ in {
         };
         misc = {
           vrr = 0;
+          vfr = true;
         };
       };
     })
@@ -89,7 +90,7 @@ in {
         };
         misc = {
           vrr = 0;
-          vfr = 1;
+          vfr = true;
         };
       };
     })
@@ -97,7 +98,7 @@ in {
     (mkIf (host == "toothpc") {
       programs.hyprland.settings = {
         render = {
-          direct_scanout = false;
+          direct_scanout = 0;
         };
         cursor = {
           no_hardware_cursors = true;

modules/nixos/programs/hyprland/rules.nix

@@ -56,8 +56,8 @@ in {
           "float, class:^(com.github.hluk.copyq)$"
           "float, class:^(blueman-manager)$"
 
-          "workspace 5 silent, class:^(discord)$"
-          "workspace 5 silent, class:^(vesktop)$"
+          # "workspace 5 silent, class:^(discord)$"
+          # "workspace 5 silent, class:^(vesktop)$"
           "workspace 4 silent, class:^(steam_app_0)$"
           "workspace 4 silent, title:^(World of Warcraft)$"
         ];
@@ -84,7 +84,7 @@ in {
         "name:2,monitor:DP-3"
         "name:3,monitor:DP-3"
         "name:4,monitor:DP-3"
-        "name:5,monitor:DP-4"
+        "name:5,monitor:DP-3"
         "name:6,monitor:DP-3"
         "name:7,monitor:DP-3"
         "name:8,monitor:DP-3"

modules/nixos/programs/hyprland/startup.nix

@@ -15,7 +15,7 @@ in {
     {
       programs.hyprland.settings = {
         exec-once = [
-          "sleep 2 && uwsm finalize"
+          "uwsm finalize"
           "hyprlock"
         ];
       };