diff --git a/flake.lock b/flake.lock
index dd792a7..3292a98 100644
--- a/flake.lock
+++ b/flake.lock
@@ -106,7 +106,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1726560853,
@@ -407,28 +407,6 @@
         "type": "github"
       }
     },
-    "hyprlang_2": {
-      "inputs": {
-        "nixpkgs": [
-          "rose-pine-hyprcursor",
-          "nixpkgs"
-        ],
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -580,22 +558,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1710272261,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1729265718,
         "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
@@ -645,30 +607,9 @@
         "hyprland-plugins": "hyprland-plugins",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_2",
-        "rose-pine-hyprcursor": "rose-pine-hyprcursor",
         "yazi": "yazi"
       }
     },
-    "rose-pine-hyprcursor": {
-      "inputs": {
-        "hyprlang": "hyprlang_2",
-        "nixpkgs": "nixpkgs_3",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1733265112,
-        "narHash": "sha256-FdO+2X7TeIAW73hiyFKZbCjlAskb4xMmYYPX97mo9RE=",
-        "owner": "ndom91",
-        "repo": "rose-pine-hyprcursor",
-        "rev": "89dc9e347ce8da26766ad421b0899536f9f87639",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ndom91",
-        "repo": "rose-pine-hyprcursor",
-        "type": "github"
-      }
-    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
@@ -736,21 +677,6 @@
       }
     },
     "systems_4": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_5": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -765,39 +691,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -842,7 +735,7 @@
     "yazi": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
diff --git a/home/user/packages.nix b/home/user/packages.nix
index f1f799a..677bcc7 100644
--- a/home/user/packages.nix
+++ b/home/user/packages.nix
@@ -10,39 +10,38 @@ let
   });
 in
 {
-  home.packages = [
-    vesktop # discord
-    pkgs.firefox
-
+  home.packages = (with pkgs; [
     # Dev stuff
-    pkgs.gcc
-    pkgs.go
-    pkgs.nodePackages.pnpm
-    (pkgs.python3.withPackages
+    gcc
+    go
+    nodePackages.pnpm
+    (python3.withPackages
       (python-pkgs: [ python-pkgs.pip python-pkgs.requests ]))
-    pkgs.rustup
-    pkgs.pkgsCross.mingwW64.stdenv.cc
-    pkgs.pkgsCross.mingwW64.windows.pthreads
-    pkgs.postman
-    pkgs.cz-cli
+    rustup
+    pkgsCross.mingwW64.stdenv.cc
+    pkgsCross.mingwW64.windows.pthreads
+    postman
+    cz-cli
 
     # Work stuff
-    pkgs.libreoffice-qt
+    libreoffice-qt
 
     # Bluetooth
-    pkgs.blueberry
+    blueberry
 
     # Gaming
-    pkgs.steam-run
+    steam-run
 
     # Downloads
-    pkgs.qbittorrent
+    qbittorrent
 
     # Utils
-    pkgs.viewnior
-    pkgs.catppuccin-cursors.macchiatoLavender
-    pkgs.catppuccin-gtk
-    pkgs.cava
-    pkgs.papirus-folders
-  ];
+    viewnior
+    catppuccin-cursors.macchiatoLavender
+    catppuccin-gtk
+    cava
+    papirus-folders
+  ]) ++ ([
+    vesktop # discord
+  ]);
 }
diff --git a/home/user/programs.nix b/home/user/programs.nix
index 17b7f12..dc6019a 100644
--- a/home/user/programs.nix
+++ b/home/user/programs.nix
@@ -28,6 +28,17 @@ in
     firefox = {
       enable = true;
 
+      languagePacks = [
+        "en-US"
+        "zh-TW"
+        "ja"
+      ];
+
+      policies = {
+        DontCheckDefaultBrowser = true;
+        DisplayBookmarksToolbar = "never";
+      };
+
       profiles.default = {
         id = 0;
         name = "default";
@@ -49,16 +60,6 @@ in
           "font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
         };
 
-        languagePacks = [
-          "en-US"
-          "zh-TW"
-          "ja"
-        ];
-
-        policies = {
-          DontCheckDefaultBrowser = true;
-          DisplayBookmarksToolbar = "never";
-        };
       };
     };
   };
diff --git a/system/modules/packages.nix b/system/modules/packages.nix
index 7261ef6..e8ad836 100644
--- a/system/modules/packages.nix
+++ b/system/modules/packages.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, system, ... }:
+{ pkgs, inputs, system, ... }:
 
 {
   environment.systemPackages = (with pkgs; [