From ef400c9a0d308fba806dca51b29aa62784f63609 Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Fri, 11 Oct 2024 20:27:57 +0200
Subject: [PATCH] feat: make gtk thingies dark again, move gtk to hyprland to
 centralise options

---
 modules/home/default.nix         |  1 -
 modules/home/gtk.nix             | 34 ---------------------
 modules/home/hyprland/config.nix | 51 +++++++++++++++++++++++++++++---
 3 files changed, 47 insertions(+), 39 deletions(-)
 delete mode 100644 modules/home/gtk.nix

diff --git a/modules/home/default.nix b/modules/home/default.nix
index 605c0e5..4996c91 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -3,7 +3,6 @@
        [(import ./bat.nix)]                       # better cat command
     ++ [(import ./git.nix)]                       # version control
     ++ [(import ./security.nix)]                  # yubikey-touch-detector for now
-    ++ [(import ./gtk.nix)]                       # gtk theme
     ++ [(import ./hyprland)]                      # window manager
     ++ [(import ./kitty.nix)]                     # terminal
     ++ [(import ./mako.nix)]                      # notification deamon
diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix
deleted file mode 100644
index c942066..0000000
--- a/modules/home/gtk.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-{
-  fonts.fontconfig.enable = true;
-  home.packages = [
-    pkgs.nerdfonts
-    (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-    pkgs.twemoji-color-font
-    pkgs.noto-fonts-emoji
-  ];
-
-  gtk = {
-    enable = true;
-    font = {
-      name = "JetBrainsMono Nerd Font";
-      size = 11;
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.catppuccin-papirus-folders.override {
-        flavor = "mocha";
-        accent = "lavender";
-      };
-    };
-    theme = {
-      name = "Catppuccin-Mocha-Compact-Lavender-Dark";
-      package = pkgs.catppuccin-gtk.override {
-        accents = [ "lavender" ];
-        size = "compact";
-        # tweaks = [ "rimless" ];
-        variant = "mocha";
-      };
-    };
-  };
-}
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index ba974bb..673c27a 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -1,5 +1,50 @@
-{ ... }: 
+{ pkgs, ... }: 
 {
+  fonts.fontconfig.enable = true;
+  home.packages = [
+    pkgs.nerdfonts
+    (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+    pkgs.twemoji-color-font
+    pkgs.noto-fonts-emoji
+  ];
+
+  gtk = {
+    enable = true;
+    theme = {
+      name = "orchis-theme";
+      package = pkgs.orchis-theme;
+    };
+    iconTheme = {
+      name = "Adwaita";
+      package = pkgs.gnome.adwaita-icon-theme;
+    };
+    cursorTheme = {
+      name = "Adwaita";
+      package = pkgs.gnome.adwaita-icon-theme;
+    };
+    font = {
+      name = "JetBrainsMono Nerd Font";
+      size = 11;
+    };
+  };
+
+  # home.pointerCursor = {
+  #   gtk.enable = true;
+  #   # x11.enable = true;
+  #   package = pkgs.bibata-cursors;
+  #   name = "Bibata-Modern-Classic";
+  #   size = 16;
+  # };
+
+  dconf = {
+    enable = true;
+    settings = {
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+      };
+    };
+  };
+
   wayland.windowManager.hyprland = {
     settings = {
 
@@ -128,9 +173,6 @@
       };
 
       bind = [
-        # show keybinds list
-        "$mainMod, F1, exec, show-keybinds"
-
         # keybindings
         "$mainMod, Return, exec, kitty"
         "$mainMod, Q, killactive,"
@@ -147,6 +189,7 @@
         "$mainMod SHIFT, V, exec, cliphist list | wofi --dmenu | cliphist decode | wl-copy"
 
         "$mainMod SHIFT, F, exec, firefox"
+        "$mainMod SHIFT, W, exec, wdisplays"
         "$mainMod SHIFT, T, exec, thunderbird"
         "$mainMod SHIFT, P, exec, pavucontrol-qt"