From 09e879cfa15b856a1a26820fcb646edc4adcda88 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 5 Oct 2019 18:04:34 +0200 Subject: Move shell and UI packages to user --- system/modules/programs/shell.nix | 23 ----------------------- system/modules/user-interface.nix | 10 +--------- 2 files changed, 1 insertion(+), 32 deletions(-) (limited to 'system/modules') diff --git a/system/modules/programs/shell.nix b/system/modules/programs/shell.nix index cf36a115..68fbfcc5 100644 --- a/system/modules/programs/shell.nix +++ b/system/modules/programs/shell.nix @@ -8,27 +8,4 @@ programs.vim = pkgs.lib.attrsets.optionalAttrs pkgs.stdenv.isDarwin { enable = true; }; - - environment.systemPackages = with pkgs; [ - pv - fd - unstable.sd - entr - file - htop - lsof - iftop - nmap - moreutils - mtr - tree - zip - telnet - ] ++ ( - if !stdenv.isDarwin - then [ - vim - unar - ] else [ - ]); } diff --git a/system/modules/user-interface.nix b/system/modules/user-interface.nix index d25a9176..2fb0acd2 100644 --- a/system/modules/user-interface.nix +++ b/system/modules/user-interface.nix @@ -17,8 +17,6 @@ fish # for emacs-fish-completion - unstable.xst # st, but with support for XResources - lxappearance lxrandr lxtask @@ -42,11 +40,7 @@ wire-desktop trash-cli - ] ++ (if !stdenv.isDarwin - then [ - unstable.mu - ] - else []); + ]; nixpkgs.config.allowUnfree = true; @@ -58,8 +52,6 @@ services.devmon.enable = true; - environment.sessionVariables.TERMINAL = "st"; - systemd.user.services.trash-clean = { path = with pkgs; [ trash-cli ]; description = "Remove old files from FreeDesktop.org trash"; -- cgit 1.4.1