system: update to 25.11

8 files changed, 105 insertions, 100 deletions

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";
 		};
 	};
diff --git a/flake.lock b/flake.lock
index 5c3e2e3..43f238d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -46,16 +46,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1764613336,
+        "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "f3902b5d8767985680875ad86d028371100faeb3",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -90,27 +90,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "lastModified": 1764522689,
+        "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1761114652,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
         "type": "github"
       },
       "original": {
@@ -130,16 +130,16 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1760795571,
-        "narHash": "sha256-gi+tWWAknKuTNso3yMeKsT9nj0jx+tuYF7g7nmLUWT8=",
+        "lastModified": 1764664109,
+        "narHash": "sha256-ZJJXHob2kGkEs9u8pnIXibVY0jLiiFe1h226YjnH304=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "6c945865ba5de87fa2d0dd8a0e66ca572ddf9043",
+        "rev": "48e4df646d1e2b21524680011b3f569a0e892af1",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixvim",
         "type": "github"
       }
@@ -154,11 +154,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760652422,
-        "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
+        "lastModified": 1761730856,
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
         "type": "github"
       },
       "original": {
@@ -210,15 +210,15 @@
     "webtray": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ]
       },
       "locked": {
-        "lastModified": 1739575484,
-        "narHash": "sha256-SFvBPKJPA3+QXX3AZ5ihRd1uUH6NC0hL+kPqdM+sip0=",
+        "lastModified": 1764670403,
+        "narHash": "sha256-vi8J4kOAiZyY27Itqu4ahI5XJcefv82+P/TVwmVu15k=",
         "ref": "refs/heads/master",
-        "rev": "a6e09472cb98e0d00e4ab8f70b7957b956a73357",
-        "revCount": 46,
+        "rev": "e57244bd33c08d010bbec03b7cc90e254efccae9",
+        "revCount": 48,
         "type": "git",
         "url": "https://git.nathanreiner.xyz/webtray"
       },
diff --git a/flake.nix b/flake.nix
index 3524783..dd929b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,66 +1,66 @@
 {
-  description = "n8 NixOS Configuration Flake";
+	description = "n8 NixOS Configuration Flake";
 
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:/nix-community/home-manager/release-25.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixvim = {
-      url = "github:/nix-community/nixvim/nixos-25.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    webtray = {
-      url = "git+https://git.nathanreiner.xyz/webtray";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    wofi-pass = {
-      url = "git+https://git.nathanreiner.xyz/wofi-pass";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
+	inputs = {
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+		nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+		home-manager = {
+			url = "github:/nix-community/home-manager/release-25.11";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
+		nixvim = {
+			url = "github:/nix-community/nixvim/nixos-25.11";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
+		webtray = {
+			url = "git+https://git.nathanreiner.xyz/webtray";
+			inputs.nixpkgs.follows = "nixpkgs-unstable";
+		};
+		wofi-pass = {
+			url = "git+https://git.nathanreiner.xyz/wofi-pass";
+			inputs.nixpkgs.follows = "nixpkgs";
+		};
+	};
 
-  outputs =
-    { nixpkgs, nixpkgs-unstable, webtray, ... }@attrs:
-    let
-      system = "x86_64-linux";
-      overlay-unstable = final: prev: {
-        unstable = import nixpkgs-unstable {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      };
-      host-config =
-        name:
-        nixpkgs.lib.nixosSystem {
-          inherit system;
-          specialArgs = attrs;
-          modules = [
-            (
-              { ... }:
-              {
-                nixpkgs.overlays = [ overlay-unstable webtray.overlays.default ];
-                nixpkgs.config.allowUnfree = true;
-              }
-            )
-            ./hosts/${name}
-            ./common
-          ];
-        };
-      hosts = [
-        "template"
-        "nixedo"
-        "workstation"
-      ];
-    in
-    {
-      nixosConfigurations = builtins.listToAttrs (
-        map (n: {
-          name = n;
-          value = host-config n;
-        }) hosts
-      );
-    };
+	outputs =
+	{ nixpkgs, nixpkgs-unstable, webtray, ... }@attrs:
+	let
+		system = "x86_64-linux";
+		pkgs = import nixpkgs { inherit system; };
+		overlay-unstable = final: prev: {
+			unstable = import nixpkgs-unstable {
+				inherit system;
+				config.allowUnfree = true;
+			};
+		};
+		host-config =
+			name:
+			nixpkgs.lib.nixosSystem {
+				specialArgs = attrs;
+				modules = [
+					(
+					 { ... }:
+					 {
+						nixpkgs.overlays = [ overlay-unstable webtray.overlays.default ];
+						nixpkgs.config.allowUnfree = true;
+					 }
+					)
+						./hosts/${name}
+				./common
+				];
+			};
+		hosts = [
+			"template"
+				"nixedo"
+				"workstation"
+		];
+	in
+	{
+		nixosConfigurations = builtins.listToAttrs (
+				map (n: {
+					name = n;
+					value = host-config n;
+					}) hosts
+				);
+	};
 }