Move some more packages up to system level (from home-manager)

flake.nix

@@ -178,10 +178,7 @@
                 useUserPackages = true;
                 users = {
                   root = {
-                    imports = [
-                      ./home/default.nix
-                      ({ pkgs, ... }: { home.packages = with pkgs; [ nil ]; })
-                    ];
+                    imports = [ ./home/default.nix ];
                     home = {
                       inherit stateVersion;
                       username = "root";

home/emacs.nix

@@ -125,48 +125,4 @@
       };
     };
   };
-  home.packages = with pkgs; [
-    # Emacs requirements
-    fd
-    ripgrep
-    imagemagick
-    languagetool
-    wordnet
-    (aspellWithDicts (ds: with ds; [ en en-computers en-science ]))
-
-    # For EMMS
-    mp3info
-
-    # Language-specific requirements
-    sqlite
-    pandoc
-    texlive.combined.scheme-full
-    ghostscript
-    mupdf
-    poppler_utils
-
-    # Linters
-    nodePackages.stylelint
-
-    # Formatters
-    nodePackages.prettier
-    nixfmt
-    black
-    isort
-    fprettify
-    ruff
-    rustfmt
-    stylua
-    shfmt
-
-    # LSP Servers
-    nil
-    fortls
-    shellcheck
-    rust-analyzer
-    luajitPackages.lua-lsp
-    nodePackages.pyright
-    nodePackages.yaml-language-server
-    nodePackages.bash-language-server
-  ];
 }

home/nyxt/default.nix

@@ -1,11 +1 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    nyxt
-    gst_all_1.gst-libav
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-ugly
-  ];
-  xdg.configFile."nyxt/config.lisp".source = ./config.lisp;
-}
+{ ... }: { xdg.configFile."nyxt/config.lisp".source = ./config.lisp; }

system/desktop.nix

@@ -1,7 +1,8 @@
 { config, pkgs, user, ... }:
 
 {
-  imports = [ ./default.nix ./firefox.nix ./chromium.nix ];
+  imports =
+    [ ./default.nix ./emacs.nix ./nyxt.nix ./firefox.nix ./chromium.nix ];
   environment.systemPackages = with pkgs; [
     dex
     mesa

system/emacs.nix

@@ -0,0 +1,54 @@
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    # Emacs + requirements
+    emacs29-pgtk
+    fd
+    ripgrep
+    imagemagick
+    languagetool
+    wordnet
+    (aspellWithDicts (ds: with ds; [ en en-computers en-science ]))
+
+    # For EMMS
+    mp3info
+
+    # Language-specific requirements
+    sqlite
+    pandoc
+    texlive.combined.scheme-full
+    ghostscript
+    mupdf
+    poppler_utils
+
+    # Linters
+    nodePackages.stylelint
+
+    # Formatters
+    nodePackages.prettier
+    nixfmt
+    black
+    isort
+    fprettify
+    ruff
+    rustfmt
+    stylua
+    shfmt
+
+    # LSP Servers
+    nil
+    fortls
+    shellcheck
+    rust-analyzer
+    luajitPackages.lua-lsp
+    nodePackages.pyright
+    nodePackages.yaml-language-server
+    nodePackages.bash-language-server
+
+    # Common programming languages
+    rustc
+    cargo
+    lua
+    gfortran
+    (python3.withPackages (ps: with ps; [ numpy scipy xarray plotly ]))
+  ];
+}

system/hyprland.nix

@@ -1,6 +1,4 @@
-{ config, lib, pkgs, user, ... }:
-
-{
+{ pkgs, ... }: {
   imports = [ ./desktop.nix ];
   nixpkgs.config.chromium.commandLineArgs =
     "--enable-features=UseOzonePlatform --ozone-platform=wayland";

system/nyxt.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    nyxt
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
+  ];
+}