From f2ddb413fc042156b2228bb62bd99354fe04fea9 Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Tue, 15 Oct 2024 15:49:53 +0200
Subject: [PATCH] solaire: switch back to gnome (easier to game on than niri)

---
 home/default.nix                  |  4 ----
 home/profiles/solaire/default.nix | 15 ++-------------
 home/programs/default.nix         |  2 +-
 home/programs/gnome/default.nix   |  2 +-
 home/programs/gtk.nix             | 13 +++++++------
 hosts/default.nix                 |  6 ++----
 system/programs/gnome.nix         |  1 +
 7 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 0f073b4..0c81429 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,8 +1,4 @@
 {
-  lib,
-  self,
-  ...
-}: {
   imports = [
     ./terminal
   ];
diff --git a/home/profiles/solaire/default.nix b/home/profiles/solaire/default.nix
index d0f5de9..e67d5f5 100644
--- a/home/profiles/solaire/default.nix
+++ b/home/profiles/solaire/default.nix
@@ -1,22 +1,11 @@
-{
-  self,
-  inputs,
-  ...
-}: {
+{self, ...}: {
   imports = [
     "${self}/home/services/udiskie.nix"
 
     "${self}/home/programs"
 
-    "${self}/home/programs/niri"
-    "${self}/home/programs/ags"
-    "${self}/home/programs/fuzzel.nix"
-    "${self}/home/programs/swaybg.nix"
-    "${self}/home/programs/swaylock.nix"
-    "${self}/home/programs/swayidle.nix"
-
     "${self}/home/terminal/emulators/foot.nix"
-
     "${self}/home/programs/editors/neovim.nix"
+    "${self}/home/programs/editors/helix.nix"
   ];
 }
diff --git a/home/programs/default.nix b/home/programs/default.nix
index df51ebd..8ce7317 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -1,9 +1,9 @@
 {pkgs, ...}: {
   imports = [
     ./browsers.nix
-    ./gtk.nix
     ./media
     ./xdg.nix
+    ./gtk.nix
   ];
 
   programs = {
diff --git a/home/programs/gnome/default.nix b/home/programs/gnome/default.nix
index 2c10eb2..3f5270f 100644
--- a/home/programs/gnome/default.nix
+++ b/home/programs/gnome/default.nix
@@ -25,7 +25,7 @@
         color-scheme = "prefer-dark";
       };
       "org/gnome/desktop/background" = {
-        picture-uri-dark = "file://" + builtins.toString config.theme.wallpaper;
+        picture-uri-dark = "file://" + builtins.toString config.style.wallpaper;
       };
 
       "org/gnome/desktop/search-providers" = {
diff --git a/home/programs/gtk.nix b/home/programs/gtk.nix
index 6aed1a9..265b3a9 100644
--- a/home/programs/gtk.nix
+++ b/home/programs/gtk.nix
@@ -2,13 +2,14 @@
   inputs,
   pkgs,
   config,
-  nixosConfig,
+  osConfig,
+  lib,
   ...
 }: let
-  isDark = inputs.basix.schemeData.base16.${nixosConfig.style.scheme}.variant == "dark";
+  isDark = inputs.basix.schemeData.base16.${osConfig.style.scheme}.variant == "dark";
 in {
   home.pointerCursor = {
-    inherit (nixosConfig.style.cursorTheme) name package size;
+    inherit (osConfig.style.cursorTheme) name package size;
     gtk.enable = true;
     x11.enable = true;
   };
@@ -34,11 +35,11 @@ in {
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
 
     iconTheme = {
-      inherit (nixosConfig.style.gtk.iconTheme) name package;
+      inherit (osConfig.style.gtk.iconTheme) name package;
     };
 
-    theme = {
-      inherit (nixosConfig.style.gtk.theme) name package;
+    theme = lib.mkIf (!osConfig.services.xserver.desktopManager.gnome.enable) {
+      inherit (osConfig.style.gtk.theme) name package;
     };
   };
   dconf.settings = {
diff --git a/hosts/default.nix b/hosts/default.nix
index 8493585..74e516a 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -55,9 +55,7 @@
         ++ [
           ./solaire
 
-          "${mod}/services/greetd.nix"
-          "${mod}/programs/niri"
-          "${mod}/services/gnome.nix"
+          "${mod}/programs/gnome.nix"
 
           "${mod}/hardware/nvidia.nix"
           "${mod}/programs/games.nix"
@@ -65,7 +63,7 @@
           self.nixosModules.style
           {
             style = {
-              gtk.enable = true;
+              gtk.enable = false;
               wallpaper = ../wallpapers/lucy-edgerunners-wallpaper.jpg;
             };
           }
diff --git a/system/programs/gnome.nix b/system/programs/gnome.nix
index 78fb01f..773e712 100644
--- a/system/programs/gnome.nix
+++ b/system/programs/gnome.nix
@@ -22,6 +22,7 @@
     atomix
     gnome-contacts
     gnome-initial-setup
+    gnome-terminal
     gnome-music
     gedit
     cheese