Merge remote-tracking branch 'gum/master'

3 files changed, 12 insertions, 9 deletions

diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 2bb438f16..b6554e040 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -5,6 +5,7 @@
     ./core.nix
     ./core-gui.nix
     ./dev.nix
+    ./desktop.nix
     ./extra-gui.nix
     ./games.nix
     ./media.nix
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 7e9a459c3..604288904 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -24,7 +24,6 @@
 
     # io
     pv
-    sshpass
     usbutils
     p7zip
     hdparm
@@ -39,11 +38,6 @@
     wol
     iftop
 
-    mkpasswd
-    mutt
-    weechat
-    tmux
-
     # stockholm
     git
     gnumake
@@ -55,8 +49,5 @@
     rxvt_unicode.terminfo
     krebspaste
 
-    # TODO:
-    taskwarrior
-    pass
   ];
 }
diff --git a/makefu/2configs/tools/desktop.nix b/makefu/2configs/tools/desktop.nix
new file mode 100644
index 000000000..1fe03e111
--- /dev/null
+++ b/makefu/2configs/tools/desktop.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  users.users.makefu.packages = with pkgs; [
+    taskwarrior
+    pass
+    mutt
+    weechat
+    tmux
+  ];
+}