diff --git a/flake.lock b/flake.lock
index 1c1d638..88d0a3d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,11 +65,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780290312,
-        "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
+        "lastModified": 1781152676,
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -197,16 +197,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1779506708,
-        "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
+        "lastModified": 1781319724,
+        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
+        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -261,11 +261,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1780310866,
-        "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
+        "lastModified": 1781168557,
+        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "4ed851c979641e28597a05086332d75cdc9e395f",
+        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
         "type": "github"
       },
       "original": {
@@ -338,11 +338,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1780243769,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "lastModified": 1781074563,
+        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
         "type": "github"
       },
       "original": {
@@ -354,16 +354,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1780511130,
-        "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=",
+        "lastModified": 1781216227,
+        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "535f3e6942cb1cead3929c604320d3db54b542b9",
+        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index fe2e6da..d929025 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +12,10 @@
 
   inputs = {
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     auto-cpufreq = {
diff --git a/home/gtk/default.nix b/home/gtk/default.nix
index 626ebbe..17ce9c3 100644
--- a/home/gtk/default.nix
+++ b/home/gtk/default.nix
@@ -6,5 +6,6 @@
       name = "Arc";
       package = pkgs.arc-icon-theme;
     };
+    gtk4.theme = null;
   };
 }
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 70a52ce..bfe616b 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -7,6 +7,8 @@
     viAlias = true;
     vimdiffAlias = true;
     withNodeJs = true;
+    withRuby = false;
+    withPython3 = false;
     coc.enable = true;
     plugins = with pkgs.vimPlugins; [
       vim-gitgutter
diff --git a/home/xdg/default.nix b/home/xdg/default.nix
index fbd1711..4570621 100644
--- a/home/xdg/default.nix
+++ b/home/xdg/default.nix
@@ -15,6 +15,9 @@
         "text/calendar" = ["thunderbird.desktop"];
       };
     };
-    userDirs.enable = true;
+    userDirs = {
+      enable = true;
+      setSessionVariables = false;
+    };
   };
 }
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index ece5c8e..01f522f 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -26,6 +26,8 @@
     history.size = 10000;
     history.path = "$HOME/.zsh_history";
 
+    dotDir = config.home.homeDirectory;
+
     initContent = lib.mkMerge [ beforeCompInit defaultInit ];
   };
 }
diff --git a/modules/cli-essentials.nix b/modules/cli-essentials.nix
index faa63dc..2fb4dca 100644
--- a/modules/cli-essentials.nix
+++ b/modules/cli-essentials.nix
@@ -8,7 +8,7 @@
     wget
     curl
     git
-    neofetch
+    fastfetch
     bat
     tealdeer
 
diff --git a/modules/desktop-essentials.nix b/modules/desktop-essentials.nix
index ea0d424..74452f8 100644
--- a/modules/desktop-essentials.nix
+++ b/modules/desktop-essentials.nix
@@ -15,10 +15,10 @@
     pavucontrol
 
     xed-editor
-    mate.mate-calc
+    mate-calc
 
     xarchiver
-    mate.engrampa
+    engrampa
     nemo-with-nextcloud-extensions
   ];
 
diff --git a/modules/i3.nix b/modules/i3.nix
index 9540221..7ba88ce 100644
--- a/modules/i3.nix
+++ b/modules/i3.nix
@@ -26,10 +26,10 @@
         dex # autostart applications
         xbindkeys # bind keys to commands
         xclip
-        xorg.xbacklight # control screen brightness
+        xbacklight # control screen brightness
 	brightnessctl
         numlockx
-        xorg.xdpyinfo # get screen information
+        xdpyinfo # get screen information
         sysstat # get system information
 
 	scrot
diff --git a/pkgs/nemo-engrampa/default.nix b/pkgs/nemo-engrampa/default.nix
index 9dd6aaf..a576f21 100644
--- a/pkgs/nemo-engrampa/default.nix
+++ b/pkgs/nemo-engrampa/default.nix
@@ -8,7 +8,7 @@
   glib,
   gtk3,
   nemo,
-  mate,
+  engrampa,
   cinnamon-translations,
 }:
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     done
     popd
     substituteInPlace src/nemo-engrampa.c \
-      --replace-fail "file-roller" "${lib.getExe mate.engrampa}" \
+      --replace-fail "file-roller" "${lib.getExe engrampa}" \
       --replace-fail "fileroller" "engrampa" \
       --replace-fail "FileRoller" "Engrampa" \
       --replace-quiet "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale"