diff --git a/flake.lock b/flake.lock
index 0279b79..5578455 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "catppuccin-bat": {
       "flake": false,
       "locked": {
-        "lastModified": 1722864529,
-        "narHash": "sha256-s0CHTihXlBMCKmbBBb8dUhfgOOQu9PBCQ+uviy7o47w=",
+        "lastModified": 1721485583,
+        "narHash": "sha256-/Ob9iCVyjJDBCXlss9KwFQTuxybmSSzYRBZxOT10PZg=",
         "owner": "catppuccin",
         "repo": "bat",
-        "rev": "d3feec47b16a8e99eabb34cdfbaa115541d374fc",
+        "rev": "82e7ca555f805b53d2b377390e4ab38c20282e83",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin-starship": {
       "flake": false,
       "locked": {
-        "lastModified": 1723819937,
-        "narHash": "sha256-t/Hmd2dzBn0AbLUlbL8CBt19/we8spY5nMP0Z+VPMXA=",
+        "lastModified": 1716565281,
+        "narHash": "sha256-KzXO4dqpufxTew064ZLp3zKIXBwbF8Bi+I0Xa63j/lI=",
         "owner": "catppuccin",
         "repo": "starship",
-        "rev": "3c4749512e7d552adf48e75e5182a271392ab176",
+        "rev": "ca2fb0600730fd3958a2cb4d4ca97c401877b365",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1724971150,
-        "narHash": "sha256-QPmFN1OwO2Ik4cRiGME+40n5c7xe98dmf0sgJfH2IQc=",
+        "lastModified": 1721524502,
+        "narHash": "sha256-nu8KFg/dBOWYaf5K9/HOEv7RjFgaKNqlxzv6rlhMjNw=",
         "owner": "unmojang",
         "repo": "FjordLauncher",
-        "rev": "26a70d74fe48fb6ae87797173f879ff09425287f",
+        "rev": "17da1f266ccf66f30280916cbfa13e1c4b758480",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1722636442,
-        "narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=",
+        "lastModified": 1720709712,
+        "narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6",
+        "rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade",
         "type": "github"
       },
       "original": {
@@ -218,11 +218,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "lastModified": 1722185531,
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1724855419,
-        "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=",
+        "lastModified": 1722221733,
+        "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06",
+        "rev": "12bf09802d77264e441f48e25459c10c93eada2e",
         "type": "github"
       },
       "original": {
@@ -266,11 +266,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1725014731,
-        "narHash": "sha256-4Y3FY4JzZsKQ0FKfdoWCt2BJFWDrnCk+Fi3+oo2kb0M=",
+        "lastModified": 1722505514,
+        "narHash": "sha256-IDkU+iwzj1Xkrj7duPMu7DiWLjOmlGv7i0TohoPA3vI=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8a0c673833f8c455f54b1c4596fb19715c8d1101",
+        "rev": "23913254fceb5cca89b1e428d536dc9bfa58ec84",
         "type": "github"
       },
       "original": {
diff --git a/modules/core/programs.nix b/modules/core/programs.nix
index 3db60c4..cea015e 100644
--- a/modules/core/programs.nix
+++ b/modules/core/programs.nix
@@ -6,6 +6,16 @@
   programs.dconf.enable = true;
   programs.zsh.enable = true;
 
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    # pinentryFlavor = "";
+  };
+  environment.shellInit = ''
+    gpg-connect-agent /bye
+    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  '';
+
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = with pkgs; [];
   programs.adb.enable = true;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 3e2ebac..9a2ce67 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -9,7 +9,6 @@
     ++ [(import ./btop.nix)] # resouces monitor
     ++ [(import ./cava.nix)] # audio visualizer
     ++ [(import ./discord.nix)] # discord with catppuccin theme
-    ++ [(import ./gpg.nix)] # GnuPG and its agent (gpg-agent)
     ++ [(import ./floorp/floorp.nix)] # firefox based browser
     ++ [(import ./fuzzel.nix)] # launcher
     ++ [(import ./gaming.nix)] # packages related to gaming
diff --git a/modules/home/gaming.nix b/modules/home/gaming.nix
index b452124..9da1f97 100644
--- a/modules/home/gaming.nix
+++ b/modules/home/gaming.nix
@@ -39,6 +39,5 @@
 
     ## Others
     moonlight-qt
-    ukmm # BOTW mod manager
   ];
 }
diff --git a/modules/home/gpg.nix b/modules/home/gpg.nix
deleted file mode 100644
index 2dfe2fb..0000000
--- a/modules/home/gpg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-    sshKeys = ["D2A3680589B81F2B07DA6CFE21DF848F1AF4E9D3"];
-  };
-}
diff --git a/modules/home/starship.nix b/modules/home/starship.nix
index 70c1898..214ccdf 100644
--- a/modules/home/starship.nix
+++ b/modules/home/starship.nix
@@ -41,6 +41,6 @@
 
         palette = "catppuccin_mocha";
       }
-      // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/themes/mocha.toml");
+      // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml");
   };
 }