diff --git a/nixos/common/system-tools.nix b/nixos/common/system-tools.nix new file mode 100644 index 0000000..370e074 --- /dev/null +++ b/nixos/common/system-tools.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: + +{ + environment = { + systemPackages = with pkgs; [ + # Ensure home-manager is on all systems + home-manager + + # Useful system utilities + tree # directory structure + bc # basic calculator + vim # editor + ranger # console file manager + htop # system monitor + + # HTTP + curl # transfer dato to/from server + wget # download files from web + + # Archive + unrar # extract roshal archive + unzip # extract zip archive + ]; + }; +} diff --git a/nixos/fuchsia/configuration.nix b/nixos/fuchsia/configuration.nix index f81c982..6b06471 100644 --- a/nixos/fuchsia/configuration.nix +++ b/nixos/fuchsia/configuration.nix @@ -13,6 +13,9 @@ # You can also split up your configuration and import pieces of it here: + # Import common configurations + ../common/system-tools.nix + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; @@ -144,16 +147,6 @@ # Install packages, prefix with 'unstable.' to use overlay systemPackages = with pkgs; [ - # System tools - curl git glxinfo home-manager htop ranger trash-cli tree unrar unzip vim wget zip - - # Developer tools - docker-compose ghc cabal-install go - unstable.hugo - - # QMK firmware - qmk vial - # Code editors emacs vscode @@ -170,8 +163,7 @@ openrgb protonup-ng # Mouse - libratbag - piper + libratbag piper ]; # Completions for system packages diff --git a/nixos/lavender/configuration.nix b/nixos/lavender/configuration.nix index 0d9ba5f..eb45851 100644 --- a/nixos/lavender/configuration.nix +++ b/nixos/lavender/configuration.nix @@ -14,6 +14,9 @@ # You can also split up your configuration and import pieces of it here: ./containers + # Import common configurations + ../common/system-tools.nix + # Import your generated (nixos-generate-config) hardware configuration ./hardware-configuration.nix ]; @@ -114,11 +117,6 @@ }; environment = { - systemPackages = with pkgs; [ - # System tools - vim wget git home-manager tree ranger - ]; - # Completions for system packages pathsToLink = [ "/share/zsh" ]; };