From 078351a0cde81f953523a1d55aedb78e7cdda528 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 17 Nov 2024 00:21:14 +0100
Subject: [PATCH] treewide: normalize gnome packages

---
 profiles/desktop-dev/default.nix |  2 +-
 profiles/gnome/default.nix       | 12 ++++++------
 profiles/nautilus/default.nix    |  4 ++--
 profiles/printing/default.nix    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/profiles/desktop-dev/default.nix b/profiles/desktop-dev/default.nix
index fa34aef..acfdf87 100644
--- a/profiles/desktop-dev/default.nix
+++ b/profiles/desktop-dev/default.nix
@@ -20,7 +20,7 @@ in
       dbeaver-bin
       filezilla
       fritzing
-      gnome.gnome-font-viewer
+      gnome-font-viewer
       inlyne
       meld
       qgis
diff --git a/profiles/gnome/default.nix b/profiles/gnome/default.nix
index 6594d03..96a0121 100644
--- a/profiles/gnome/default.nix
+++ b/profiles/gnome/default.nix
@@ -24,17 +24,17 @@ in
     services = {
       udisks2.enable = true;
       dbus.packages = [ pkgs.dconf ];
-      udev.packages = [ pkgs.gnome.gnome-settings-daemon ];
+      udev.packages = [ pkgs.gnome-settings-daemon ];
       gnome.gnome-keyring.enable = true;
     };
 
     environment.systemPackages = with pkgs; [
       glib
-      gnome.adwaita-icon-theme
-      gnome.dconf-editor
-      gnome.eog
-      gnome.file-roller
-      gnome.gnome-calculator
+      adwaita-icon-theme
+      dconf-editor
+      eog
+      file-roller
+      gnome-calculator
       polkit_gnome
       xdg-utils
     ];
diff --git a/profiles/nautilus/default.nix b/profiles/nautilus/default.nix
index aee8188..38995cf 100644
--- a/profiles/nautilus/default.nix
+++ b/profiles/nautilus/default.nix
@@ -27,10 +27,10 @@ in
 
     environment = {
       systemPackages = with pkgs; [
-        gnome.nautilus
+        nautilus
 
         ffmpegthumbnailer # thumbnails
-        gnome.nautilus-python # enable plugins
+        nautilus-python # enable plugins
         gst_all_1.gst-libav # thumbnails
         nautilus-open-any-terminal # terminal-context-entry
       ];
diff --git a/profiles/printing/default.nix b/profiles/printing/default.nix
index fd93747..897171e 100644
--- a/profiles/printing/default.nix
+++ b/profiles/printing/default.nix
@@ -21,6 +21,6 @@ in
     ];
     programs.system-config-printer.enable = true;
 
-    environment.systemPackages = with pkgs; [ gnome.simple-scan ];
+    environment.systemPackages = with pkgs; [ simple-scan ];
   };
 }