From 9da84042282485cffa90cf7b98c82a76ad63a73f Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Mon, 1 Jan 2024 21:31:15 +0900
Subject: [PATCH] Reconfigure Gnome

---
 .../common/desktops/gnome/default.nix         |  3 +-
 .../gnome/{common => }/gnome-dconf.nix        |  0
 .../desktops/gnome/themes/default/default.nix |  4 --
 .../desktops/gnome/themes/gruvbox/default.nix | 63 -------------------
 nixos/common/desktops/gnome/default.nix       | 12 ++--
 5 files changed, 5 insertions(+), 77 deletions(-)
 rename home-manager/common/desktops/gnome/{common => }/gnome-dconf.nix (100%)
 delete mode 100644 home-manager/common/desktops/gnome/themes/default/default.nix
 delete mode 100644 home-manager/common/desktops/gnome/themes/gruvbox/default.nix

diff --git a/home-manager/common/desktops/gnome/default.nix b/home-manager/common/desktops/gnome/default.nix
index ccdacdf6..a14228fd 100644
--- a/home-manager/common/desktops/gnome/default.nix
+++ b/home-manager/common/desktops/gnome/default.nix
@@ -1,7 +1,6 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
 { lib, hostname, username, theme, ... }: {
     imports = [
-        ./themes/${theme}
-        ./common/gnome-dconf.nix
+        ./gnome-dconf.nix
     ];
 }
\ No newline at end of file
diff --git a/home-manager/common/desktops/gnome/common/gnome-dconf.nix b/home-manager/common/desktops/gnome/gnome-dconf.nix
similarity index 100%
rename from home-manager/common/desktops/gnome/common/gnome-dconf.nix
rename to home-manager/common/desktops/gnome/gnome-dconf.nix
diff --git a/home-manager/common/desktops/gnome/themes/default/default.nix b/home-manager/common/desktops/gnome/themes/default/default.nix
deleted file mode 100644
index fb66ad7c..00000000
--- a/home-manager/common/desktops/gnome/themes/default/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
-{ lib, hostname, username, ... }: with lib.hm.gvariant;  {
-  
-}
diff --git a/home-manager/common/desktops/gnome/themes/gruvbox/default.nix b/home-manager/common/desktops/gnome/themes/gruvbox/default.nix
deleted file mode 100644
index 8d7db077..00000000
--- a/home-manager/common/desktops/gnome/themes/gruvbox/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
-{ lib, hostname, username, ... }: with lib.hm.gvariant; 
-let
-  # General Theming
-  font = "FontAwesome Bold 11";
-  font-doc = "FontAwesome Regular 11";
-  font-mono = "JetBrainsMono Nerd Font Propo Medium 11";
-
-  # Day Variant
-  day-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper9.jpg";
-  day-gtk-theme = "";
-  day-shell-theme = "vimix-doder";
-  day-icon-theme = "Vimix-Doder";
-
-  # Night Variant
-  night-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper12.jpg";
-  night-gtk-theme = "";
-  night-shell-theme = "Gruvbox-Dark-BL";
-  night-icon-theme = "Nordzy-yellow-dark";
-in {
-  # Gnome GTK Settings
-  gtk.theme = "${night-gtk-theme}";
-
-  # Gnome DCONF Settings
-  dconf.settings = {
-    "org/gnome/desktop/background" = {
-      picture-uri = "${day-wallpaper}";
-      picture-uri-dark = "${night-wallpaper}";
-    };
-
-    "org/gnome/shell/extensions/nightthemeswitcher/gtk-variants" = {
-      enabled = true;
-      day = "${day-gtk-theme}";
-      night = "${night-gtk-theme}";
-    };
-
-    "org/gnome/shell/extensions/nightthemeswitcher/icon-variants" = {
-      enabled = true;
-      day = "${day-icon-theme}";
-      night = "${night-icon-theme}";
-    };
-
-    "org/gnome/shell/extensions/nightthemeswitcher/shell-variants" = {
-      enabled = true;
-      day = "${day-shell-theme}";
-      night = "${night-shell-theme}";
-    };
-
-    "org/gnome/desktop/interface" = {
-      clock-show-date = true;
-      clock-show-weekday = false;
-      color-scheme = "prefer-light";
-      font-antialiasing = "rgba";
-      font-hinting = "slight";
-      gtk-theme = "${day-gtk-theme}";
-      icon-theme = "${night-icon-theme}";
-      monospace-font-name = "${font-mono}";
-      font-name = "${font}";
-      document-font-name = "${font-doc}";
-      show-battery-percentage = false;
-    };
-  };
-}
diff --git a/nixos/common/desktops/gnome/default.nix b/nixos/common/desktops/gnome/default.nix
index ab9b77ad..f6ac3c44 100644
--- a/nixos/common/desktops/gnome/default.nix
+++ b/nixos/common/desktops/gnome/default.nix
@@ -67,11 +67,10 @@
 
   environment.systemPackages = with pkgs; [
     # Gnome Extensions
-    gnomeExtensions.forge
-    gnomeExtensions.dash-to-dock
+    gnomeExtensions.arcmenu
+    gnomeExtensions.tiling-assistant
+    gnomeExtensions.dash-to-panel
     gnomeExtensions.blur-my-shell
-    gnomeExtensions.vitals
-    gnomeExtensions.user-themes
     gnomeExtensions.caffeine
     gnomeExtensions.hibernate-status-button
     gnomeExtensions.night-theme-switcher
@@ -81,16 +80,13 @@
     gnome3.gnome-tweaks
     papirus-icon-theme
     dconf2nix # https://github.com/gvolpe/dconf2nix
-    # Tweak libadwaita themes
-    gradience
-    adw-gtk3
 
     gnome.gnome-session
   ];
 
   imports = [ 
     # Gnome Themes
-    ./themes/arc.nix
+    # ./themes/arc.nix
     # ./themes/gruvbox.nix
     # ./themes/tokyo-night.nix
     # ./themes/nordic.nix