about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/profpatsch/katara.nix29
-rw-r--r--machines/profpatsch/notes.org32
2 files changed, 48 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
diff --git a/machines/profpatsch/notes.org b/machines/profpatsch/notes.org
new file mode 100644
index 00000000..b5a82651
--- /dev/null
+++ b/machines/profpatsch/notes.org
@@ -0,0 +1,32 @@
+* GTK themes
+this should work:
+
+#+BEGIN_SRC nix
+      # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/x11/desktop-managers/gnome3.nix
+      xserver.displayManager.session = [
+        {
+          manage = "window";
+          name = "awesome";
+          start = ''
+            # Set GTK_DATA_PREFIX so that GTK+ can find the themes
+            export GTK_DATA_PREFIX=${config.system.path}
+            # Find theme engines
+            export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
+            # Find the mouse
+            export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+            # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+            ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
+            # Find the mouse
+            export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+            ${pkgs.awesome}/bin/awesome&
+            waitPID=$!
+          '';
+        }
+      ];
+
+        environment = {
+
+          # Share needed for themes and backgrounds
+          pathsToLink = [ "/include" "/share"];
+       };
+#+END_SRC