diff --git a/flake.lock b/flake.lock
index 74089aa..87145a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -129,11 +129,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745184749,
-        "narHash": "sha256-sBBtnaOTQCdtWp3PBGG0fwTcylqa/jKK9PMxe60mNLE=",
+        "lastModified": 1746413188,
+        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b71ca269615b0837724dac13358a2f0d6816d372",
+        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
         "type": "github"
       },
       "original": {
@@ -197,11 +197,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1744932701,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "lastModified": 1746328495,
+        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1744932701,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "lastModified": 1746328495,
+        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1745188403,
-        "narHash": "sha256-MMzdUXTRfWQs/B9536JPG2iiefn7lv8lOx3HCTPxBoU=",
+        "lastModified": 1746440823,
+        "narHash": "sha256-aRDrEl65gpA0zoSbc1PgMTqKg2KftKwPmT4Wcco0O8U=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8af9941539ff23e18fce666ac2c8020e128b3a0a",
+        "rev": "fce799ca5f9de092ed27f5c31ed98ab0c83308c6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index cfe7f69..8ebb555 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,20 @@
                 { nixpkgs.overlays = [
                     nur.overlays.default
                     (self: super: { utillinux = super.util-linux; })
+                    # (final: prev: {
+                    #     sunshine = prev.sunshine.overrideAttrs (old: {
+                    #         src = prev.fetchFromGitHub {
+                    #             owner = "LizardByte";
+                    #             repo = "Sunshine";
+                    #             rev = "64544e7960f5141f71438d72e5dedad81c03729c";
+                    #             hash = "sha256-gDLV9GQ7mbPj1t6Bm4NyS49p4eKc66uAyhG4KmhD+fM=";
+                    #             fetchSubmodules = true;
+                    #         };
+                    #         preferLocalBuild = true;
+                    #         allowSubstitutes = false;
+                    #         version = "64544e7960f5141f71438d72e5dedad81c03729c";
+                    #     });
+                    # })
                 ]; }
                 {
                     networking.hostName = host;
diff --git a/home/Arm.nix b/home/Arm.nix
index 0bc9ad4..2a81fbc 100644
--- a/home/Arm.nix
+++ b/home/Arm.nix
@@ -23,7 +23,7 @@ in
         XDG_RUNTIME_DIR = "/run/ubuntu/$(id -u)";
     };
 
-    programs.zsh.initExtra = pkgs.lib.mkForce ''
+    programs.zsh.initContent = pkgs.lib.mkAfter ''
       LOCAL_SEARCH_DIRS=(~/.dotfiles/)
       REMOTE_SEARCH_DIRS=()
     '';
diff --git a/home/Kell.nix b/home/Kell.nix
index a856fa5..cb921e6 100644
--- a/home/Kell.nix
+++ b/home/Kell.nix
@@ -52,5 +52,6 @@ in
             "HDMI-A-1,preferred,5760x550,1"
         ];
         input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
+        # input.kb_options = "compose:rctrl, caps:super";
     };
 }
diff --git a/home/Pi.nix b/home/Pi.nix
index 0ad9da7..77737b4 100644
--- a/home/Pi.nix
+++ b/home/Pi.nix
@@ -23,7 +23,7 @@ in
         XDG_RUNTIME_DIR = "/run/user/$(id -u)";
     };
 
-    programs.zsh.initExtra = pkgs.lib.mkForce ''
+    programs.zsh.initContent = pkgs.lib.mkAfter ''
       LOCAL_SEARCH_DIRS=(~/.dotfiles/)
       REMOTE_SEARCH_DIRS=()
       if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
diff --git a/home/Tolnedra.nix b/home/Tolnedra.nix
index 41fedfb..639f3bd 100644
--- a/home/Tolnedra.nix
+++ b/home/Tolnedra.nix
@@ -31,7 +31,7 @@
         XDG_RUNTIME_DIR = "/run/user/$(id -u)";
     };
 
-    programs.zsh.initExtra = pkgs.lib.mkForce ''
+    programs.zsh.initContent = pkgs.lib.mkAfter ''
       LOCAL_SEARCH_DIRS=(~/.dotfiles/)
       REMOTE_SEARCH_DIRS=()
     '';
diff --git a/home/Vault.nix b/home/Vault.nix
index e957b88..d928f2c 100644
--- a/home/Vault.nix
+++ b/home/Vault.nix
@@ -71,7 +71,7 @@ in
         XDG_RUNTIME_DIR = "/run/user/$(id -u)";
     };
 
-    programs.zsh.initExtra = pkgs.lib.mkForce ''
+    programs.zsh.initContent = pkgs.lib.mkAfter ''
       LOCAL_SEARCH_DIRS=(~/.dotfiles/ ~/Storage/Thomas/ ~/Storage/Etienne/ ~/Storage/Magda\ and\ Etienne/ ~/Containers/)
       REMOTE_SEARCH_DIRS=()
     '';
diff --git a/home/bash/default.nix b/home/bash/default.nix
index 851de36..93486cf 100644
--- a/home/bash/default.nix
+++ b/home/bash/default.nix
@@ -55,7 +55,7 @@
         enableCompletion = true;
         historySize = 10000000;
         historyFile = "${config.xdg.dataHome}/bash/history";
-        initExtra = ''
+        initExtra = pkgs.lib.mkAfter ''
             bind 'set show-all-if-ambiguous on'
             bind 'set completion-ignore-case on'
             bind 'TAB:menu-complete'
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 12e1f7d..de4301e 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -55,9 +55,9 @@
         enableCompletion = true;
         syntaxHighlighting.enable = false;
         autosuggestion.enable = true;
-        initExtra = ''export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH'';
-        initExtraFirst = ''
+        initContent = pkgs.lib.mkBefore ''
             ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
+            export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH
             source ${./files/waypipe.zsh}
             source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
             source ${./files/p10k.zsh}