finally fixing the ups, plus tons of formatting

hosts/desktop/hyprland/config/btop/default.nix

@@ -7,7 +7,7 @@
       truecolor = true;
       force_tty = false;
       presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty";
-      vim_keys = true; 
+      vim_keys = true;
       rounded_corners = true;
       graph_symbol = "braille";
       graph_symbol_cpu = "default";
@@ -68,4 +68,4 @@
       log_level = "WARNING";
     };
   };
-}
+}

hosts/desktop/hyprland/config/hypr/default.nix

@@ -35,8 +35,8 @@
         "$mod, E, exec, nautilus"
         "$mod, V, togglefloating, "
         "$mod, D, exec, nwg-drawer -fm nautilus -term kitty"
-        "$mod, P, pseudo, "# dwindle
-        "$mod, S, togglesplit, "# dwindle
+        "$mod, P, pseudo, " # dwindle
+        "$mod, S, togglesplit, " # dwindle
         "$mod SHIFT, Q, exec, hyprlock"
         ", PRINT, exec, hyprshot -m region --clipboard-only"
         "$mod,F,exec,hyprctl dispatch fullscreen active"
@@ -93,7 +93,7 @@
         ", mouse:274, movewindow"
       ];
 
-      bindel =[ 
+      bindel = [
         ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
         ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
       ];
@@ -123,11 +123,11 @@
       decoration = {
         rounding = 10;
         blur = {
-            enabled = true;
-            size = 2;
-            passes = 2;
-            new_optimizations = true;
-            xray = false;
+          enabled = true;
+          size = 2;
+          passes = 2;
+          new_optimizations = true;
+          xray = false;
         };
         drop_shadow = "yes";
         shadow_range = 4;
@@ -154,16 +154,16 @@
       };
 
       dwindle = {
-          pseudotile = "yes";
-          preserve_split = "yes";
+        pseudotile = "yes";
+        preserve_split = "yes";
       };
 
       gestures = {
-          workspace_swipe = "off";
+        workspace_swipe = "off";
       };
 
       misc = {
-          force_default_wallpaper = 0;
+        force_default_wallpaper = 0;
       };
 
       workspace = [
@@ -203,7 +203,8 @@
         "nodim, class:Remote Desktop Connection"
         "nomaxsize, class:Remote Desktop Connection"
         "minsize 3840 2160, class:Remote Desktop Connection"
-      ]; 
+      ];
+
       windowrulev2 = [
         "float, class:Vmware-view,title:VMware Horizon Client"
         "size 3840 2160, class:Remote Desktop Connection"
@@ -250,7 +251,7 @@
         follow_mouse = 1;
 
         touchpad = {
-            natural_scroll = "no";
+          natural_scroll = "no";
         };
 
         sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
@@ -268,4 +269,4 @@
       exec-once = [silent] steam
     '';
   };
-}
+}

hosts/desktop/hyprland/config/mako/default.nix

@@ -18,4 +18,4 @@
     borderColor = "#8aadf4";
     progressColor = "over #363a4f";
   };
-}
+}

hosts/desktop/hyprland/config/waybar/default.nix

@@ -1,8 +1,8 @@
 {
   # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
-  
+
   programs.waybar = {
-    enable  = true;
+    enable = true;
     systemd.enable = true;
     settings = {
       mainBar = {
@@ -13,94 +13,94 @@
         passthrough = false;
         gtk-layer-shell = true;
         height = 0;
-        modules-left = [
-            "hyprland/workspaces"
-        ];
+        modules-left = [ "hyprland/workspaces" ];
 
-        modules-center = [
-          "hyprland/window"
-        ];
+        modules-center = [ "hyprland/window" ];
 
         modules-right = [
-            "tray"
-            "custom/updates"
-            "keyboard-state#capslock"
-            "keyboard-state#numlock"
-            "pulseaudio"
-            "pulseaudio#microphone"
-            "network"
-            "clock"
-            "custom/weather"
+          "tray"
+          "custom/updates"
+          "keyboard-state#capslock"
+          "keyboard-state#numlock"
+          "pulseaudio"
+          "pulseaudio#microphone"
+          "network"
+          "clock"
+          "custom/weather"
         ];
 
         "hyprland/window" = {
-            format = {};
+          format = { };
         };
 
         "hyprland/workspaces" = {
-            disable-scroll = true;
-            all-outputs = true;
-            on-click = "activate";
-            persistent_workspaces = {
-                "1" = [];
-            };
+          disable-scroll = true;
+          all-outputs = true;
+          on-click = "activate";
+          persistent_workspaces = {
+            "1" = [ ];
+          };
         };
 
         "custom/weather" = {
-            tooltip  = true;
-            format  = {};
-            interval  = 30;
-            exec  = "sudo waybar-weather";
-            return-type  = "json";
+          tooltip = true;
+          format = { };
+          interval = 30;
+          exec = "sudo waybar-weather";
+          return-type = "json";
         };
 
         "custom/updates" = {
-            tooltip  = true;
-            format  = {};
-            interval  = 60;
-            exec  = "sudo waybar-updates";
-            return-type  = "json";
+          tooltip = true;
+          format = { };
+          interval = 60;
+          exec = "sudo waybar-updates";
+          return-type = "json";
         };
 
         tray = {
-            icon-size = 16;
-            spacing = 10;
+          icon-size = 16;
+          spacing = 10;
         };
 
         clock = {
-            format = "{:%I:%M %p}";
-            tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          format = "{:%I:%M %p}";
+          tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
         };
 
         pulseaudio = {
-            format = "{icon} {volume}%";
-            tooltip = false;
-            format-muted = " Muted";
-            on-click = "pamixer -t";
-            on-click-right = "pavucontrol -t 1";
-            on-scroll-up = "pamixer -i 5";
-            on-scroll-down = "pamixer -d 5";
-            scroll-step = 5;
-            format-icons = {
-                headphone = "";
-                hands-free = "";
-                headset = "";
-                phone = "";
-                portable = "";
-                car = "";
-                default = ["" "" ""];
-            };
+          format = "{icon} {volume}%";
+          tooltip = false;
+          format-muted = " Muted";
+          on-click = "pamixer -t";
+          on-click-right = "pavucontrol -t 1";
+          on-scroll-up = "pamixer -i 5";
+          on-scroll-down = "pamixer -d 5";
+          scroll-step = 5;
+          format-icons = {
+            headphone = "";
+            hands-free = "";
+            headset = "";
+            phone = "";
+            portable = "";
+            car = "";
+            default = [
+              ""
+              ""
+              ""
+            ];
+          };
         };
 
         "pulseaudio#microphone" = {
-            format = "{format_source}";
-            format-source = "🎙{volume}%";
-            format-source-muted = "🎙Muted";
-            on-click = "pamixer --default-source -t";
-            on-click-right = "pavucontrol -t 2";
-            on-scroll-up = "pamixer --default-source -i 5";
-            on-scroll-down = "pamixer --default-source -d 5";
-            scroll-step = 5;
+          format = "{format_source}";
+          format-source = "🎙{volume}%";
+          format-source-muted = "🎙Muted";
+          on-click = "pamixer --default-source -t";
+          on-click-right = "pavucontrol -t 2";
+          on-scroll-up = "pamixer --default-source -i 5";
+          on-scroll-down = "pamixer --default-source -d 5";
+          scroll-step = 5;
         };
 
         network = {
@@ -299,4 +299,4 @@
       }
     '';
   };
-}
+}

hosts/desktop/hyprland/config/wofi/default.nix

@@ -142,4 +142,4 @@
       }
     '';
   };
-}
+}