From e6c67861d344aef7a7ca9d3ee5d855cbc05d20c0 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 9 Oct 2019 11:20:03 -0400
Subject: [PATCH] fix jirud (exwm) setup

---
 .config/profiles/jirud | 11 +++++++++++
 .emacs.d/init.el       | 30 +++++++++++++-----------------
 .xsession              | 10 ++++++++++
 3 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100755 .xsession

diff --git a/.config/profiles/jirud b/.config/profiles/jirud
index 62a95ef..d9112c3 100644
--- a/.config/profiles/jirud
+++ b/.config/profiles/jirud
@@ -3,3 +3,14 @@ if [ -x "$(command -v xinput)" ]; then
 fi
 
 export INFOPATH="$HOME/usr/local/share/info${INFOPATH:+:}$INFOPATH"
+
+setxkbmap \
+    -layout us,ir \
+    -option ctrl:nocaps \
+    -option grp:shifts_toggle
+
+xmodmap -e "keysym Menu = Super_R"
+
+xsetroot -cursor_name left_ptr
+xset r rate 200 45
+xset b off
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 10d84dd..71f86d5 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -184,6 +184,9 @@
 
 ;;; Initial setup
 
+(defvar b/exwm-p (string= (system-name) "jirud")
+  "Whether or not we will be using `exwm'.")
+
 ;; keep ~/.emacs.d clean
 (use-package no-littering
   :demand
@@ -394,7 +397,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; time and battery in mode-line
 (use-feature time
-  :disabled
+  :if b/exwm-p
   :demand
   :config
   (display-time-mode)
@@ -403,7 +406,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (display-time-format "%a %b %-e, %-l:%M%P"))
 
 (use-feature battery
-  :disabled
+  :if b/exwm-p
   :demand
   :config
   (display-battery-mode)
@@ -568,7 +571,7 @@ For disabling the behaviour for certain buffers and/or modes."
 ;;; Essential packages
 
 (use-package exwm
-  :disabled
+  :if b/exwm-p
   :demand
   :config
   ;; make class name the buffer name, truncating beyond 60 characters
@@ -764,18 +767,7 @@ around if needed."
   :config
   (exwm-randr-enable)
   :custom
-  (exwm-randr-workspace-monitor-plist '(1 "VGA-1"))
-  :hook
-  (exwm-randr-screen-change . (lambda ()
-                                (let ((xrandr
-                                       (string-join
-                                        '("xrandr"
-                                          "--output VGA-1"
-                                          "--same-as LVDS-1"
-                                          "--auto")
-                                        " ")))
-                                  (start-process-shell-command
-                                   "xrandr" nil xrandr)))))
+  (exwm-randr-workspace-monitor-plist '(1 "VGA-1")))
 
 (use-feature exwm-systemtray
   :demand
@@ -1572,7 +1564,9 @@ This function is intended for use with `ivy-ignore-buffers'."
   (load-theme 'tangomod t)
   (sml/apply-theme 'tangomod)
   (font-lock-remove-keywords
-   'org-mode b/org-mode-font-lock-keywords))
+   'org-mode b/org-mode-font-lock-keywords)
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))
 
 (defun b/lights-off ()
   "Go dark."
@@ -1581,7 +1575,9 @@ This function is intended for use with `ivy-ignore-buffers'."
   (load-theme 'doom-one t)
   (sml/apply-theme 'automatic)
   (font-lock-add-keywords
-   'org-mode b/org-mode-font-lock-keywords t))
+   'org-mode b/org-mode-font-lock-keywords t)
+  (when (featurep 'exwm-systemtray)
+    (exwm-systemtray--refresh)))
 
 (bind-keys
  ("C-c t d" . b/lights-off)
diff --git a/.xsession b/.xsession
new file mode 100755
index 0000000..4ca6c84
--- /dev/null
+++ b/.xsession
@@ -0,0 +1,10 @@
+if [ "$(hostname)" = "jirud" ]; then
+    [ -f "/usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd" ] && /usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd &
+    [ -x "$(command -v light-locker)" ] && light-locker --lock-on-suspend &
+    [ -x "$(command -v pasystray)" ] && pasystray -a &
+    [ -x "$(command -v nm-applet)" ] && nm-applet &
+    [ -x "$(command -v compton)" ] && compton &
+    [ -x "$(command -v emacs)" ] && exec emacs -ib 0
+else
+    startxfce4
+fi
-- 
2.20.1