From d5bd3270f7fdf9896ce0ca20bce070b30fdee599 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Thu, 14 Mar 2024 01:05:29 +0100
Subject: [PATCH] Up

---
 README.md                 |  5 +++--
 home/home.nix             |  2 ++
 home/hyprland/default.nix | 35 ++++++++++++++++++++++++++---------
 home/scripts/nixy.nix     | 12 +++++++++++-
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 9638ba7..96f941b 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,9 @@ Themes and colors are managed by the `home/variable/theme` folder.
 
 - `nixy-edit`
 - `nixy-rebuild`
-- `nixy-gc`
 - `nixy-update`
+- `nixy-gc` # garbage collection
+- `nixy-cb` # clean boot menu
 
 ## Brightness control
 
@@ -59,7 +60,7 @@ Themes and colors are managed by the `home/variable/theme` folder.
 
 ## Caffeine
 
-Caffeine is a simple script that toggles the hypridle (disable suspend & screenlock).
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
 
 - `caffeine` # Toggle caffeine
 - `caffeine-status` # Return active/inactive
diff --git a/home/home.nix b/home/home.nix
index d5ac82a..322b0fc 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -44,8 +44,10 @@
     tldr
     qt5ct
     libva
+    dconf
     wget
     ripgrep
+    xfce.thunar
 
     # Just cool
     cbonsai
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index be7979d..0077cbf 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -9,9 +9,6 @@
     wl-clipboard
     brightnessctl
     gnome.gnome-themes-extra
-    adwaita-qt
-    adwaita-qt6
-    gnome.adwaita-icon-theme
     wlsunset
     xwayland
     xdg-desktop-portal-gtk
@@ -19,7 +16,6 @@
     wayland-utils
     wayland-protocols
     meson
-    xfce.thunar
   ];
 
   wayland.windowManager.hyprland = {
@@ -90,14 +86,10 @@
         "XDG_CURRENT_DESKTOP,Hyprland"
         "XDG_SESSION_TYPE,wayland"
         "XDG_SESSION_DESKTOP,Hyprland"
-        "QT_QPA_PLATFORMTHEME,qt5ct"
         "QT_AUTO_SCREEN_SCALE_FACTOR,1"
         "QT_QPA_PLATFORM=wayland,xcb"
         "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
-        "QT_STYLE_OVERRIDE,Adwaita-Dark"
-        "T_QPA_PLATFORMTHEME,qt5ct"
-        "GTK_THEME,Adwaita:dark"
-        "GTK2_RC_FILES,/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc"
+        "GTK_THEME,Flat-Remix-GTK-Grey-Darkest:dark"
       ];
 
       general = {
@@ -160,4 +152,29 @@
 
     };
   };
+
+  qt = {
+    enable = true;
+    platformTheme = "gtk";
+    style.name = "gtk2";
+  };
+
+  gtk = {
+    enable = true;
+    theme = {
+      package = pkgs.flat-remix-gtk;
+      name = "Flat-Remix-GTK-Grey-Darkest";
+    };
+
+    iconTheme = {
+      package = pkgs.flat-remix-icon-theme;
+      name = "Flat-Remix-Grey-Darkest";
+    };
+
+    font = {
+      name = config.theme.font;
+      size = 11;
+    };
+  };
+
 }
diff --git a/home/scripts/nixy.nix b/home/scripts/nixy.nix
index 2ac36c7..07025d1 100644
--- a/home/scripts/nixy.nix
+++ b/home/scripts/nixy.nix
@@ -18,6 +18,16 @@ let
     cd ${homedir}/.config/nixos && sudo nix-collect-garbage -d
   '';
 
+  nixy-cb = pkgs.writeShellScriptBin "nixy-cb" ''
+    sudo /run/current-system/bin/switch-to-configuration boot
+  '';
+
 in {
-  home.packages = with pkgs; [ nixy-rebuild nixy-edit nixy-update nixy-gc ];
+  home.packages = with pkgs; [
+    nixy-rebuild
+    nixy-edit
+    nixy-update
+    nixy-gc
+    nixy-cb
+  ];
 }