From 3ff173a608a5520a3b8ffe758f36bbc9e5e11d3d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 15 Oct 2023 11:32:51 +0100
Subject: [PATCH] Change to Tokyonight GTK theme, change wallpaper

---
 home/hyprland/config.nix                      |   2 -
 home/hyprland/gtk.nix                         |  10 ++--
 system/desktop.nix                            |  47 ++++++++----------
 .../wallpapers/{wallpaper.jpg => default.jpg} | Bin
 4 files changed, 25 insertions(+), 34 deletions(-)
 rename system/wallpapers/{wallpaper.jpg => default.jpg} (100%)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 70820848..f0c9d7f2 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -150,10 +150,8 @@ in ''
   $layers = ^(waybar|system-menu|anyrun|gtk-layer-shell|swaync-.+|swayosd)$
   layerrule = blur, $layers
   layerrule = ignorealpha 0.5, $layers
-  layerrule = xray 1, $layers
 
   # Window rules
-  windowrule = xray 1,(alacritty)
   windowrule = float,(org.kde.polkit-kde-authentication-agent-1)
   windowrule = center,(org.kde.polkit-kde-authentication-agent-1)
   windowrule = pin,(org.kde.polkit-kde-authentication-agent-1)
diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix
index d4ee7fe4..dd6a8535 100644
--- a/home/hyprland/gtk.nix
+++ b/home/hyprland/gtk.nix
@@ -1,11 +1,7 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [
-    gnome.adwaita-icon-theme
-    libsForQt5.breeze-gtk
-    hicolor-icon-theme
-  ];
+  stylix.targets.gtk.enable = false;
   gtk = {
     enable = true;
     cursorTheme = {
@@ -16,6 +12,10 @@
       package = pkgs.papirus-icon-theme;
       name = "Papirus-Dark";
     };
+    theme = {
+      package = pkgs.tokyo-night-gtk;
+      name = "Tokyonight-Dark-BL";
+    };
   };
   xdg.configFile."gtklock/config.ini".text = let
     powerbar = "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so";
diff --git a/system/desktop.nix b/system/desktop.nix
index f72fe3c8..24eb3193 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -2,31 +2,27 @@
 
 {
   imports = [ ./default.nix ./firefox.nix ];
-  environment.systemPackages = with pkgs;
-    with libsForQt5.qt5; [
-      dex
-      mesa
-      libnotify
-      glib
-      gsettings-desktop-schemas
-      qtgraphicaleffects
-      qtsvg
-      qtquickcontrols2
-      protonvpn-cli
-      protonvpn-gui
-      qbittorrent
-      signal-desktop
-      fractal
-      libreoffice
-      zotero
-      minesweep-rs
-      remmina
-      nomachine-client
-    ];
+  environment.systemPackages = with pkgs; [
+    dex
+    mesa
+    libnotify
+    glib
+    gsettings-desktop-schemas
+    protonvpn-cli
+    protonvpn-gui
+    transmission-gtk
+    signal-desktop
+    fractal
+    libreoffice
+    zotero
+    minesweep-rs
+    remmina
+    nomachine-client
+  ];
   stylix = {
-    image = ./wallpapers/waves/cat-waves.png;
+    image = ./wallpapers/default.jpg;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-    fonts = {
+    fonts = rec {
       emoji = {
         name = "Noto Color Emoji";
         package = pkgs.noto-fonts-emoji;
@@ -39,10 +35,7 @@
         name = "Fira Sans";
         package = pkgs.fira;
       };
-      serif = {
-        name = "Fira Sans";
-        package = pkgs.fira;
-      };
+      serif = sansSerif;
       sizes = {
         applications = 12;
         desktop = 12;
diff --git a/system/wallpapers/wallpaper.jpg b/system/wallpapers/default.jpg
similarity index 100%
rename from system/wallpapers/wallpaper.jpg
rename to system/wallpapers/default.jpg