From e91134aec1e0e50533f9b3d5e69e41269f5bc0b3 Mon Sep 17 00:00:00 2001
From: Alex <alexmat2on@protonmail.com>
Date: Thu, 1 Aug 2024 18:32:26 -0400
Subject: [PATCH] thelio76: get theme working better

---
 config/modules/bspwm/bspwm.nix   |  2 ++
 config/modules/bspwm/default.nix | 19 ++++++++++++-------
 config/modules/bspwm/sxhkd.nix   |  2 +-
 config/users/alex/default.nix    |  5 +++++
 flake.lock                       | 10 +++++-----
 flake.nix                        |  5 +++--
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/config/modules/bspwm/bspwm.nix b/config/modules/bspwm/bspwm.nix
index 408dac4..6b63af0 100644
--- a/config/modules/bspwm/bspwm.nix
+++ b/config/modules/bspwm/bspwm.nix
@@ -18,6 +18,8 @@
 
       # Mouse 3 button (right mouse) resize by corner:
       bspc config pointer_action2 resize_corner 
+
+      ${pkgs.feh}/bin/feh --bg-fill ${pkgs.atau-pkgs.atau-wallpapers}/share/backgrounds/atau-wallpapers/aos1.png
     '';
     startupPrograms = [ "picom" "polybar primary" "polybar secondary" ];
   };
diff --git a/config/modules/bspwm/default.nix b/config/modules/bspwm/default.nix
index 68d40a8..d8abc70 100644
--- a/config/modules/bspwm/default.nix
+++ b/config/modules/bspwm/default.nix
@@ -1,14 +1,19 @@
 { pkgs, ... }:
 {
   # WM/DE config
-  gtk = {
-    enable = true;
-    font.name = "Victor Mono SemiBold 12";
-    theme = {
-      name = "SolArc-Dark";
-      package = pkgs.solarc-gtk-theme;
+  gtk = with pkgs.atau-pkgs;
+    {
+      enable = true;
+      font.name = "Victor Mono SemiBold 12";
+      theme = {
+        name = "Mac-OS-9";
+        package = gtk-theme-mac-os-9;
+      };
+      iconTheme = {
+        name = "NineIcons";
+        package = nineicons-redux;
+      };
     };
-  };
 
   xsession.enable = true;
 
diff --git a/config/modules/bspwm/sxhkd.nix b/config/modules/bspwm/sxhkd.nix
index 5b5f8ae..36bfdc9 100644
--- a/config/modules/bspwm/sxhkd.nix
+++ b/config/modules/bspwm/sxhkd.nix
@@ -77,7 +77,7 @@
       "super + {Left,Down,Up,Right}" =
         "	bspc node -v {-20 0,0 20,0 -20,20 0}";
 
-      "Super_L; @Super_L" = "rofi -show drun -monitor $(bspc query --monitors -m focused --names)";
+      "Super_L; @Super_L" = "rofi -show drun -show-icons -monitor $(bspc query --monitors -m focused --names)";
     };
   };
 }
diff --git a/config/users/alex/default.nix b/config/users/alex/default.nix
index 55c01e0..2e13aba 100644
--- a/config/users/alex/default.nix
+++ b/config/users/alex/default.nix
@@ -19,6 +19,11 @@
 
   # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
+    atau-pkgs.nineicons-redux
+    atau-pkgs.theme-platinum9
+    atau-pkgs.gtk-theme-mac-os-9
+    themechanger
+
     aseprite
     audacity
     blender
diff --git a/flake.lock b/flake.lock
index b9584d7..8b2e633 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,17 +7,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1687541340,
-        "narHash": "sha256-l1Va3mygpLmtV0CeaHGETvb0y5SwWD3kM4dBu5IX9Jw=",
+        "lastModified": 1722548406,
+        "narHash": "sha256-E4aw+cCGEvFUcB9F55lUyZnclSE2L+ENCTOzmeQPQxI=",
         "ref": "main",
-        "rev": "1e72f4b1e9b7a2991e3ccdebbe75d312f016da3b",
-        "revCount": 10,
+        "rev": "36c303d6a273cba06d68964c98aee0eb79928b2b",
+        "revCount": 15,
         "type": "git",
         "url": "https://git.atauno.com/atau/atau-nixpkgs"
       },
       "original": {
         "ref": "main",
-        "rev": "1e72f4b1e9b7a2991e3ccdebbe75d312f016da3b",
+        "rev": "36c303d6a273cba06d68964c98aee0eb79928b2b",
         "type": "git",
         "url": "https://git.atauno.com/atau/atau-nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 0b62e78..f137f4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,12 +16,12 @@
     };
 
     atau-nixpkgs = {
-      url = "git+https://git.atauno.com/atau/atau-nixpkgs?ref=main&rev=1e72f4b1e9b7a2991e3ccdebbe75d312f016da3b";
+      url = "git+https://git.atauno.com/atau/atau-nixpkgs?ref=main&rev=36c303d6a273cba06d68964c98aee0eb79928b2b";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, firefox-addons, ... }@flake-inputs:
+  outputs = { self, nixpkgs, home-manager, firefox-addons, atau-nixpkgs, ... }@flake-inputs:
     let
       pcUser = "alex";
       pcSystem = "x86_64-linux";
@@ -30,6 +30,7 @@
       mkPcSystem = { user ? pcUser, hostname, system ? pcSystem, inputs ? flake-inputs }: nixpkgs.lib.nixosSystem {
         inherit system;
         modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ atau-nixpkgs.overlays.default ]; })
           ./config/hosts/${hostname}
         ] ++ (import ./config/modules/home-manager.nix {
           inherit system inputs user;