Move shell and UI packages to user
4 files changed, 39 insertions(+), 32 deletions(-)
M system/modules/programs/shell.nix → system/modules/programs/shell.nix
@@ -8,27 +8,4 @@ programs.bash.enableCompletion = true; 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 [ - ]); }
M system/modules/user-interface.nix → system/modules/user-interface.nix
@@ -17,8 +17,6 @@ cmus fish # for emacs-fish-completion - unstable.xst # st, but with support for XResources - lxappearance lxrandr lxtask@@ -42,11 +40,7 @@ signal-desktop wire-desktop trash-cli - ] ++ (if !stdenv.isDarwin - then [ - unstable.mu - ] - else []); + ]; nixpkgs.config.allowUnfree = true;@@ -57,8 +51,6 @@ vSync = "opengl-swc"; }; services.devmon.enable = true; - - environment.sessionVariables.TERMINAL = "st"; systemd.user.services.trash-clean = { path = with pkgs; [ trash-cli ];
M user/modules/base.nix → user/modules/base.nix
@@ -6,4 +6,26 @@ programs.home-manager.enable = true; manual = { html.enable = true; }; + home.packages = with pkgs; [ + pv + fd + unstable.sd + entr + file + htop + lsof + iftop + nmap + moreutils + mtr + tree + zip + telnet + ] ++ ( + if !stdenv.isDarwin + then [ + vim + unar + ] else [ + ]); }
A user/modules/user-interface.nix
@@ -0,0 +1,16 @@ +{ config, pkgs, ... }: + +let + inherit (pkgs) stdenv; +in +{ + home.sessionVariables = { + TERMINAL = "${pkgs.unstable.xst}/bin/xst"; + }; + + home.packages = with pkgs; [ + unstable.xst # st, but with support for XResources + ] ++ lib.optionals (!stdenv.isDarwin) [ + pkgs.unstable.mu + ]; +}