diff --git a/flake.lock b/flake.lock
index b42ce85..1742cfa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772674218,
-        "narHash": "sha256-1oc5zUFOjeK2Bro5cdCe3Fc/uzQIHyxfKMDZQ+Zm6Uo=",
+        "lastModified": 1772252606,
+        "narHash": "sha256-SiIhFq4XbD3LmODQ2mTtakRBnjBn/KoSgAOId1cL1Ks=",
         "owner": "ryoppippi",
         "repo": "claude-code-overlay",
-        "rev": "e177db5beaf0cd10761e1b4a6eac2906627ed119",
+        "rev": "b1ebf027412136bbbe4202741c3d48721644bc4b",
         "type": "github"
       },
       "original": {
@@ -48,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772633327,
-        "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
+        "lastModified": 1772569491,
+        "narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
+        "rev": "924e61f5c2aeab38504028078d7091077744ab17",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772624091,
-        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
+        "lastModified": 1772542754,
+        "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
+        "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772745558,
-        "narHash": "sha256-pVmX5Z0PLUZIL7TFcfYyWNqEKDVf72bAz0PORyNQHSQ=",
+        "lastModified": 1772583385,
+        "narHash": "sha256-3m4A+B/CnrG3xUeZbOw1OoLdSvB+7I/zZTW4fLM1go0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "361709a61eebc0b1783dd478677b7ac4e1efa0a2",
+        "rev": "29adb5e8129c1020e59ca0a76b2a40d0e4a74eb1",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772638901,
-        "narHash": "sha256-kzAyU054Mzpnzgx475MgmcjYJXxXWQWBG7LLsYtHXKw=",
+        "lastModified": 1772517053,
+        "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "75de12ddd50616a3628499ec18b648bceb88eb0d",
+        "rev": "32e9673aee2ae994ced561247918952398a3e933",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index 1ca1732..0d7e113 100644
--- a/home.nix
+++ b/home.nix
@@ -58,51 +58,48 @@
   };
 
   home.packages = with pkgs; [
-    # CLI
+    # CLI Tools
     bat
-    claude-code
-    fastfetch
-    gh
-    hyfetch
-    mkp224o
-    nixfmt
     ripgrep
-    tea
     tree
     unzip
+    hyfetch
+    # Development
+    gh
+    tea
+    mkp224o
+    nixfmt
 
-    # LSP Servers
-    rust-analyzer
-    typescript-language-server
-    nil
+    # Terminal
+    nerd-fonts.commit-mono
+    fastfetch
 
-    # Desktop
-    element-desktop
-    file-roller
-    font-manager
+    # Desktop / GUI
+    thunderbird
+    vlc
     gimp3
     inkscape
-    kdePackages.kdenlive
-    logseq
-    nemo-with-extensions
-    obs-studio
-    prismlauncher
     qbittorrent-enhanced
     signal-desktop
-    thunderbird
-    vesktop
-    vlc
+    beeper
+    element-desktop
     zulip
-
-    # Fonts
-    nerd-fonts.commit-mono
-
+    logseq
+    prismlauncher
+    nemo-with-extensions
+    file-roller
+    font-manager
+    claude-code
+    kdePackages.kdenlive
+    vesktop
+    obs-studio
+    
     # GNOME Extensions
+    gnomeExtensions.hide-top-bar
+    gnomeExtensions.wifi-qrcode
+    gnomeExtensions.system-monitor-next
     gnomeExtensions.clipboard-indicator
     gnomeExtensions.emoji-copy
-    gnomeExtensions.hide-top-bar
-    gnomeExtensions.system-monitor-next
-    gnomeExtensions.wifi-qrcode
   ];
 
 
@@ -117,7 +114,7 @@
     enable = true;
     defaultEditor = true;
     settings = {
-      theme = "dark_high_contrast";
+    theme = "dark_high_contrast";
       editor = {
         line-number = "relative";
         lsp.display-messages = true;
@@ -125,32 +122,24 @@
       };
     };
     languages = {
-      language = [
-        {
-          name = "rust";
+      haskell = {
+        config = {
           end-of-line-diagnostics = "hint";
-          inline-diagnostics = {
-            cursor-line = "hint";
-            other-lines = "hint";
-          };
-        }
-        {
-          name = "typescript";
+        };
+        "inline-diagnostics" = {
+          cursor-line = "hint";
+          other-lines = "hint";
+        };
+      };
+      rust = {
+        config = {
           end-of-line-diagnostics = "hint";
-          inline-diagnostics = {
-            cursor-line = "hint";
-            other-lines = "hint";
-          };
-        }
-        {
-          name = "nix";
-          end-of-line-diagnostics = "hint";
-          inline-diagnostics = {
-            cursor-line = "hint";
-            other-lines = "hint";
-          };
-        }
-      ];
+        };
+        "inline-diagnostics" = {
+          cursor-line = "hint";
+          other-lines = "hint";
+        };
+      };
     };
   };