about summary refs log tree commit diff
path: root/machines/profpatsch/katara.nix
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2015-11-09 01:37:16 +0100
committerProfpatsch <mail@profpatsch.de>2015-11-09 01:37:31 +0100
commitebac6add8f043b304d7ac30798edc38813cbe489 (patch)
tree50bb90a9b9a58e9bda2a9bc008ee81468a75b26f /machines/profpatsch/katara.nix
parentb8fef2fa3fa844c8c8e6303edaa78a8346e5caac (diff)
katara: login commands
Diffstat (limited to 'machines/profpatsch/katara.nix')
-rw-r--r--machines/profpatsch/katara.nix29
1 files changed, 16 insertions, 13 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index c78773b8..34d4cbde 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -256,17 +256,23 @@ in {
         enable = true;
         enableContribAndExtras = true;
       };
-      displayManager.sessionCommands =
-        ''
-        #TODO add as nixpkg
-        export PATH+=":$HOME/scripts" #add utility scripts
-        xset r rate 250 35
-        set-background &
-        xbindkeys
-        nice -n19 dropbox start &
-        '';
+      displayManager = {
+        desktopManagerHandlesLidAndPower = false;
+        sessionCommands =
+            ''
+            #TODO add as nixpkg
+            export PATH+=":$HOME/scripts" #add utility scripts
+            export EDITOR=emacsclient
+            xset r rate 250 35
+            set-background &
+            xbindkeys
+            nice -n19 dropbox start &
+            gajim &
+            '';
+      };
 
       startGnuPGAgent = true;
+
     };
 
     fonts.fontconfig = {
@@ -324,10 +330,7 @@ in {
     ###########
     # Programs
 
-    programs.ssh = {
-      startAgent = false; # see services.xserver.startGnuPGAgent
-      agentTimeout = "1h";
-    };
+    programs.ssh.startAgent = false;
 
     #######
     # Misc