From f5936857e25cf492fda9a8a894ff995583bb0a3a Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 11 Sep 2023 10:30:10 -0500
Subject: [PATCH] Cleanup

---
 daniel.nix       | 12 ++++--
 modules/sway.nix | 96 +++++++++++++++++++++++++++++-------------------
 2 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/daniel.nix b/daniel.nix
index 424dcd5..2e303c1 100644
--- a/daniel.nix
+++ b/daniel.nix
@@ -271,17 +271,21 @@
         '';
 
         userChrome = ''
+          #TabsToolbar {
+            visibility: collapse;
+          }
+
           #webrtcIndicator {
-          	display: none;
+            display: none;
           }
 
           #main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar>.toolbar-items {
-          	opacity: 0;
-          	pointer-events: none;
+            opacity: 0;
+            pointer-events: none;
           }
 
           #main-window:not([tabsintitlebar="true"]) #TabsToolbar {
-          	visibility: collapse !important;
+            visibility: collapse !important;
           }
         '';
 
diff --git a/modules/sway.nix b/modules/sway.nix
index 51b4b27..4009d6c 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -64,41 +64,63 @@ in
     plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
   };
 
-  environment.systemPackages = with pkgs; [
-    brightnessctl
-    feh
-    gimp
-    grim
-    inkscape
-    krita
-    libinput
-    libinput-gestures
-    libnotify
-    lutris
-    mako
-    nil
-    nixpkgs-fmt
-    noto-fonts
-    pamixer
-    pavucontrol
-    pgcli
-    playerctl
-    pulseaudio
-    pulsemixer
-    rclone
-    restic
-    slurp
-    steam
-    swaybg
-    swayidle
-    swaylock
-    vlc
-    vulkan-tools
-    waybar
-    weechat
-    wine
-    wl-clipboard
-    wofi
-    zathura
-  ];
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Catppuccin-Mocha-Compact-Sapphire-dark";
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "sapphire" ];
+        size = "compact";
+        tweaks = [ "rimless" "black" ];
+        variant = "mocha";
+      };
+    };
+  };
+
+  environment = {
+    variables = {
+      GTK_THEME = "hx";
+      VISUAL = "hx";
+      PAGER = "less";
+      MANPAGER = "less";
+    };
+
+    systemPackages = with pkgs; [
+      brightnessctl
+      feh
+      gimp
+      grim
+      inkscape
+      krita
+      libinput
+      libinput-gestures
+      libnotify
+      lutris
+      mako
+      nil
+      nixpkgs-fmt
+      noto-fonts
+      pamixer
+      pavucontrol
+      pgcli
+      playerctl
+      pulseaudio
+      pulsemixer
+      rclone
+      restic
+      slurp
+      steam
+      swaybg
+      swayidle
+      swaylock
+      vlc
+      vulkan-tools
+      waybar
+      weechat
+      wine
+      wl-clipboard
+      wofi
+      zathura
+    ];
+  };
 }