From 17487f010d68c96bb898e77071efd789e0e6a5cf Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Sun, 21 Apr 2024 19:46:07 +0100
Subject: [PATCH] Refactor gnome.nix

---
 hosts/desktop.nix         | 20 ++++++++++++++++++++
 modules/desktop/gnome.nix | 18 +-----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 21933ee..7d80141 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -32,8 +32,28 @@
 
   systemd.services.NetworkManager-wait-online.enable = false;
 
+  fonts.packages = with pkgs; [
+    noto-fonts
+    (nerdfonts.override { fonts = [ "BigBlueTerminal" "ComicShannsMono" "Terminus" "UbuntuMono" ]; })
+  ];
+
   modules = {
     desktop.gnome.enable = true;
     networking.tailscale.enable = true;
   };
+
+  environment.systemPackages = with pkgs; [
+    bind
+    bmon
+    fd
+    ffmpeg
+    iotop
+    unstable.nix-tree
+    ripgrep
+    rsync
+    tcpdump
+    tokei
+    tree
+    wl-clipboard
+  ];
 }
diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index 0ff8ec2..817958f 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -145,6 +145,7 @@ in {
       };
       "org/gnome/desktop/interface" = {
         enable-hot-corners = false;
+        icon-theme = "MoreWaita";
         monospace-font-name = "UbuntuMono Nerd Font 11";
       };
       "org/gnome/desktop/wm/keybindings" = {
@@ -156,11 +157,6 @@ in {
       };
     };
 
-    fonts.packages = with pkgs; [
-      noto-fonts
-      (nerdfonts.override { fonts = [ "BigBlueTerminal" "ComicShannsMono" "Terminus" "UbuntuMono" ]; })
-    ];
-
     user.packages = with pkgs; [
       authenticator
       # bottles
@@ -185,10 +181,6 @@ in {
 
     environment.systemPackages = with pkgs; [
       adw-gtk3
-      bind
-      bmon
-      fd
-      ffmpeg
       gnome.gnome-boxes
       gnomeExtensions.another-window-session-manager
       # gnomeExtensions.bifocals
@@ -219,15 +211,7 @@ in {
       # gnomeExtensions.window-is-ready-remover
       # gnomeExtensions.worksets
       # gnomeExtensions.workspace-matrix
-      iotop
       unstable.morewaita-icon-theme
-      unstable.nix-tree
-      ripgrep
-      rsync
-      tcpdump
-      tokei
-      tree
-      wl-clipboard
     ] ++ (if config.virtualisation.podman.enable then [
       pods
     ] else []);