From 6c635de326bf88d0da4b8ea0a5352de290db8d36 Mon Sep 17 00:00:00 2001
From: muon <admin@muon.host>
Date: Sun, 8 Mar 2026 10:28:46 +0000
Subject: [PATCH] Fix waringings

---
 hosts/muon/home.nix                     | 8 ++++++--
 modules/home/terminal/helix/default.nix | 2 +-
 modules/home/terminal/hr/default.nix    | 2 +-
 modules/home/terminal/shell.nix         | 1 +
 modules/home/terminal/yazi.nix          | 1 +
 modules/nixos/flatpak/default.nix       | 1 +
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix
index 5a77333..101a66b 100644
--- a/hosts/muon/home.nix
+++ b/hosts/muon/home.nix
@@ -10,6 +10,8 @@ in {
   mods.xdg.enable = true;
   mods.social.enable = true;
   mods.i3.enable = true;
+  mods.terminal.wezterm.enable = true;
+  mods.terminal.nushell.enable = true;
   mods.terminal.zsh.enable = true;
   mods.terminal.emulator.enable = true;
   mods.terminal.development.enable = true;
@@ -71,8 +73,10 @@ in {
   # SSH: auto-add work key to gpg-agent on first use
   programs.ssh = {
     enable = true;
-    addKeysToAgent = "yes";
-    matchBlocks."*".identityFile = "~/.ssh/work_ed25519";
+    matchBlocks."*" = {
+      identityFile = "~/.ssh/work_ed25519";
+      addKeysToAgent = "yes";
+    };
     matchBlocks."muho".identityFile = "~/.ssh/id_ed25519";
   };
 
diff --git a/modules/home/terminal/helix/default.nix b/modules/home/terminal/helix/default.nix
index 36f2b17..9781b41 100644
--- a/modules/home/terminal/helix/default.nix
+++ b/modules/home/terminal/helix/default.nix
@@ -62,7 +62,7 @@
         {
           name = "nix";
           auto-format = true;
-          formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
+          formatter.command = "${pkgs.nixfmt}/bin/nixfmt";
         }
         {
           name = "rust";
diff --git a/modules/home/terminal/hr/default.nix b/modules/home/terminal/hr/default.nix
index 887f9b7..53a6ea6 100644
--- a/modules/home/terminal/hr/default.nix
+++ b/modules/home/terminal/hr/default.nix
@@ -18,7 +18,7 @@ in {
       format = "on $output ";
     };
 
-    programs.zsh.initExtra =
+    programs.zsh.initContent =
       ''
         export MK2_TEST_SQL_INSTANCE_USER=gijs
         export MK2_TEST_SQL_INSTANCE_PASSWORD="$(cat ${config.sops.secrets.google-db-test.path})"
diff --git a/modules/home/terminal/shell.nix b/modules/home/terminal/shell.nix
index b8ad4a0..bbb298d 100644
--- a/modules/home/terminal/shell.nix
+++ b/modules/home/terminal/shell.nix
@@ -23,6 +23,7 @@ in {
 
     programs.zsh = lib.mkIf cfg.zsh.enable {
       enable = true;
+      dotDir = "${config.xdg.configHome}/zsh";
       enableCompletion = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
diff --git a/modules/home/terminal/yazi.nix b/modules/home/terminal/yazi.nix
index 160b944..e366d5d 100644
--- a/modules/home/terminal/yazi.nix
+++ b/modules/home/terminal/yazi.nix
@@ -5,6 +5,7 @@ in with lib; {
   config = mkIf cfg.tools.enable {
     programs.yazi = {
       enable = true;
+      shellWrapperName = "y";
       settings = {
         manager = {
           ratio = [ 1 4 3 ];
diff --git a/modules/nixos/flatpak/default.nix b/modules/nixos/flatpak/default.nix
index 2cabac2..27c2ed7 100644
--- a/modules/nixos/flatpak/default.nix
+++ b/modules/nixos/flatpak/default.nix
@@ -22,5 +22,6 @@ in
       xdg.portal.extraPortals = [
         pkgs.xdg-desktop-portal
       ];
+      xdg.portal.config.common.default = "*";
     };
   }