From afe124874eeca0b7c665498121968348f257b613 Mon Sep 17 00:00:00 2001
From: Marcel Kapfer <marcelmichaelkapfer@gmail.com>
Date: Mon, 20 Mar 2017 22:48:25 +0100
Subject: [PATCH] stumpwm and es changes

---
 .stumpwmrc | 9 +++++----
 es.sh      | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.stumpwmrc b/.stumpwmrc
index 6b65b53..3b1e5f1 100644
--- a/.stumpwmrc
+++ b/.stumpwmrc
@@ -38,12 +38,11 @@
 ;; root keybindings
 
 ;;; browser
-(define-key *root-map* (kbd "C-c") "exec google-chrome-unstable")
+(define-key *root-map* (kbd "C-c") "exec /opt/firefox/firefox")
 
 ;;; terminal
 (define-key *root-map* (kbd "c") "exec urxvt")
 
-
 ;;; es as emacs
 (define-key *root-map* (kbd "e") "exec es")
 
@@ -63,7 +62,7 @@
 (run-shell-command "xrdb -merge ~/.Xresources")
 ;;; HiDPI stuff.
 ;;; TODO: Only run if required
-(run-shell-command "xrdb -merge ~/.Xresources-hidpi")
+;; (run-shell-command "xrdb -merge ~/.Xresources-hidpi")
 
 ;; dunst notify server
 (run-shell-command "dunst")
@@ -73,11 +72,13 @@
 
 ;; message window font
 (set-font "11Hermit")
-;;(setf *max-
 
 ;; set the mouse focus
 (setf *mouse-focus-policy* :click)
 
+;; set DESKTOP_SESSION variable
+(setf (getenv "DESKTOP_SESSION") "stumpwm")
+
 ;; define volume control keys
 (define-key *top-map* (kbd "XF86AudioLowerVolume") "exec amixer set Master 5%-")
 (define-key *top-map* (kbd "XF86AudioRaiseVolume") "exec amixer set Master 5%+")
diff --git a/es.sh b/es.sh
index 1920e99..b3777a7 100755
--- a/es.sh
+++ b/es.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-stumpish 'eval (stumpwm::save-es-called-win)' > /dev/null
-emacsclient -c --alternate-editor=$ALTERNATE_EDITOR "$@"
+if [ "$DESKTOP_SESSION" = "stumpwm" ]; then
+    stumpish 'eval (stumpwm::save-es-called-win)' > /dev/null
+fi
+
+emacsclient -c --alternate-editor="$ALTERNATE_EDITOR" "$@"