From 51246ef189a5a8e7d406dda4b419dab217294481 Mon Sep 17 00:00:00 2001
From: Nathan Reiner <nathan@nathanreiner.xyz>
Date: Tue, 2 Dec 2025 11:16:59 +0100
Subject: system: update to 25.11

---
 common/default.nix                                |  2 --
 common/home/default.nix                           |  2 +-
 common/home/programs/git/default.nix              |  8 ++++++--
 common/home/programs/nixvim/plugins/nvim-tree.nix | 10 ++++++----
 common/home/programs/ssh/default.nix              |  5 +++--
 common/services/greetd.nix                        |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'common')

diff --git a/common/default.nix b/common/default.nix
index b62beae..760bf5c 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -69,8 +69,6 @@
 		systemPackages = [
 			pkgs.man-pages
 			pkgs.man-pages-posix
-			pkgs.qt6.qtwayland
-			pkgs.kdePackages.wayqt
 		];
 	};
 
diff --git a/common/home/default.nix b/common/home/default.nix
index c7692d2..4faf3d0 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -159,5 +159,5 @@ packages = [
 	useGlobalPkgs = true;
 	useUserPackages = true;
 	backupFileExtension = "backup";
-	sharedModules = [ nixvim.homeManagerModules.nixvim ];
+	sharedModules = [ nixvim.homeModules.nixvim ];
 }
diff --git a/common/home/programs/git/default.nix b/common/home/programs/git/default.nix
index 91878ea..022eb19 100644
--- a/common/home/programs/git/default.nix
+++ b/common/home/programs/git/default.nix
@@ -1,6 +1,10 @@
 { ... }:
 {
 	enable = true;
-	userEmail = "nathan@nathanreiner.xyz";
-	userName = "Nathan Reiner";
+	settings = {
+		user = {
+			email = "nathan@nathanreiner.xyz";
+			name = "Nathan Reiner";
+		};
+	};
 }
diff --git a/common/home/programs/nixvim/plugins/nvim-tree.nix b/common/home/programs/nixvim/plugins/nvim-tree.nix
index 16c25de..b48ba9c 100644
--- a/common/home/programs/nixvim/plugins/nvim-tree.nix
+++ b/common/home/programs/nixvim/plugins/nvim-tree.nix
@@ -1,8 +1,10 @@
 { ... }:
 {
-  enable = true;
-  autoClose = false;
-  disableNetrw = false;
-  hijackCursor = true;
+	enable = true;
+	settings = {
+		hijack_cursor = true;
+		disable_netrw = false;
+	};
+	autoClose = false;
 	openOnSetup = true;
 }
diff --git a/common/home/programs/ssh/default.nix b/common/home/programs/ssh/default.nix
index da761d5..8613b55 100644
--- a/common/home/programs/ssh/default.nix
+++ b/common/home/programs/ssh/default.nix
@@ -1,5 +1,6 @@
 { home, ... }:
 {
-  enable = true;
-  includes = [ "${home.homeDirectory}/global/.ssh/config" ];
+	enable = true;
+	includes = [ "${home.homeDirectory}/global/.ssh/config" ];
+	enableDefaultConfig = false;
 }
diff --git a/common/services/greetd.nix b/common/services/greetd.nix
index 41eb7ad..27e3a6c 100644
--- a/common/services/greetd.nix
+++ b/common/services/greetd.nix
@@ -10,7 +10,7 @@ in
 			user = "n8";
 		};
 		default_session = {
-			command = "${pkgs.greetd.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${session}";
+			command = "${pkgs.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${session}";
 			user = "greeter";
 		};
 	};
-- 
cgit v1.2.3-70-g09d2