Move packages into modules

applications/default.nix

@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   imports = [
     ./feh
@@ -9,4 +11,15 @@
     ./thunar
     ./zathura
   ];
+
+  environment.systemPackages = with pkgs; [
+    audacity
+    gimp
+    anki
+    logseq
+    litemdview
+    mullvad-browser
+    spek
+    keepassxc
+  ];
 }

desktop/default.nix

@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   imports = [
     ./dual-function-keys
@@ -18,4 +20,13 @@
     ./xresources
     ./xserver
   ];
+
+  environment.systemPackages = with pkgs; [
+    grim
+    slurp
+    wl-clipboard
+    lnch
+    wev
+    swaybg
+  ];
 }

dev/default.nix

@@ -1,6 +1,14 @@
+{ pkgs, ... }:
+
 {
   imports = [
     ./editorconfig
+    ./nix
     ./npm
+    ./rust
+  ];
+
+  environment.systemPackages = with pkgs; [
+    marksman
   ];
 }

dev/nix/default.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    nil
+    nixfmt
+    nixos-generators
+  ];
+}

dev/npm/default.nix

@@ -1,3 +1,11 @@
+{ pkgs, ... }:
+
 {
   programs.npm.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    nodejs
+    yarn
+    deno
+  ];
 }

dev/rust/default.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    gcc
+    rustc
+    rustfmt
+    cargo
+  ];
+}

games/default.nix

@@ -1,6 +1,12 @@
+{ pkgs, ... }:
+
 {
   imports = [
     ./osu
     ./srb2
   ];
+
+  environment.systemPackages = with pkgs; [
+    typespeed
+  ];
 }

games/srb2/default.nix

@@ -3,5 +3,6 @@
 {
   environment.systemPackages = with pkgs; [
     (pkgs.callPackage ./package {})
+    slade
   ];
 }

host/default.nix

@@ -3,7 +3,6 @@
     ./laptop
     ./mullvad
     ./networking
-    ./packages
     ./virtualization
   ];
 }

host/mullvad/default.nix

@@ -1,4 +1,8 @@
+{ pkgs, ... }:
+
 {
+  environment.systemPackages = [ pkgs.mullvad-vpn ];
+
   services.mullvad-vpn = {
     enable = true;
     enableExcludeWrapper = false;

host/packages/default.nix

@@ -1,70 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    pinentry-curses
-    wget
-    grim
-    slurp
-    mullvad-browser
-    papirus-icon-theme
-    mediainfo
-    pywal
-    mpc-cli
-    neofetch
-    tectonic
-    fdupes
-    anki
-    logseq
-    yt-dlp
-    wl-clipboard
-    ffmpeg
-    siege
-    ponysay
-    lolcat
-    wev
-    figlet
-    gcc
-    httpie
-    cmatrix
-    sox
-    spek
-    p7zip
-    ripgrep
-    rsync
-    jq
-    keepassxc
-    exa
-    fd
-    fzf
-    unar
-    audacity
-    gimp
-    typespeed
-    slade
-    gdu
-    nixfmt
-    whois
-    lnch
-    dwt1-shell-color-scripts
-    dig
-    trashy
-    swaybg
-    brightnessctl
-    killall
-    nixos-generators
-    litemdview
-    nodejs
-    yarn
-    deno
-    crystal
-    shards
-    rustc
-    rustfmt
-    cargo
-    genact
-    helix
-    nil
-    marksman
-  ];
-}

terminal/default.nix

@@ -1,9 +1,12 @@
+{ pkgs, ... }:
+
 {
   imports = [
     ./bat
     ./fish
     ./git
     ./gpg
+    ./helix
     ./htop
     ./ncmpcpp
     ./neovim
@@ -11,4 +14,35 @@
     ./starship
     ./tig
   ];
+
+  environment.systemPackages = with pkgs; [
+    wget
+    jq
+    exa
+    fd
+    fzf
+    gdu
+    fdupes
+    mediainfo
+    ponysay
+    lolcat
+    cmatrix
+    sox
+    httpie
+    p7zip
+    ripgrep
+    rsync
+    unar
+    genact
+    ffmpeg
+    killall
+    trashy
+    whois
+    dwt1-shell-color-scripts
+    dig
+    yt-dlp
+    neofetch
+    pywal
+    brightnessctl
+  ];
 }

terminal/helix/default.nix

@@ -0,0 +1,7 @@
+{
+  home-manager.sharedModules = [{
+    programs.helix = {
+      enable = true;
+    };
+  }];
+}

terminal/ncmpcpp/default.nix

@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   home-manager.sharedModules = [{
     services.mpd = {
@@ -50,4 +52,8 @@
       };
     };
   }];
+
+  environment.systemPackages = with pkgs; [
+    mpc-cli
+  ];
 }