feat(hypr): unify home/packages to desktop module

devices/binto/default.nix

@@ -52,8 +52,6 @@ in {
   home-manager.users.${mainUser} = {
     imports = [
       ../../home/firefox
-
-      ./home/packages.nix
     ];
 
     # No touchy

devices/binto/home/packages.nix

@@ -1,33 +0,0 @@
-{...}: {
-  xdg.desktopEntries."com.github.iwalton3.jellyfin-media-player" = {
-    name = "Jellyfin Media Player";
-    comment = "Desktop client for Jellyfin";
-    exec = "jellyfinmediaplayer --platform xcb";
-    icon = "com.github.iwalton3.jellyfin-media-player";
-    terminal = false;
-    type = "Application";
-    categories = ["AudioVideo" "Video" "Player" "TV"];
-    settings = {
-      Version = "1.0";
-      StartupWMClass = "jellyfin-media-player";
-    };
-    actions = {
-      "DesktopF" = {
-        name = "Desktop [Fullscreen]";
-        exec = "jellyfinmediaplayer --fullscreen --desktop --platform xcb";
-      };
-      "DesktopW" = {
-        name = "Desktop [Windowed]";
-        exec = "jellyfinmediaplayer --windowed --desktop --platform xcb";
-      };
-      "TVF" = {
-        name = "TV [Fullscreen]";
-        exec = "jellyfinmediaplayer --fullscreen --tv --platform xcb";
-      };
-      "TVW" = {
-        name = "TV [Windowed]";
-        exec = "jellyfinmediaplayer --windowed --tv --platform xcb";
-      };
-    };
-  };
-}

devices/wim/default.nix

@@ -51,8 +51,6 @@ in {
   home-manager.users.${mainUser} = {
     imports = [
       ../../home/firefox
-
-      ./home/packages.nix
     ];
 
     # No touchy

devices/wim/home/packages.nix

@@ -1,41 +0,0 @@
-{pkgs, ...}: {
-  home.packages =
-    (with pkgs.python311Packages; [
-      python
-      pyclip # For Waydroid?
-    ])
-    ++ (with pkgs; [
-      # Misc CLI
-      acpi
-
-      (writeShellScriptBin "Gparted" ''
-        (
-          sleep 1.5
-          while killall -r -0 ksshaskpass > /dev/null 2>&1
-          do
-            sleep 0.1
-            if [[ $(hyprctl activewindow | grep Ksshaskpass) == "" ]]; then
-                killall -r ksshaskpass
-            fi
-          done
-        ) &
-        exec env SUDO_ASKPASS=${plasma5Packages.ksshaskpass}/bin/${plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@"
-      '')
-    ]);
-
-  xdg.desktopEntries.gparted = {
-    name = "GParted";
-    genericName = "Partition Editor";
-    comment = "Create, reorganize, and delete partitions";
-    exec = "Gparted";
-    icon = "gparted";
-    terminal = false;
-    type = "Application";
-    categories = ["GNOME" "System" "Filesystem"];
-    startupNotify = true;
-    settings = {
-      Keywords = "Partition";
-      X-GNOME-FullName = "GParted Partition Editor";
-    };
-  };
-}

flake.in.nix

@@ -119,9 +119,10 @@
         packages = with pkgs; [
           alejandra
           git
+          nix-output-monitor
 
           (writeShellScriptBin "mkIso" (lib.concatStrings [
-            "nix build $(realpath /etc/nixos)#nixosConfigurations."
+            "nom build $(realpath /etc/nixos)#nixosConfigurations."
             "live-image.config.system.build.isoImage"
           ]))
         ];

modules/desktop/desktop-environment/config/kdeglobals

@@ -4,7 +4,7 @@ TerminalApplication=foot
 [KFileDialog Settings]
 Allow Expansion=false
 Automatically select filename extension=true
-Breadcrumb Navigation=true
+Breadcrumb Navigation=false
 Decoration position=2
 LocationCombo Completionmode=5
 PathCombo Completionmode=5

modules/desktop/desktop-environment/packages.nix

@@ -4,14 +4,14 @@
   lib,
   pkgs,
   self,
-  Vencord-src,
   ...
 }: let
-  inherit (lib) makeLibraryPath optionalString;
+  inherit (lib) makeLibraryPath mkIf optionalString;
   inherit (pkgs.writers) writeTOML;
 
   flakeDir = config.environment.variables.FLAKE;
   cfg = config.roles.desktop;
+  nvidiaEnable = config.nvidia.enable;
 in {
   imports = [./dolphin.nix];
 
@@ -27,7 +27,8 @@ in {
         symlink = config.lib.file.mkOutOfStoreSymlink;
         configDir = "${flakeDir}/modules/desktop/desktop-environment/config";
       in {
-        xdg.configFile = {
+        xdg = {
+          configFile = {
             "dolphinrc".source = symlink "${configDir}/dolphinrc";
             "kdeglobals".source = symlink "${configDir}/kdeglobals";
             "kiorc".source = symlink "${configDir}/kiorc";
@@ -47,6 +48,59 @@ in {
               };
             };
           };
+
+          desktopEntries =
+            (mkIf nvidiaEnable {
+              "com.github.iwalton3.jellyfin-media-player" = {
+                name = "Jellyfin Media Player";
+                comment = "Desktop client for Jellyfin";
+                exec = "jellyfinmediaplayer --platform xcb";
+                icon = "com.github.iwalton3.jellyfin-media-player";
+                terminal = false;
+                type = "Application";
+                categories = ["AudioVideo" "Video" "Player" "TV"];
+                settings = {
+                  Version = "1.0";
+                  StartupWMClass = "jellyfin-media-player";
+                };
+                actions = {
+                  "DesktopF" = {
+                    name = "Desktop [Fullscreen]";
+                    exec = "jellyfinmediaplayer --fullscreen --desktop --platform xcb";
+                  };
+                  "DesktopW" = {
+                    name = "Desktop [Windowed]";
+                    exec = "jellyfinmediaplayer --windowed --desktop --platform xcb";
+                  };
+                  "TVF" = {
+                    name = "TV [Fullscreen]";
+                    exec = "jellyfinmediaplayer --fullscreen --tv --platform xcb";
+                  };
+                  "TVW" = {
+                    name = "TV [Windowed]";
+                    exec = "jellyfinmediaplayer --windowed --tv --platform xcb";
+                  };
+                };
+              };
+            })
+            // {
+              gparted = {
+                name = "GParted";
+                genericName = "Partition Editor";
+                comment = "Create, reorganize, and delete partitions";
+                exec = "Gparted";
+                icon = "gparted";
+                terminal = false;
+                type = "Application";
+                categories = ["GNOME" "System" "Filesystem"];
+                startupNotify = true;
+                settings = {
+                  Keywords = "Partition";
+                  X-GNOME-FullName = "GParted Partition Editor";
+                };
+              };
+            };
+        };
       })
     ];
 
@@ -77,6 +131,20 @@ in {
         nextcloud-client
         prismlauncher
 
+        (writeShellScriptBin "Gparted" ''
+          (
+            sleep 1.5
+            while killall -r -0 ksshaskpass > /dev/null 2>&1
+            do
+              sleep 0.1
+              if [[ $(hyprctl activewindow | grep Ksshaskpass) == "" ]]; then
+                  killall -r ksshaskpass
+              fi
+            done
+          ) &
+          exec env SUDO_ASKPASS=${plasma5Packages.ksshaskpass}/bin/${plasma5Packages.ksshaskpass.pname} sudo -k -EA "${gparted}/bin/${gparted.pname}" "$@"
+        '')
+
         # tools
         wl-color-picker
         wl-clipboard