Switch to using thunar with Papirus icons, make spacing of waybar more consistent

nixos/desktop/hyprland.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   nixpkgs.overlays = [
     (self: super: {
@@ -16,4 +16,13 @@
       hidpi = true;
     };
   };
+  programs.thunar = {
+    enable = true;
+    plugins = with pkgs.xfce; [
+      thunar-archive-plugin
+      thunar-volman
+    ];
+  };
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images
 }

nixos/home/desktop/common/gtk.nix

@@ -6,6 +6,10 @@
       package = pkgs.catppuccin-cursors.macchiatoDark;
       name = "Catppuccin-Macchiato-Dark-Cursors";
     };
+    iconTheme = {
+      package = pkgs.papirus-icon-theme;
+      name = "Papirus";
+    };
     theme = {
       package = pkgs.catppuccin-gtk;
       name = "Catppuccin-Frappe-Standard-Blue-Dark";

nixos/home/desktop/common/rofi.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  home.packages = with pkgs; [ papirus-icon-theme ];
   programs.rofi = {
     enable = true;
     location = "center";
@@ -10,7 +11,7 @@
     ];
     extraConfig = {
       modi = "run,drun,calc";
-      icon-theme = "Oranchelo";
+      icon-theme = "Papirus";
       show-icons = true;
       drun-display-format = "{icon} {name}";
       disable-history = false;

nixos/home/desktop/wayland/config/hypr/keybinds.conf

@@ -16,8 +16,7 @@ bind = $mainMod, S, pseudo, # dwindle
 bind = $mainMod, G, togglesplit, # dwindle
 bind = $mainMod, F1, exec, swaylock
 bind = $mainMod, W, exec, $browser
-bind = $mainMod, F, exec, $term -e ranger
-bind = $mainMod SHIFT, F, exec, dolphin
+bind = $mainMod, F, exec, thunar
 bind = $mainMod, M, fullscreen, 1
 
 bind = , XF86AudioMute, exec, pamixer -t

nixos/home/desktop/wayland/config/hypr/window-rules.conf

@@ -1,4 +1,5 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrule = float, ^(thunar)$
 windowrule = float, ^(pavucontrol)$
 windowrule = center, ^(pavucontrol)$
 windowrule = float, ^(.blueman-manager-wrapped)$
@@ -21,5 +22,6 @@ windowrule = workspace 5, ^(Element)$
 windowrule = workspace 5, ^(Signal)$
 windowrule = workspace 5, ^(discord)$
 windowrule = workspace 6, ^(Steam)$
+windowrule = workspace 6, ^(steamwebhelper)$
 windowrule = workspace 7, ^(Bitwarden)$
 windowrule = workspace 8, ^(Nxplayer.bin)$

nixos/home/desktop/wayland/config/waybar/config

@@ -1,14 +1,18 @@
 {
     "layer": "top",
     "position": "top",
-    "spacing": 4,
+    "spacing": 10,
+    "margin-top": 10,
+    "margin-left": 20,
+    "margin-right": 20,
+    "margin-bottom": 5,
     // Choose the order of the modules
     "modules-left": ["custom/launcher", "cpu", "memory", "temperature"],
     "modules-right": ["pulseaudio", "bluetooth", "network", "backlight", "battery", "battery#bat2", "clock", "tray", "custom/power"],
     // Modules configuration
     "custom/launcher":{
-        "format": " 󰌧 ",
-        "on-click": "rofi -show drun"
+        "format": "󰝰",
+        "on-click": "thunar"
     },
     "keyboard-state": {
         "numlock": true,
@@ -99,7 +103,7 @@
         "on-click": "pavucontrol"
     },
     "custom/power":{
-        "format": " 󰐥 ",
+        "format": "󰐥",
         "on-click": "~/.dotfiles/scripts/powermenu"
     }
 }

nixos/home/desktop/wayland/config/waybar/style.css

@@ -67,8 +67,8 @@ window#waybar.hidden {
 #clock,
 #tray,
 #custom-power {
-  margin-top: 6px;
-  margin-left: 8px;
+  margin-top: 0px;
+  margin-left: 0px;
   padding-left: 10px;
   padding-right: 10px;
   margin-bottom: 0px;

nixos/home/desktop/wayland/hyprland.nix

@@ -21,7 +21,6 @@ in
   home.packages = with pkgs; [
     swayimg
     hyprpaper
-    dolphin
   ];
   programs.rofi.package = pkgs.rofi-wayland;
   xdg.configFile."hypr" = {