update to 26.05

6 files changed, 29 insertions, 19 deletions

diff --git a/common/default.nix b/common/default.nix
index d61b66c..2dfa553 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -87,7 +87,7 @@
 	documentation = {
 		man = {
 			enable = true;
-			generateCaches = true;
+			cache.enable = true;
 			man-db.enable = true;
 			mandoc.enable = false;
 		};
diff --git a/common/home/default.nix b/common/home/default.nix
index 94737b7..4a33662 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -33,13 +33,13 @@ packages = [
 	pkgs.pciutils
 	pkgs.usbutils
 	pkgs.acpi
-	pkgs.nixfmt-rfc-style
-	pkgs.blueberry
+	pkgs.nixfmt
+	pkgs.blueman
 	pkgs.gimp
 	pkgs.inkscape
 	pkgs.hicolor-icon-theme
 	pkgs.bat
-	pkgs.blender-hip
+	pkgs.blender
 	pkgs.pinentry-qt
 	pkgs.ripgrep
 	pkgs.tenacity
@@ -79,6 +79,7 @@ packages = [
 	pkgs.libsecret
 	pkgs.w3m
 	pkgs.android-tools
+	pkgs.fido2-manage
 	];
 	in
 {
@@ -89,6 +90,7 @@ packages = [
 					value = (import ./programs/${n} {
 							inherit pkgs;
 							inherit lib;
+							inherit config;
 							home = config.home-manager.users.n8.home;
 						});
 					}) programs
@@ -122,6 +124,8 @@ packages = [
 				name = "gruvbox-dark";
 			};
 
+			gtk4.theme = null;
+
 			iconTheme = {
 				package = pkgs.flat-remix-icon-theme;
 				name = "Flat-Remix-Blue-Light";
@@ -167,6 +171,7 @@ packages = [
 				publicShare = null;
 				templates = null;
 				videos = "${config.home-manager.users.n8.home.homeDirectory}/global/media/videos";
+				setSessionVariables = true;
 			};
 		};
 
diff --git a/common/home/hyprland/default.nix b/common/home/hyprland/default.nix
index 8ddc0a4..5ce838d 100644
--- a/common/home/hyprland/default.nix
+++ b/common/home/hyprland/default.nix
@@ -6,13 +6,14 @@
 		variables = [ "--all" ];
 	};
 	xwayland.enable = true;
-	plugins = [ pkgs.hyprlandPlugins.hyprsplit ];
+	#plugins = [ pkgs.hyprlandPlugins.hyprsplit ];
+	configType = "hyprlang";
 	settings = {
 		plugin = {
-			hyprsplit = {
-				num_workspaces = 10;
-				persistent_workspaces = false;
-			};
+			#hyprsplit = {
+			#	num_workspaces = 10;
+			#	persistent_workspaces = false;
+			#};
 		};
 		"$mod" = "SUPER";
 		bind = [
diff --git a/common/home/programs/firefox/default.nix b/common/home/programs/firefox/default.nix
index 451e011..62e009c 100644
--- a/common/home/programs/firefox/default.nix
+++ b/common/home/programs/firefox/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 let
   lock-false = {
     Value = false;
@@ -11,6 +11,7 @@ let
 in
 {
   enable = true;
+	configPath = "${config.home-manager.users.n8.xdg.configHome}/mozilla/firefox";
 
   policies = {
     DefaultDownloadDirectory = "/home/n8";
diff --git a/common/home/programs/waybar/default.nix b/common/home/programs/waybar/default.nix
index 75588b7..5cdf011 100644
--- a/common/home/programs/waybar/default.nix
+++ b/common/home/programs/waybar/default.nix
@@ -66,7 +66,7 @@
 				format-off = "󰂲";
 				format-on = "";
 				format-connected = "󰂱";
-				on-click = "blueberry";
+				on-click = "blueman";
 			};
 
 			battery = {
diff --git a/common/home/services/hyprpaper/default.nix b/common/home/services/hyprpaper/default.nix
index 82c7777..2854021 100644
--- a/common/home/services/hyprpaper/default.nix
+++ b/common/home/services/hyprpaper/default.nix
@@ -1,12 +1,15 @@
 { ... }:
 {
-  enable = true;
-  settings = {
-    ipc = "on";
-    splash = false;
-    splash_offset = 2.0;
+	enable = true;
+	settings = {
+		ipc = "on";
+		splash = false;
+		splash_offset = 2;
 
-    preload = [ "~/global/media/photos/0e5873df5f97d5869ce110c4029a2298.jpg" ];
-    wallpaper = [ ",~/global/media/photos/0e5873df5f97d5869ce110c4029a2298.jpg" ];
-  };
+		wallpaper = [{
+			fit_mode = "cover";
+			monitor = "";
+			path = "~/global/media/photos/0e5873df5f97d5869ce110c4029a2298.jpg";
+		} ];
+	};
 }