diff --git a/flake.lock b/flake.lock
index c24882e..b6e707d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760130406,
-        "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
+        "lastModified": 1763869804,
+        "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
+        "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760038930,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "lastModified": 1763678758,
+        "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759321049,
-        "narHash": "sha256-8XkU4gIrLT2DJZWQyvsP5woXGZF5eE/7AnKfwQkiwYU=",
+        "lastModified": 1762784320,
+        "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "205dcfd4a30d4a5d1b4f28defee69daa7c7252cd",
+        "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321",
         "type": "github"
       },
       "original": {
diff --git a/home/modules/git.nix b/home/modules/git.nix
index f87e388..3bd25ab 100644
--- a/home/modules/git.nix
+++ b/home/modules/git.nix
@@ -7,22 +7,24 @@ in
 {
   programs.git = {
     enable = true;
-
-    userName = name;
-    userEmail = email;
-
+    
     signing = {
       key = signingKey;
       signByDefault = true;
       format = "ssh";
     };
 
-    aliases = {
-      co = "checkout";
-      s = "switch";
-    };
-
-    extraConfig = {
+    settings = {
+      user = {
+        name = name;
+        email = email;
+      };
+      
+      aliases = {
+        co = "checkout";
+        s = "switch";
+      };
+      
       url = {
         "https://gitea.cazzzer.com/" = {
           insteadOf = "caztea:";
diff --git a/hosts/common-desktop.nix b/hosts/common-desktop.nix
index 0f7a4d7..275c532 100644
--- a/hosts/common-desktop.nix
+++ b/hosts/common-desktop.nix
@@ -7,7 +7,7 @@
     "sysrq_always_enabled=1"
   ];
 
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_16;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_17;
   boot.loader = {
     efi.canTouchEfiVariables = true;
     timeout = 3;
@@ -82,7 +82,7 @@
     fantasque-sans-mono
     nerd-fonts.fantasque-sans-mono
     noto-fonts
-    noto-fonts-emoji
+    noto-fonts-color-emoji
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
     jetbrains-mono
@@ -137,7 +137,7 @@
     })
     nextcloud-client
     lxqt.pavucontrol-qt
-    pinentry
+    pinentry-all
     tela-circle-icon-theme
     virt-viewer
     waypipe
diff --git a/modules/router/services.nix b/modules/router/services.nix
index f623134..8e07a8c 100644
--- a/modules/router/services.nix
+++ b/modules/router/services.nix
@@ -58,7 +58,7 @@ in
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-      hash = "sha256-XwZ0Hkeh2FpQL/fInaSq+/3rCLmQRVvwBM0Y1G1FZNU=";
+      hash = "sha256-aRMg7R0dBAy+LJeGCMPg6HKppM6NPX2NPwtc0CeSQLg=";
     };
     virtualHosts."*.${domain}".extraConfig = ''
       encode
diff --git a/modules/workarounds/flatpak.nix b/modules/workarounds/flatpak.nix
index 631e509..d3c4905 100644
--- a/modules/workarounds/flatpak.nix
+++ b/modules/workarounds/flatpak.nix
@@ -28,7 +28,7 @@ in {
           inherit
             (pkgs)
             noto-fonts
-            noto-fonts-emoji
+            noto-fonts-color-emoji
             noto-fonts-cjk-sans
             noto-fonts-cjk-serif
             ;