refactor: move packages into modules

flake.nix

@@ -69,7 +69,7 @@
     apple-silicon,
     ...
   } @ inputs: let
-  in rec {
+  in {
     formatter = with nixpkgs.legacyPackages; {
       x86_64-linux = x86_64-linux.alejandra;
       aarch64-linux = aarch64-linux.alejandra;

modules/nixos/spotifyd/default.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  services.spotifyd = {
+    enable = true;
+    # settings = {global = 320;};
+  };
+  environment.systemPackages = [
+    pkgs.spotify-player
+  ];
+}

users/youwen/linux/hyprland/common.nix

@@ -4,16 +4,34 @@
   system,
   ...
 }: {
+  home.packages = with pkgs; [
+    wl-clipboard
+    grim
+    slurp
+    swappy
+    pavucontrol
+    waypaper
+    swaybg
+    pamixer
+    brightnessctl
+
+    bibata-cursors
+    libsForQt5.qtstyleplugin-kvantum
+    libsForQt5.qt5ct
+    papirus-icon-theme
+    libsForQt5.qt5ct
+  ];
+
   wayland.windowManager.hyprland = {
     enable = true;
     package = inputs.stablepkgs.legacyPackages.${system}.hyprland;
     settings = {
       exec-once = ["waypaper --restore"];
       "$mod" = "SUPER";
-      "$Left" = "Y";
-      "$Right" = "O";
-      "$Up" = "I";
-      "$Down" = "U";
+      "$Left" = "H";
+      "$Right" = "L";
+      "$Up" = "K";
+      "$Down" = "J";
       env = [
         "HYPRCURSOR_THEME,Bibata-Modern-Ice"
         "HYPRCURSOR_SIZE,26"
@@ -30,7 +48,7 @@
         # Window actions
         "$mod, Q, killactive"
         "$mod, W, togglefloating"
-        "$mod, J, togglesplit"
+        "$mod, V, togglesplit"
         "$mod, Return, fullscreen"
 
         # Move around
@@ -73,7 +91,7 @@
 
         "$mod, Backspace, exec, wlogout" # show logout menu
 
-        "$mod, L, exec, hyprlock"
+        "$mod, I, exec, hyprlock"
 
         # System control
         ",XF86MonBrightnessDown, exec, brightnessctl set 5%-"

users/youwen/linux/packages/common-packages.nix

@@ -22,15 +22,6 @@ with pkgs; [
   usbutils # lsusb
 
   # desktop utils
-  wl-clipboard
-  grim
-  slurp
-  swappy
-  pavucontrol
-  waypaper
-  swaybg
-  pamixer
-  brightnessctl
   bitwarden-cli
 
   # desktop apps
@@ -40,11 +31,4 @@ with pkgs; [
   signal-desktop
 
   gcc
-
-  # desktop ricing
-  bibata-cursors
-  libsForQt5.qtstyleplugin-kvantum
-  libsForQt5.qt5ct
-  papirus-icon-theme
-  libsForQt5.qt5ct
 ]