solaire: switch back to gnome (easier to game on than niri)

home/default.nix

@@ -1,8 +1,4 @@
 {
-  lib,
-  self,
-  ...
-}: {
   imports = [
     ./terminal
   ];

home/profiles/solaire/default.nix

@@ -1,22 +1,11 @@
-{
+{self, ...}: {
-  self,
-  inputs,
-  ...
-}: {
   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"
   ];
 }

home/programs/default.nix

@@ -1,9 +1,9 @@
 {pkgs, ...}: {
   imports = [
     ./browsers.nix
-    ./gtk.nix
     ./media
     ./xdg.nix
+    ./gtk.nix
   ];
 
   programs = {

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" = {

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 = {
+    theme = lib.mkIf (!osConfig.services.xserver.desktopManager.gnome.enable) {
-      inherit (nixosConfig.style.gtk.theme) name package;
+      inherit (osConfig.style.gtk.theme) name package;
     };
   };
   dconf.settings = {

hosts/default.nix

@@ -55,9 +55,7 @@
         ++ [
           ./solaire
 
-          "${mod}/services/greetd.nix"
+          "${mod}/programs/gnome.nix"
-          "${mod}/programs/niri"
-          "${mod}/services/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;
             };
           }

system/programs/gnome.nix

@@ -22,6 +22,7 @@
     atomix
     gnome-contacts
     gnome-initial-setup
+    gnome-terminal
     gnome-music
     gedit
     cheese