about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/profpatsch/base-workstation.nix9
-rw-r--r--machines/profpatsch/shiki.nix2
2 files changed, 7 insertions, 4 deletions
diff --git a/machines/profpatsch/base-workstation.nix b/machines/profpatsch/base-workstation.nix
index dd73909a..d1a14e70 100644
--- a/machines/profpatsch/base-workstation.nix
+++ b/machines/profpatsch/base-workstation.nix
@@ -70,7 +70,7 @@ in {
             #TODO add as nixpkg
             export PATH+=":$HOME/scripts" #add utility scripts
             export EDITOR=emacsclient
-            export TERMINAL=${lilyterm}/bin/lilyterm
+            export TERMINAL=${lilyterm-git}/bin/lilyterm
 
             ${xorg.xset}/bin/xset r rate 250 35
 
@@ -128,7 +128,12 @@ in {
         traceroute        # trace ip routes
         wirelesstools     # iwlist (wifi scan)
       ];
-    in basePkgs;
+      # minimal set of gui applications
+      guiPkgs = [
+        lilyterm-git      # terminal emulator, best one around
+        dmenu             # minimal launcher
+      ];
+    in basePkgs ++ guiPkgs;
 
     # friendly user shell
    programs.fish.enable = true;
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index 6ac7365d..77a97303 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -144,7 +144,6 @@ in {
         wpa_supplicant_gui   # configure wireless connections
       ];
       xPkgs = [
-        dmenu             # simple UI menu builder
         dunst             # notification daemon (interfaces with libnotify)
         # TODO: replace by xscreensaver or i3lock
         alock             # lock screen
@@ -199,7 +198,6 @@ in {
         gimp                 # graphics
         inkscape             # vector graphics
         libreoffice          # a giant ball of C++, that sometimes helps with proprietary shitformats
-        lilyterm-git         # terminal emulator, best one around
         myPkgs.mpv           # you are my sun and my stars, and you play my stuff.
         pass                 # standard unix password manager
         picard               # jean-luc, music tagger