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 +---------
 user/modules/base.nix             | 22 ++++++++++++++++++++++
 user/modules/user-interface.nix   | 16 ++++++++++++++++
 4 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 user/modules/user-interface.nix

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";
diff --git a/user/modules/base.nix b/user/modules/base.nix
index 46645d94..cc83cb47 100644
--- a/user/modules/base.nix
+++ b/user/modules/base.nix
@@ -6,4 +6,26 @@
   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 [
+  ]);
 }
diff --git a/user/modules/user-interface.nix b/user/modules/user-interface.nix
new file mode 100644
index 00000000..835cb7b7
--- /dev/null
+++ b/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
+  ];
+}
-- 
cgit 1.4.1