diff --git a/flake.nix b/flake.nix index c888996..c3bc0e4 100644 --- a/flake.nix +++ b/flake.nix @@ -247,7 +247,6 @@ ++ ( if server then [ - ./systems/programs.nix ./systems/configuration.nix ./systems/${hostname}/hardware.nix ./systems/${hostname}/configuration.nix diff --git a/users/richie/systems/programs.nix b/modules/programs.nix similarity index 100% rename from users/richie/systems/programs.nix rename to modules/programs.nix diff --git a/systems/programs.nix b/systems/programs.nix deleted file mode 100644 index 51e4322..0000000 --- a/systems/programs.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - bat - btop - croc - deadnix - direnv - fd - file - htop - hwloc - iperf3 - jp2a - jq - lsof - lynis - ncdu - neofetch - nix-init - nix-output-monitor - nix-prefetch - nix-tree - nixpkgs-fmt - nmap - pciutils - python3 - qrencode - ripgrep - smartmontools - tig - tokei - tree - unzip - ventoy - wget - zip - zoxide - zsh-nix-shell - ]; -} diff --git a/users/richie/systems/rhapsody-in-green/configuration.nix b/users/richie/systems/rhapsody-in-green/configuration.nix index 51d3f3d..9e2b65a 100644 --- a/users/richie/systems/rhapsody-in-green/configuration.nix +++ b/users/richie/systems/rhapsody-in-green/configuration.nix @@ -1,6 +1,5 @@ { imports = [ - ../programs.nix ./hardware.nix ../../syncthing_base.nix ];