diff --git a/flake.lock b/flake.lock
index f57f1c7..0d2cff8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1762980239,
+        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759853171,
-        "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
+        "lastModified": 1763416652,
+        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
+        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759831965,
-        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
+        "lastModified": 1763421233,
+        "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
+        "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
         "type": "github"
       },
       "original": {
@@ -134,11 +134,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1759927289,
-        "narHash": "sha256-EWdwR9l+JG466rPuNmjjzDPvQAuh37lmhgWa2xeaMdk=",
+        "lastModified": 1763638001,
+        "narHash": "sha256-Y1SPkwcPaUjrqPff49J4f1t7npRUDuYazccUsNF9XSQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "57006a3ace4a3c889ab61b70fd5d8b197de8314e",
+        "rev": "f4b9a7122425c56d65466fcafb99053730b2646a",
         "type": "github"
       },
       "original": {
@@ -157,11 +157,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758662783,
-        "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
+        "lastModified": 1761730856,
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760393368,
-        "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
+        "lastModified": 1763607916,
+        "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
+        "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/home.nix b/home-manager/home.nix
index ffbfdfc..d92e121 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -68,17 +68,24 @@
 
   programs = {
     git = {
-      aliases = {
-        br = "branch";
-        ca = "commit --amend";
-        can = "commit --amend --no-edit";
-        ci = "commit";
-        co = "checkout";
-        lg = "log --oneline --graph --decorate --all";
-        st = "status";
-      };
       enable = true;
-      extraConfig = {
+      lfs.enable = true;
+      signing = {
+        key = "EC7C84664FF515B63AD510B63065EA73A976D430";
+        signByDefault = false;
+      };
+      settings = {
+        alias = {
+          br = "branch";
+          ca = "commit --amend";
+          can = "commit --amend --no-edit";
+          ci = "commit";
+          co = "checkout";
+          lg = "log --oneline --graph --decorate --all";
+          st = "status";
+        };
+        user.email = "th.spo@pm.me";
+        user.name = "Thiago Sposito";
         color.ui = "auto";
         core = {
           editor = "nvim";
@@ -87,13 +94,6 @@
         init.defaultBranch = "main";
         pull.rebase = true;
       };
-      lfs.enable = true;
-      signing = {
-        key = "EC7C84664FF515B63AD510B63065EA73A976D430";
-        signByDefault = false;
-      };
-      userEmail = "th.spo@pm.me";
-      userName = "Thiago Sposito";
     };
 
     gpg = {
diff --git a/home-manager/icons.nix b/home-manager/icons.nix
index 8d7efa1..e2bcc1b 100644
--- a/home-manager/icons.nix
+++ b/home-manager/icons.nix
@@ -1,13 +1,13 @@
 { icons, pkgs, ... }:
 {
-  home.packages = [ icons.packages.${pkgs.system}.default ];
+  home.packages = [ icons.packages.${pkgs.stdenv.hostPlatform.system}.default ];
 
   xdg.desktopEntries = {
     kitty = {
       name = "Kitty";
       exec = "kitty";
       icon = "${
-        icons.packages.${pkgs.system}.default
+        icons.packages.${pkgs.stdenv.hostPlatform.system}.default
       }/share/icons/hicolor/scalable/apps/custom/kitty.svg";
       terminal = false;
       categories = [
@@ -19,7 +19,7 @@
       name = "UXTerm";
       exec = "uxterm";
       icon = "${
-        icons.packages.${pkgs.system}.default
+        icons.packages.${pkgs.stdenv.hostPlatform.system}.default
       }/share/icons/hicolor/scalable/apps/custom/mini.xterm.svg";
       terminal = false;
       categories = [
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 199fbb6..ff8ab56 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -54,7 +54,7 @@
       pciutils
       pcsc-safenet
       pcsclite
-      pcsctools
+      pcsc-tools
       pkcs11helper
       podman-compose
       rclone
diff --git a/hosts/common/nvidia/default.nix b/hosts/common/nvidia/default.nix
index ebce0c9..e7497e6 100644
--- a/hosts/common/nvidia/default.nix
+++ b/hosts/common/nvidia/default.nix
@@ -45,7 +45,7 @@
   environment.systemPackages = with pkgs; [
     cudaPackages.cuda_nvcc
     cudaPackages.cudatoolkit
-    glxinfo
+    mesa-demos
     libepoxy
     libglvnd
     nvidia-container-toolkit