From 664be83949af7e433d3fcbee7133c47b3bc57bba Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 5 Nov 2025 08:49:47 +0900 Subject: [PATCH] common/packages: split off file from `default.nix` --- hosts/common/default.nix | 46 +------------------------------------- hosts/common/packages.nix | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 45 deletions(-) create mode 100644 hosts/common/packages.nix diff --git a/hosts/common/default.nix b/hosts/common/default.nix index a074152..2705635 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -5,6 +5,7 @@ in { imports = [ ./fonts.nix ./nix.nix + ./packages.nix ./programs/dconf.nix ./programs/gnupg.nix @@ -74,12 +75,6 @@ in { VISUAL = "nvim"; }; - systemPackages = with pkgs; ([ - wget - ] ++ (lib.optionals (!config.machineVars.headless) [ - haskellPackages.xmobar - ])); - shells = with pkgs; [ bashInteractive zsh @@ -166,45 +161,6 @@ in { hyprlock = { }; }; - system.extraDependencies = - lib.optionals (config.machineVars.development) (with pkgs; [ - asciidoc - asciidoctor - cabal2nix - clang - dart - dotnet-sdk - # dotnet-sdk_3 - # dotnet-sdk_5 - dotnetPackages.Nuget - elm2nix - elmPackages.elm - flutter - gcc - ghc - ghcid - # haskellPackages.Cabal_3_6_3_0 - maven - nixfmt-rfc-style - nixpkgs-fmt - # nixpkgs-hammering - nodePackages.node2nix - nodePackages.npm - nodePackages.sass - nodePackages.typescript - nodePackages.yarn - nodejs - plantuml - python3 - rustc - rustc - rustup - sqlcheck - sqlint - sqlite - sqlite-web - ]); - # Realtime scheduling for pipewire and mpd security.rtkit.enable = !config.machineVars.headless; diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix new file mode 100644 index 0000000..05bcafe --- /dev/null +++ b/hosts/common/packages.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: +{ + environment.systemPackages = with pkgs; ([ + wget + ] ++ (lib.optionals (!config.machineVars.headless) [ + haskellPackages.xmobar + ])); + + system.extraDependencies = + lib.optionals (config.machineVars.development) (with pkgs; [ + asciidoc + asciidoctor + cabal2nix + clang + dart + dotnet-sdk + # dotnet-sdk_3 + # dotnet-sdk_5 + dotnetPackages.Nuget + elm2nix + elmPackages.elm + flutter + gcc + ghc + ghcid + # haskellPackages.Cabal_3_6_3_0 + maven + nixfmt-rfc-style + nixpkgs-fmt + # nixpkgs-hammering + nodePackages.node2nix + nodePackages.npm + nodePackages.sass + nodePackages.typescript + nodePackages.yarn + nodejs + plantuml + python3 + rustc + rustc + rustup + sqlcheck + sqlint + sqlite + sqlite-web + ]); +}