From 9b2f7cd8977b736039e6365ee3ac25d93b85e2ec Mon Sep 17 00:00:00 2001
From: delta <delta@example.com>
Date: Sat, 8 Jun 2024 01:40:38 +0300
Subject: [PATCH] git huanan use noveau+wayland

---
 hosts/huanan/system.nix | 11 ++++++-----
 pkgs/gnome.nix          | 19 +------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/hosts/huanan/system.nix b/hosts/huanan/system.nix
index 425cebf..974f0ce 100644
--- a/hosts/huanan/system.nix
+++ b/hosts/huanan/system.nix
@@ -1,11 +1,12 @@
-{ lib, pkgs, inputs, self, ... }:
+{ lib, pkgs, inputs, self, homeSettings, ... }:
 
 {
   imports = [ 
     ./hardware.nix
     "${self}/pkgs/gnome.nix"
     "${self}/pkgs/apps.nix"
-    inputs.home-manager.nixosModules.home-manager
+    "${self}/pkgs/work.nix"
+    inputs.home-manager.nixosModules.home-manager homeSettings
   ];
 
   time.timeZone = "Europe/Moscow";
@@ -13,11 +14,11 @@
 
   services.xserver = {
     enable = true;
-    videoDrivers = [ "nvidia" ];
+    videoDrivers = [ "noveau" ];
     displayManager = {
       gdm = {
         enable = true;
-        wayland = false;
+        wayland = true;
       };
     };
     desktopManager.gnome.enable = true;
@@ -50,4 +51,4 @@
 
   services.openssh.enable = true;
   system.stateVersion = "23.11"; # Did you read the comment?
-}
\ No newline at end of file
+}
diff --git a/pkgs/gnome.nix b/pkgs/gnome.nix
index e81cfc8..31d3df8 100644
--- a/pkgs/gnome.nix
+++ b/pkgs/gnome.nix
@@ -30,19 +30,6 @@ in
   #   })
   # ];
 
-  nixpkgs.overlays = [
-    (self: super: {
-      qt6 = super.qt6 // {
-        qtwayland = super.qt6.qtwayland.overrideAttrs (oldAttrs: {
-          patches = (oldAttrs.patches or []) ++ [
-            ./patches/0004-fix-gtk4-embedding.patch
-          ];
-        });
-      };
-    }
-    )
-  ];
-  
   #system.activationScripts."gnome_setup_misc".text = ''
   #  rm -f /home/delta/.config/gtk-4.0/gtk.css
   #  rm -f /home/delta/.config/gtk-3.0/gtk.css
@@ -163,15 +150,11 @@ in
   ];
 
   environment.systemPackages = with pkgs; [
-    gnomeExtensions.appindicator
     gnomeExtensions.activate-window-by-title
-    stable.gnomeExtensions.unite
     gnomeExtensions.tailscale-qs
     gnomeExtensions.gsconnect
     gnomeExtensions.clipboard-indicator
-    gnomeExtensions.pip-on-top
     gnomeExtensions.cloudflare-warp-toggle
-    gnomeExtensions.tiling-assistant
     gnomeExtensions.overview-background
     gnome.gnome-tweaks
     mojave-gtk-theme
@@ -209,4 +192,4 @@ in
     gnome-initial-setup.enable = false;
     gnome-online-accounts.enable = false;
   };
-}
\ No newline at end of file
+}