From ea642ef8efb3f67ea42e970da1787a8bdfb89c6c Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Wed, 1 Jan 2025 14:55:12 -0600 Subject: [PATCH] move packages declarations for aristotle --- boxes/aristotle/default.nix | 60 ------------------------------------- config/aristotle.nix | 60 +++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/boxes/aristotle/default.nix b/boxes/aristotle/default.nix index fb3f29f..4d5469e 100644 --- a/boxes/aristotle/default.nix +++ b/boxes/aristotle/default.nix @@ -48,66 +48,6 @@ experimental-features = [ "nix-command" "flakes" ]; }; - fonts.packages = with pkgs; [ - fantasque-sans-mono - ]; - - environment.systemPackages = with pkgs; [ - # x11 - brave - qutebrowser - (callPackage ../../builds/st.nix { aristotle = true; }) - (callPackage ../../builds/utils.nix {}) - (callPackage ../../builds/rebuild.nix {}) - (callPackage ../../builds/dwm.nix {}) - (callPackage ../../builds/sssg.nix {}) - dmenu - pinentry-qt - - # tui/cli programs - # devel - gh - tea - neovim - git - git-annex - - # audio - cmus - ncpamixer - bluetuith - - # pimtools - khard - khal - vdirsyncer - neomutt - isync - msmtp - todoman - - # utilities - htop - tmux - rbw - elinks - lynx - jq - peaclock - usbutils # for lsusb - pciutils # for lspci - kjv - epr - poppler_utils - ledger - gnuplot - anki-bin - x11vnc - - # for the remote access functionality - vscode-fhs - ]; - services = { xserver = { enable = true; diff --git a/config/aristotle.nix b/config/aristotle.nix index 238496b..1c53ce9 100644 --- a/config/aristotle.nix +++ b/config/aristotle.nix @@ -14,6 +14,66 @@ }; }; + fonts.packages = with pkgs; [ + fantasque-sans-mono + ]; + + environment.systemPackages = with pkgs; [ + # x11 + brave + qutebrowser + (callPackage ../builds/st.nix { aristotle = true; }) + (callPackage ../builds/utils.nix {}) + (callPackage ../builds/rebuild.nix {}) + (callPackage ../builds/dwm.nix {}) + (callPackage ../builds/sssg.nix {}) + dmenu + pinentry-qt + + # tui/cli programs + # devel + gh + tea + neovim + git + git-annex + + # audio + cmus + ncpamixer + bluetuith + + # pimtools + khard + khal + vdirsyncer + neomutt + isync + msmtp + todoman + + # utilities + htop + tmux + rbw + elinks + lynx + jq + peaclock + usbutils # for lsusb + pciutils # for lspci + kjv + epr + poppler_utils + ledger + gnuplot + anki-bin + x11vnc + + # for the remote access functionality + vscode-fhs + ]; + system.userActivationScripts = { copyEssentialConfiguration = { text = ''