From 0d96e722a772a6ecb5bd4d53a396c0aaef500840 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 6 Jun 2016 13:27:42 +0200
Subject: machines/katara: more explicit xinit

Specify absolute nix store paths where possible.
---
 machines/profpatsch/katara.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index bf1f6bc9..f3fd6c7c 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -129,7 +129,6 @@ in {
         alock             # lock screen
         libnotify         # notification library
         myPkgs.taffybar   # status bar
-        xbindkeys         # keybinding manager
         xclip             # clipboard thingy
         xorg.xkill        # X11 application kill
       ];
@@ -169,7 +168,6 @@ in {
         lilyterm             # terminal emulator, best one around
         myPkgs.mpv           # you are my sun and my stars. and you play my stuff.
         newsbeuter           # RSS/Atom feed reader
-        networkmanagerapplet # NetworkManager status bar widget
         pass                 # standard unix password manager
         myPkgs.poezio               # CLI XMPP client
         poppler_utils        # pdfto*
@@ -228,6 +226,10 @@ in {
     services.printing = {
       enable = true;
       gutenprint = true;
+      # TODO
+      # drivers = [ pkgs.cups-pdf ];
+      # TODO
+      # drivers = [ pkgs.foomatic_filters pkgs.foomatic-db-engine ];
     };
 
     time.timeZone = "Europe/Berlin";
@@ -288,24 +290,24 @@ in {
       # };
 
       displayManager = {
-        sessionCommands =
+        sessionCommands = with pkgs;
             ''
             #TODO add as nixpkg
             export PATH+=":$HOME/scripts" #add utility scripts
             export PATH+=":$HOME/.bin" #add (temporary) executables
             export EDITOR=emacsclient
 
-            gpg-connect-agent /bye
+            ${gnupg}/bin/gpg-connect-agent /bye
             unset SSH_AGENT_PID
             export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh"
 
-            xset r rate 250 35
+            ${xorg.xset}/bin/xset r rate 250 35
 
             set-background &
             # TODO xbindkeys user service file
-            xbindkeys
+            ${xbindkeys}/bin/xbindkeys
             nice -n19 dropbox-cli start &
-            nm-applet &
+            ${networkmanagerapplet}/bin/nm-applet &
             '';
       };
 
-- 
cgit 1.4.1