desktop: switched to niri from hyprland

- window manager hopping now goes to niri from hyprland
- added niri configuration closely resembling the keybindings and visual
  appearence as before
- updated all other modules like waybar to use niri instead of hyprland

11 files changed, 241 insertions, 385 deletions

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index ef39e29..70011b8 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -9,7 +9,7 @@
     ./rofi
     ./wl-clipboard
     ./xdg
-    ./hyprland
+    ./niri
     ./waybar
   ];
 
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
deleted file mode 100644
index 749fb87..0000000
--- a/modules/desktop/hyprland/default.nix
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  toHyprColor = hex: "rgba(${lib.removePrefix "#" hex}ff)";
-in
-{
-  imports = [
-    ./hyprpaper.nix
-    ./keybindings.nix
-  ];
-
-  options.desktop.hardware.gpu = {
-    nvidia.enable = lib.mkEnableOption "Nvidia GPU Wayland/Hyprland optimizations";
-
-    amd.enable = lib.mkEnableOption "AMD GPU Wayland/Hyprland optimizations";
-
-    primaryCard = lib.mkOption {
-      type = lib.types.str;
-      default = "/dev/dri/gpu-amd";
-      description = "Path to primary DRM card device for Aquamarine/Hyprland rendering";
-    };
-
-    secondaryCard = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = "/dev/dri/gpu-nvidia";
-      description = "Path to secondary DRM card device for offloading (null if single GPU)";
-    };
-  };
-
-  config = lib.mkIf config.desktop.enable {
-
-    home.sessionVariables = lib.mkMerge [
-      {
-        NIXOS_OZONE_WL = "1";
-        QT_QPA_PLATFORM = "wayland;xcb";
-        SDL_VIDEODRIVER = "wayland";
-        CLUTTER_BACKEND = "wayland";
-        GDK_SCALE = "1";
-        QT_SCALE_FACTOR = "1";
-        GTK_THEME = "Adwaita:dark"; # Keeping for any that still use gtk
-
-        AQ_DRM_DEVICES =
-          if config.desktop.hardware.gpu.secondaryCard != null then
-            "${config.desktop.hardware.gpu.primaryCard}:${config.desktop.hardware.gpu.secondaryCard}"
-          else
-            config.desktop.hardware.gpu.primaryCard;
-      }
-
-      (lib.mkIf config.desktop.hardware.gpu.nvidia.enable {
-        LIBVA_DRIVER_NAME = "nvidia";
-        __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-        GBM_BACKEND = "nvidia-drm";
-        NVD_BACKEND = "direct";
-
-        AQ_NO_MODIFIERS = "1";
-        __GL_YIELD = "USLEEP";
-        __GL_VRR_ALLOWED = "0";
-      })
-
-      (lib.mkIf config.desktop.hardware.gpu.amd.enable {
-        AMD_VULKAN_ICD = "RADV";
-        MESA_VK_DEVICE_SELECT = "1002:";
-      })
-    ];
-
-    wayland.windowManager.hyprland = {
-      enable = true;
-      configType = "lua";
-      xwayland.enable = true;
-      systemd.enable = true;
-
-      extraConfig = ''
-        ${lib.concatStringsSep "\n" (
-          lib.mapAttrsToList (
-            name: value:
-            let
-              escapedValue = lib.escape [ "\"" "\\" ] (toString value);
-            in
-            ''hl.env("${name}", "${escapedValue}")''
-          ) config.home.sessionVariables
-        )}
-      '';
-
-      settings = {
-        monitor = [
-          {
-            output = "";
-            mode = "preferred";
-            position = "auto";
-            scale = 1;
-          }
-        ];
-        mainMod = {
-          _var = "SUPER";
-        };
-
-        config = {
-          general = with config.scheme.withHashtag; {
-            gaps_in = 5;
-            gaps_out = 10;
-            border_size = 1;
-            col = {
-              active_border = {
-                colors = [ (toHyprColor base07) ];
-                angle = 45;
-              };
-              inactive_border = toHyprColor base03;
-            };
-            layout = "scrolling";
-          };
-
-          xwayland = {
-            force_zero_scaling = true;
-          };
-
-          scrolling = {
-            column_width = 1;
-            explicit_column_widths = "0.5, 1.0";
-            focus_fit_method = 1;
-            follow_focus = true;
-          };
-
-          debug = {
-            vfr = true;
-          };
-
-          misc = {
-            vrr = lib.mkIf config.desktop.hardware.gpu.amd.enable 1;
-            disable_hyprland_logo = true;
-            disable_splash_rendering = true;
-          };
-
-          decoration = {
-            rounding = 0;
-            blur = {
-              enabled = false;
-            };
-            shadow = {
-              enabled = false;
-            };
-          };
-
-          input = {
-            follow_mouse = 1;
-            kb_layout = "us";
-            sensitivity = 0.5;
-            touchpad = {
-              natural_scroll = true;
-              clickfinger_behavior = true;
-              disable_while_typing = true;
-              tap_to_click = true;
-              tap_and_drag = false;
-              drag_lock = 2;
-              drag_3fg = 1;
-            };
-          };
-
-          cursor = {
-            enable_hyprcursor = true;
-            no_hardware_cursors = config.desktop.hardware.gpu.nvidia.enable;
-          };
-
-          dwindle = {
-            preserve_split = true;
-          };
-        };
-      };
-    };
-
-    home.pointerCursor = {
-      enable = true;
-      package = pkgs.rose-pine-hyprcursor;
-      name = "rose-pine-hyprcursor";
-      size = 20;
-      hyprcursor.enable = true;
-      gtk.enable = false;
-      x11.enable = false;
-    };
-  };
-}
diff --git a/modules/desktop/hyprland/hyprpaper.nix b/modules/desktop/hyprland/hyprpaper.nix
deleted file mode 100644
index 5b8eab3..0000000
--- a/modules/desktop/hyprland/hyprpaper.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  config = lib.mkIf config.desktop.enable {
-    services.hyprpaper = {
-      enable = true;
-      package = pkgs.hyprpaper;
-      settings = {
-        ipc = "on";
-        splash = false;
-        preload = [ "${../../../assets/sapling.png}" ];
-        wallpaper = [
-          {
-            monitor = "";
-            path = "${../../../assets/sapling.png}";
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/desktop/hyprland/keybindings.nix b/modules/desktop/hyprland/keybindings.nix
deleted file mode 100644
index c048153..0000000
--- a/modules/desktop/hyprland/keybindings.nix
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-  lua = lib.generators.mkLuaInline;
-
-  bind = key: dispatcher: {
-    _args = [
-      (lua "mainMod .. \" + ${key}\"")
-      (lua dispatcher)
-    ];
-  };
-
-  bindRawFlags = key: dispatcher: flags: {
-    _args = [
-      key
-      (lua dispatcher)
-      flags
-    ];
-  };
-
-  bindMouse = key: dispatcher: {
-    _args = [
-      (lua "mainMod .. \" + ${key}\"")
-      (lua dispatcher)
-      { mouse = true; }
-    ];
-  };
-
-  execLua = cmd: "hl.dsp.exec_cmd(\"${cmd}\")";
-
-  execLuaSingle = cmd: "hl.dsp.exec_cmd('${cmd}')";
-in
-{
-  config.wayland.windowManager.hyprland.settings.bind = lib.flatten [
-    (bindMouse "mouse:272" "hl.dsp.window.drag()") # mainMod + LMB drag: move
-    (bindMouse "mouse:273" "hl.dsp.window.resize()") # mainMod + RMB drag: resize
-
-    (lib.optionals config.desktop.enable [
-      (bind "R" (execLua "${lib.getExe config.desktop.rofi.package} -show drun"))
-    ])
-    (lib.optionals config.terminal.kitty.enable [
-      (bind "Return" (execLua "${lib.getExe config.terminal.kitty.package}"))
-    ])
-    (lib.optionals (config.terminal.kitty.enable && config.file-management.yazi.enable) [
-      (bind "F" (
-        execLua "${lib.getExe config.terminal.kitty.package} --class yazi --title 'Yazi' -e ${lib.getExe config.file-management.yazi.package}"
-      ))
-    ])
-    (bind "SHIFT + Q" "hl.dsp.window.close()")
-    (bind "Equal" "hl.dsp.layout(\"colresize +conf\")")
-
-    (lib.optionals config.system.brightnessctl.enable [
-      (bindRawFlags "XF86MonBrightnessDown"
-        (execLuaSingle "${lib.getExe config.system.brightnessctl.package} set 5%-")
-        {
-          locked = true;
-          repeating = true;
-        }
-      )
-      (bindRawFlags "XF86MonBrightnessUp"
-        (execLuaSingle "${lib.getExe config.system.brightnessctl.package} set +5%")
-        {
-          locked = true;
-          repeating = true;
-        }
-      )
-    ])
-    (lib.optionals config.media.pamixer.enable [
-      (bindRawFlags "XF86AudioLowerVolume"
-        (execLuaSingle "${lib.getExe config.media.pamixer.package} --decrease 5")
-        {
-          locked = true;
-          repeating = true;
-        }
-      )
-      (bindRawFlags "XF86AudioRaiseVolume"
-        (execLuaSingle "${lib.getExe config.media.pamixer.package} --increase 5")
-        {
-          locked = true;
-          repeating = true;
-        }
-      )
-      (bindRawFlags "XF86AudioMute"
-        (execLuaSingle "${lib.getExe config.media.pamixer.package} --toggle-mute")
-        {
-          locked = true;
-          repeating = true;
-        }
-      )
-    ])
-    (lib.optionals config.media.playerctl.enable [
-      (bindRawFlags "XF86AudioPlay"
-        (execLuaSingle "${lib.getExe config.media.playerctl.package} play-pause")
-        {
-          locked = true;
-          repeating = true;
-        }
-      )
-    ])
-
-    (bind "H" "hl.dsp.focus({ direction = \"l\" })")
-    (bind "J" "hl.dsp.focus({ direction = \"d\" })")
-    (bind "K" "hl.dsp.focus({ direction = \"u\" })")
-    (bind "L" "hl.dsp.focus({ direction = \"r\" })")
-
-    (bind "SHIFT + H" "hl.dsp.window.move({ direction = \"l\" })")
-    (bind "SHIFT + J" "hl.dsp.window.move({ direction = \"d\" })")
-    (bind "SHIFT + K" "hl.dsp.window.move({ direction = \"u\" })")
-    (bind "SHIFT + L" "hl.dsp.window.move({ direction = \"r\" })")
-
-    (bind "CTRL + H" "hl.dsp.window.resize({ x = -20, y = 0 })")
-    (bind "CTRL + J" "hl.dsp.window.resize({ x = 0, y = 20 })")
-    (bind "CTRL + K" "hl.dsp.window.resize({ x = 0, y = -20 })")
-    (bind "CTRL + L" "hl.dsp.window.resize({ x = 20, y = 0 })")
-
-    (bind "D" "hl.dsp.window.float({ action = \"toggle\" })")
-    (bind "M" "hl.dsp.window.fullscreen()")
-
-    (bind "1" "hl.dsp.focus({ workspace = 1 })")
-    (bind "2" "hl.dsp.focus({ workspace = 2 })")
-    (bind "3" "hl.dsp.focus({ workspace = 3 })")
-    (bind "4" "hl.dsp.focus({ workspace = 4 })")
-    (bind "5" "hl.dsp.focus({ workspace = 5 })")
-    (bind "6" "hl.dsp.focus({ workspace = 6 })")
-    (bind "7" "hl.dsp.focus({ workspace = 7 })")
-    (bind "8" "hl.dsp.focus({ workspace = 8 })")
-    (bind "9" "hl.dsp.focus({ workspace = 9 })")
-    (bind "0" "hl.dsp.focus({ workspace = 10 })")
-
-    (bind "SHIFT + 1" "hl.dsp.window.move({ workspace = 1 })")
-    (bind "SHIFT + 2" "hl.dsp.window.move({ workspace = 2 })")
-    (bind "SHIFT + 3" "hl.dsp.window.move({ workspace = 3 })")
-    (bind "SHIFT + 4" "hl.dsp.window.move({ workspace = 4 })")
-    (bind "SHIFT + 5" "hl.dsp.window.move({ workspace = 5 })")
-    (bind "SHIFT + 6" "hl.dsp.window.move({ workspace = 6 })")
-    (bind "SHIFT + 7" "hl.dsp.window.move({ workspace = 7 })")
-    (bind "SHIFT + 8" "hl.dsp.window.move({ workspace = 8 })")
-    (bind "SHIFT + 9" "hl.dsp.window.move({ workspace = 9 })")
-    (bind "SHIFT + 0" "hl.dsp.window.move({ workspace = 10 })")
-
-    (lib.optionals (config.media.grim.enable && config.media.slurp.enable) [
-      (bind "P" (
-        execLuaSingle "${lib.getExe config.media.grim.package} -g \"$(${lib.getExe config.media.slurp.package})\" - | ${lib.getExe' config.desktop.wl-clipboard.package "wl-copy"}"
-      ))
-      (bind "SHIFT + P" (
-        execLuaSingle "mkdir -p ~/Pictures/Screenshots && ${lib.getExe config.media.grim.package} -g \"$(${lib.getExe config.media.slurp.package})\" ~/Pictures/Screenshots/screenshot-$(date +%Y%m%d-%H%M%S).png"
-      ))
-    ])
-  ];
-}
diff --git a/modules/desktop/niri/default.nix b/modules/desktop/niri/default.nix
new file mode 100644
index 0000000..f1e0fa7
--- /dev/null
+++ b/modules/desktop/niri/default.nix
@@ -0,0 +1,110 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [ ./keybindings.nix ];
+
+  options.desktop.hardware.gpu = {
+    nvidia.enable = lib.mkEnableOption "Nvidia GPU Wayland optimizations";
+    amd.enable = lib.mkEnableOption "AMD GPU Wayland optimizations";
+  };
+
+  config = lib.mkIf config.desktop.enable {
+    home.sessionVariables = lib.mkMerge [
+      {
+        NIXOS_OZONE_WL = "1";
+        QT_QPA_PLATFORM = "wayland;xcb";
+        SDL_VIDEODRIVER = "wayland";
+        CLUTTER_BACKEND = "wayland";
+        GDK_SCALE = "1";
+        QT_SCALE_FACTOR = "1";
+        GTK_THEME = "Adwaita:dark";
+      }
+
+      (lib.mkIf config.desktop.hardware.gpu.nvidia.enable {
+        LIBVA_DRIVER_NAME = "nvidia";
+        __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+        GBM_BACKEND = "nvidia-drm";
+        __GL_YIELD = "USLEEP";
+        __GL_VRR_ALLOWED = "0";
+      })
+
+      (lib.mkIf config.desktop.hardware.gpu.amd.enable {
+        AMD_VULKAN_ICD = "RADV";
+        MESA_VK_DEVICE_SELECT = "1002:";
+      })
+    ];
+
+    wayland.windowManager.niri = {
+      enable = true;
+      systemd.enable = true;
+    };
+
+    # Niri does not paint wallpapers itself, so start swaybg with the existing wallpaper.
+    home.packages = [ pkgs.swaybg ];
+
+    home.pointerCursor = {
+      enable = true;
+      package = pkgs.adwaita-icon-theme;
+      name = "Adwaita";
+      size = 20;
+      gtk.enable = true;
+      x11.enable = true;
+    };
+
+    wayland.windowManager.niri.extraConfigEarly = ''
+      input {
+        keyboard {
+          xkb {
+            layout "us"
+          }
+        }
+        touchpad {
+          natural-scroll
+          tap
+          dwt
+          click-method "clickfinger"
+          accel-speed 0.5
+        }
+      }
+
+      layout {
+        gaps 5
+        center-focused-column "on-overflow"
+        default-column-width { proportion 1.0; }
+        preset-column-widths {
+          proportion 0.5
+          proportion 1.0
+        }
+        focus-ring {
+          width 1
+          active-color "${config.scheme.withHashtag.base07}"
+          inactive-color "${config.scheme.withHashtag.base03}"
+        }
+        border { off; }
+        shadow { off; }
+      }
+
+      prefer-no-csd
+      screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+      animations { off; }
+
+      spawn-at-startup "${lib.getExe pkgs.swaybg}" "-i" "${../../../assets/sapling.png}" "-m" "fill"
+
+      // Keep the familiar numbered workspaces persistent; Niri otherwise uses dynamic workspaces.
+      workspace "1"
+      workspace "2"
+      workspace "3"
+      workspace "4"
+      workspace "5"
+      workspace "6"
+      workspace "7"
+      workspace "8"
+      workspace "9"
+      workspace "10"
+    '';
+  };
+}
diff --git a/modules/desktop/niri/keybindings.nix b/modules/desktop/niri/keybindings.nix
new file mode 100644
index 0000000..5fd07fe
--- /dev/null
+++ b/modules/desktop/niri/keybindings.nix
@@ -0,0 +1,120 @@
+{
+  config,
+  lib,
+  ...
+}:
+let
+  workspaceBinds =
+    lib.concatMapStringsSep "\n"
+      (
+        { key, workspace }:
+        ''
+          Mod+${key} { focus-workspace "${workspace}"; }
+          Mod+Shift+${key} { move-column-to-workspace "${workspace}"; }''
+      )
+      [
+        {
+          key = "1";
+          workspace = "1";
+        }
+        {
+          key = "2";
+          workspace = "2";
+        }
+        {
+          key = "3";
+          workspace = "3";
+        }
+        {
+          key = "4";
+          workspace = "4";
+        }
+        {
+          key = "5";
+          workspace = "5";
+        }
+        {
+          key = "6";
+          workspace = "6";
+        }
+        {
+          key = "7";
+          workspace = "7";
+        }
+        {
+          key = "8";
+          workspace = "8";
+        }
+        {
+          key = "9";
+          workspace = "9";
+        }
+        {
+          key = "0";
+          workspace = "10";
+        }
+      ];
+in
+{
+  config.wayland.windowManager.niri.extraConfig = ''
+    binds {
+      // Niri defaults retained alongside the established launch and close bindings.
+      Mod+Shift+Slash { show-hotkey-overlay; }
+      Mod+O repeat=false { toggle-overview; }
+      Mod+Q repeat=false { close-window; }
+      Mod+Shift+Q repeat=false { close-window; }
+
+      ${lib.optionalString config.desktop.enable ''Mod+R hotkey-overlay-title="Run an Application: rofi" { spawn "${lib.getExe config.desktop.rofi.package}" "-show" "drun"; }''}
+      ${lib.optionalString config.terminal.kitty.enable ''
+        Mod+Return hotkey-overlay-title="Open a Terminal: kitty" { spawn "${lib.getExe config.terminal.kitty.package}"; }
+        Mod+T { spawn "${lib.getExe config.terminal.kitty.package}"; }''}
+      ${lib.optionalString (config.terminal.kitty.enable && config.file-management.yazi.enable)
+        ''Mod+F { spawn "${lib.getExe config.terminal.kitty.package}" "--class" "yazi" "--title" "Yazi" "-e" "${lib.getExe config.file-management.yazi.package}"; }''
+      }
+
+      // Niri's column/window-aware directional navigation.
+      Mod+H { focus-column-left; }
+      Mod+J { focus-window-down; }
+      Mod+K { focus-window-up; }
+      Mod+L { focus-column-right; }
+      Mod+Ctrl+H { move-column-left; }
+      Mod+Ctrl+J { move-window-down; }
+      Mod+Ctrl+K { move-window-up; }
+      Mod+Ctrl+L { move-column-right; }
+
+      // Preserve the old Shift movement muscle memory as aliases.
+      Mod+Shift+H { move-column-left; }
+      Mod+Shift+J { move-window-down; }
+      Mod+Shift+K { move-window-up; }
+      Mod+Shift+L { move-column-right; }
+
+      Mod+D { toggle-window-floating; }
+      Mod+V { toggle-window-floating; }
+      Mod+M { fullscreen-window; }
+      Mod+Equal { set-column-width "+10%"; }
+      Mod+Minus { set-column-width "-10%"; }
+      Mod+U { focus-workspace-down; }
+      Mod+I { focus-workspace-up; }
+      Mod+Ctrl+U { move-column-to-workspace-down; }
+      Mod+Ctrl+I { move-column-to-workspace-up; }
+      Mod+W { toggle-column-tabbed-display; }
+
+      ${workspaceBinds}
+
+      ${lib.optionalString config.system.brightnessctl.enable ''
+        XF86MonBrightnessDown allow-when-locked=true { spawn "${lib.getExe config.system.brightnessctl.package}" "set" "5%-"; }
+        XF86MonBrightnessUp allow-when-locked=true { spawn "${lib.getExe config.system.brightnessctl.package}" "set" "+5%"; }''}
+      ${lib.optionalString config.media.pamixer.enable ''
+        XF86AudioLowerVolume allow-when-locked=true { spawn "${lib.getExe config.media.pamixer.package}" "--decrease" "5"; }
+        XF86AudioRaiseVolume allow-when-locked=true { spawn "${lib.getExe config.media.pamixer.package}" "--increase" "5"; }
+        XF86AudioMute allow-when-locked=true { spawn "${lib.getExe config.media.pamixer.package}" "--toggle-mute"; }''}
+      ${lib.optionalString config.media.playerctl.enable ''XF86AudioPlay allow-when-locked=true { spawn "${lib.getExe config.media.playerctl.package}" "play-pause"; }''}
+
+      ${lib.optionalString (config.media.grim.enable && config.media.slurp.enable)
+        ''
+          Mod+P { spawn-sh "${lib.getExe config.media.grim.package} -g \"$(${lib.getExe config.media.slurp.package})\" - | ${lib.getExe' config.desktop.wl-clipboard.package "wl-copy"}"; }
+          Mod+Shift+P { spawn-sh "mkdir -p \"$HOME/Pictures/Screenshots\" && ${lib.getExe config.media.grim.package} -g \"$(${lib.getExe config.media.slurp.package})\" \"$HOME/Pictures/Screenshots/screenshot-$(date +%Y%m%d-%H%M%S).png\""; }''
+      }
+    }
+  '';
+}
diff --git a/modules/desktop/waybar/bar/main.nix b/modules/desktop/waybar/bar/main.nix
index 66a7fdd..08d816e 100644
--- a/modules/desktop/waybar/bar/main.nix
+++ b/modules/desktop/waybar/bar/main.nix
@@ -7,8 +7,8 @@
   fixed-center = false;
   expand-center = true;
 
-  modules-left = [ "hyprland/workspaces" ];
-  modules-center = [ "hyprland/window" ];
+  modules-left = [ "niri/workspaces" ];
+  modules-center = [ "niri/window" ];
   modules-right = [
     "pulseaudio"
     "battery"
diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix
index 28ee0ed..b504387 100644
--- a/modules/desktop/waybar/module/default.nix
+++ b/modules/desktop/waybar/module/default.nix
@@ -18,8 +18,8 @@ let
     "clock#time" = ./time.nix;
     "custom/usque" = ./usque.nix;
     "pulseaudio" = ./volume.nix;
-    "hyprland/window" = ./window.nix;
-    "hyprland/workspaces" = ./workspaces.nix;
+    "niri/window" = ./window.nix;
+    "niri/workspaces" = ./workspaces.nix;
   };
 in
 {
diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix
index e8a12fa..cc34d01 100644
--- a/modules/desktop/waybar/module/workspaces.nix
+++ b/modules/desktop/waybar/module/workspaces.nix
@@ -6,20 +6,8 @@
 }:
 {
   format = "{windows} <span rise='-3000' font_size='small'>{id}</span>";
-  persistent-workspaces = {
-    "*" = [
-      1
-      2
-      3
-      4
-      5
-      6
-      7
-      8
-      9
-      10
-    ];
-  };
+  sort-by-name = true;
+  all-outputs = false;
   window-rewrite-default = icons."Default";
   window-rewrite = {
     "class<chromium-browser>" = lib.mkIf config.web.chromium.enable icons."Chromium";
diff --git a/modules/desktop/xdg/default.nix b/modules/desktop/xdg/default.nix
index c6ea71f..852b36c 100644
--- a/modules/desktop/xdg/default.nix
+++ b/modules/desktop/xdg/default.nix
@@ -11,11 +11,13 @@
       enable = true;
       extraPortals = with pkgs; [
         xdg-desktop-portal-termfilechooser
-        xdg-desktop-portal-hyprland
       ];
       config.common = {
         "org.freedesktop.impl.portal.FileChooser" = [ "termfilechooser" ];
-        default = [ "hyprland" ];
+        default = [
+          "gnome"
+          "gtk"
+        ];
       };
       xdgOpenUsePortal = true;
     };
diff --git a/users/arpit.nix b/users/arpit.nix
index f2a7d8b..0bf8e73 100644
--- a/users/arpit.nix
+++ b/users/arpit.nix
@@ -17,8 +17,6 @@
   desktop.hardware.gpu = {
     nvidia.enable = true;
     amd.enable = true;
-    primaryCard = "/dev/dri/gpu-amd";
-    secondaryCard = "/dev/dri/gpu-nvidia";
   };
 
   # Gaming