From 0534b15b3a0849b866d74c3f353ed079a9de3856 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 16 May 2019 20:12:22 +0200 Subject: machines/profpatsch: move more stuff into base-workstation --- machines/profpatsch/base-workstation.nix | 9 +++++++-- machines/profpatsch/shiki.nix | 2 -- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'machines') 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 -- cgit 1.4.1