From aa700320ec5bc92b64ca4355900cfe8654974d77 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Fri, 5 Jul 2024 13:32:36 +0200
Subject: [PATCH] Packages are being moved out of the gnome scope

For now, gnome-calculator and nautilus are relevant here.
gnome-keyring too, but that needs to be updated in home-manager.
---
 home-manager/modules/hyprland/default.nix | 2 +-
 home-manager/modules/i3/default.nix       | 2 +-
 home-manager/modules/river/default.nix    | 2 +-
 home-manager/modules/sway/default.nix     | 2 +-
 machines/thor/home.nix                    | 2 +-
 users/erwin/home.nix                      | 2 +-
 users/erwin/work.nix                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix
index 8712c5b..e6ffce1 100644
--- a/home-manager/modules/hyprland/default.nix
+++ b/home-manager/modules/hyprland/default.nix
@@ -113,7 +113,7 @@ in
     #         bind = ,XF86AudioRaiseVolume,exec,${pkgs.pamedia}/bin/pamedia up
     #         bind = ,XF86AudioLowerVolume,exec,${pkgs.pamedia}/bin/pamedia down
     #         bind = ,XF86AudioMute,exec,${pkgs.pamedia}/bin/pamedia mute
-    #         bind = ,XF86Calculator,exec,${pkgs.gnome.gnome-calculator}/bin/gnome-calculator
+    #         bind = ,XF86Calculator,exec,${pkgs.gnome-calculator}/bin/gnome-calculator
 
     #         bind = $mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw
 
diff --git a/home-manager/modules/i3/default.nix b/home-manager/modules/i3/default.nix
index 3cb9a0f..b648445 100644
--- a/home-manager/modules/i3/default.nix
+++ b/home-manager/modules/i3/default.nix
@@ -196,7 +196,7 @@ in
             "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia up";
             "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia down";
             "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia mute";
-            "XF86Calculator" = "exec ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator";
+            "XF86Calculator" = "exec ${pkgs.gnome-calculator}/bin/gnome-calculator";
           };
 
           modes = {
diff --git a/home-manager/modules/river/default.nix b/home-manager/modules/river/default.nix
index 01af1ec..52d5443 100644
--- a/home-manager/modules/river/default.nix
+++ b/home-manager/modules/river/default.nix
@@ -134,7 +134,7 @@ in
               "None XF86AudioRaiseVolume" = "spawn '${pkgs.pamedia}/bin/pamedia up'";
               "None XF86AudioLowerVolume" = "spawn '${pkgs.pamedia}/bin/pamedia down'";
               "None XF86AudioMute" = "spawn '${pkgs.pamedia}/bin/pamedia mute'";
-              "None XF86Calculator" = "spawn ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator";
+              "None XF86Calculator" = "spawn ${pkgs.gnome-calculator}/bin/gnome-calculator";
 
               "${mod} c" = mkIf config.eboskma.programs.emacs.enable "spawn '${config.eboskma.programs.emacs.package}/bin/emacsclient -c'";
 
diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix
index 732b2ad..b7ff1dd 100644
--- a/home-manager/modules/sway/default.nix
+++ b/home-manager/modules/sway/default.nix
@@ -256,7 +256,7 @@ in
           "XF86AudioRaiseVolume" = "exec ${pkgs.pamedia}/bin/pamedia up";
           "XF86AudioLowerVolume" = "exec ${pkgs.pamedia}/bin/pamedia down";
           "XF86AudioMute" = "exec ${pkgs.pamedia}/bin/pamedia mute";
-          "XF86Calculator" = "exec ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator";
+          "XF86Calculator" = "exec ${pkgs.gnome-calculator}/bin/gnome-calculator";
 
           "${mod}+d" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel --skip-wait";
           "${mod}+Shift+d" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-dnd --skip-wait";
diff --git a/machines/thor/home.nix b/machines/thor/home.nix
index 406c56f..fa7ff21 100644
--- a/machines/thor/home.nix
+++ b/machines/thor/home.nix
@@ -58,12 +58,12 @@ in
         bottom
         falkon
         fd
-        gnome.nautilus
         imagemagick
         imv
         iotop
         libnotify
         mpv
+        nautilus
         nordzy-cursor-theme
         quintom-cursor-theme
         procs
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index 9e5d55f..537c470 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -202,7 +202,6 @@ in
             fd
             ffmpeg_5-full
             freecad
-            gnome.nautilus
             helvum
             imagemagick
             (imv.override {
@@ -223,6 +222,7 @@ in
             libreoffice-fresh
             minio-client
             mpv
+            nautilus
             nheko
             (noson.overrideAttrs (_: {
               qtWrapperArgs = "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.libpulseaudio ]}";
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index af38860..eaebe91 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -248,7 +248,6 @@ in
             easyeffects
             fd
             ffmpeg_5-full
-            gnome.nautilus
             icemon
             imagemagick
             (imv.override {
@@ -267,6 +266,7 @@ in
             libreoffice-fresh
             minio-client
             mpv
+            nautilus
             nheko
             pamedia
             pass