From ca8e312fb355e660f22331db7ccab3ecf4ed02a4 Mon Sep 17 00:00:00 2001
From: Nathan Reiner <nathan@nathanreiner.xyz>
Date: Wed, 28 May 2025 11:09:10 +0200
Subject: update to 25.05

---
 common/default.nix                         | 2 +-
 common/home/programs/nixvim/default.nix    | 2 +-
 common/home/programs/zsh/default.nix       | 2 +-
 common/home/services/gpg-agent/default.nix | 2 +-
 common/services/greetd.nix                 | 7 +++++--
 5 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'common')

diff --git a/common/default.nix b/common/default.nix
index 37804b9..28526e8 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -15,7 +15,7 @@
 		wofi-pass.nixosModules.default
 	];
 
-	fonts.packages = with pkgs; [ nerdfonts ];
+	fonts.packages = with pkgs; [ nerd-fonts.sauce-code-pro ];
 
 	networking.networkmanager.enable = true;
 
diff --git a/common/home/programs/nixvim/default.nix b/common/home/programs/nixvim/default.nix
index 40af397..7bf5ca8 100644
--- a/common/home/programs/nixvim/default.nix
+++ b/common/home/programs/nixvim/default.nix
@@ -28,7 +28,7 @@
 		})
 	'';
 
-	diagnostics = {
+	diagnostic.settings = {
 		virtual_text = {
 			prefix = "󰬨";
 		};
diff --git a/common/home/programs/zsh/default.nix b/common/home/programs/zsh/default.nix
index 015d26a..171e430 100644
--- a/common/home/programs/zsh/default.nix
+++ b/common/home/programs/zsh/default.nix
@@ -8,7 +8,7 @@
   shellAliases = {
     v = "nvim";
   };
-  initExtra = ''
+  initContent = ''
     export MANPAGER="sh -c 'col -bx | bat -l man -p'"
     export MANROFFOPT="-c"
 
diff --git a/common/home/services/gpg-agent/default.nix b/common/home/services/gpg-agent/default.nix
index 8fa94e7..14b0576 100644
--- a/common/home/services/gpg-agent/default.nix
+++ b/common/home/services/gpg-agent/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   enable = true;
-  pinentryPackage = pkgs.pinentry-qt;
+  pinentry.package = pkgs.pinentry-qt;
   maxCacheTtl = 60480000;
   maxCacheTtlSsh = 60480000;
   defaultCacheTtl = 60480000;
diff --git a/common/services/greetd.nix b/common/services/greetd.nix
index 2a59cbc..41eb7ad 100644
--- a/common/services/greetd.nix
+++ b/common/services/greetd.nix
@@ -1,13 +1,16 @@
 { pkgs, ... }:
+let
+	session = "${pkgs.hyprland}/bin/Hyprland";
+in
 {
 	enable = true;
 	settings = {
 		initial_session = {
-			command = "${pkgs.hyprland}/bin/Hyprland";
+			command = session;
 			user = "n8";
 		};
 		default_session = {
-			command = "${pkgs.greetd.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${pkgs.hyprland}/bin/Hyprland";
+			command = "${pkgs.greetd.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${session}";
 			user = "greeter";
 		};
 	};
-- 
cgit v1.2.3-70-g09d2