From b11eac28b7e38c99a900f3eb2bec1a39d29df7a8 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Thu, 30 Oct 2025 17:49:55 +0100
Subject: [PATCH] chore: move many things to `gui` role

---
 modules/home/hyprland/config.nix |  58 ----------------
 roles/gui.nix                    | 109 ++++++++++++++++++++++---------
 2 files changed, 79 insertions(+), 88 deletions(-)

diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index bd87ad0..2652a51 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -5,59 +5,6 @@
   ...
 }:
 {
-  fonts.fontconfig.enable = true;
-  home.packages = [
-    # pkgs.nerdfonts
-    # (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-    pkgs.twemoji-color-font
-    pkgs.noto-fonts-emoji
-    pkgs.swww
-    pkgs.swaylock
-    pkgs.pywal16
-  ];
-
-  gtk = {
-    enable = true;
-    font = {
-      name = "GohuFont 14 Nerd Font Mono";
-      size = 14;
-    };
-    theme = {
-      name = "Juno";
-      package = pkgs.juno-theme; # .override {
-      # colorVariants = [ "dark" ];
-      # themeVariants = [ "green" ];
-      # tweakVariants = [ "macos" ];
-      # };
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme.override {
-        color = "black";
-      };
-    };
-    cursorTheme = {
-      name = "Bibata-Modern-Ice";
-      package = pkgs.bibata-cursors;
-      size = 24;
-    };
-  };
-
-  home.pointerCursor = {
-    name = "Bibata-Modern-Ice";
-    package = pkgs.bibata-cursors;
-    size = 24;
-  };
-
-  dconf = {
-    enable = true;
-    settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-    };
-  };
-
   wayland.windowManager.hyprland = {
     settings = {
 
@@ -102,11 +49,6 @@
         };
       };
 
-      #gestures = {
-      #  workspace_swipe = true;
-      #  workspace_swipe_invert = true;
-      #};
-
       general = {
         "$mainMod" = "ALT";
         layout = "dwindle";
diff --git a/roles/gui.nix b/roles/gui.nix
index 234d6da..c69ce8d 100644
--- a/roles/gui.nix
+++ b/roles/gui.nix
@@ -24,39 +24,88 @@ in
       gnome.gnome-keyring.enable = true;
       dbus.enable = true;
     };
+    home-manager.users.${username} = {
+      fonts.fontconfig.enable = true;
+      gtk = {
+        enable = true;
+        font = {
+          name = "GohuFont 14 Nerd Font Mono";
+          size = 14;
+        };
+        theme = {
+          name = "Juno";
+          package = pkgs.juno-theme; # .override {
+          # colorVariants = [ "dark" ];
+          # themeVariants = [ "green" ];
+          # tweakVariants = [ "macos" ];
+          # };
+        };
+        iconTheme = {
+          name = "Papirus-Dark";
+          package = pkgs.papirus-icon-theme.override {
+            color = "black";
+          };
+        };
+        cursorTheme = {
+          name = "Bibata-Modern-Ice";
+          package = pkgs.bibata-cursors;
+          size = 24;
+        };
+      };
 
-    home-manager.users.${username}.home.packages = with pkgs; [
-      element-desktop
-      dino
-      signal-desktop
-      mumble
-      anki-bin
-      obs-studio
-      wdisplays
-      librewolf # main
-      ungoogled-chromium # for things that don't work with librewolf
-      nsxiv
-      imv
-      libreoffice
-      xfce.thunar
-      # spotify
-      spotify-player
-      thunderbird
-      lxqt.pavucontrol-qt
-      mpv
-      kdePackages.kdeconnect-kde
-      winbox
-      # onthespot-overlay
+      home.pointerCursor = {
+        name = "Bibata-Modern-Ice";
+        package = pkgs.bibata-cursors;
+        size = 24;
+      };
 
-      # Gaming
-      lunar-client
+      dconf = {
+        enable = true;
+        settings = {
+          "org/gnome/desktop/interface" = {
+            color-scheme = "prefer-dark";
+          };
+        };
+      };
+      home.packages = with pkgs; [
+        element-desktop
+        dino
+        signal-desktop
+        mumble
+        anki-bin
+        obs-studio
+        wdisplays
+        librewolf # main
+        ungoogled-chromium # for things that don't work with librewolf
+        nsxiv
+        imv
+        libreoffice
+        xfce.thunar
+        # spotify
+        spotify-player
+        thunderbird
+        lxqt.pavucontrol-qt
+        mpv
+        kdePackages.kdeconnect-kde
+        winbox
+        # onthespot-overlay
 
-      # Not GUI but specific to GUI usage
-      sshuttle
-      sshfs
+        # Gaming
+        lunar-client
 
-      # try out for a bit
-      niri
-    ];
+        # Not GUI but specific to GUI usage
+        sshuttle
+        sshfs
+
+        # previously in hyprland config
+        # pkgs.nerdfonts
+        # (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+        pkgs.twemoji-color-font
+        pkgs.noto-fonts-emoji
+        pkgs.swww
+        pkgs.swaylock
+        pkgs.pywal16
+      ];
+    };
   };
 }