summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.emacs.d/init.el5
-rw-r--r--.emacs.d/lisp/bandali-exwm.el10
m---------.emacs.d/lisp/exwm0
-rwxr-xr-x.local/bin/startup-progs6
-rwxr-xr-x.xinitrc12
-rwxr-xr-x.xsession11
6 files changed, 25 insertions, 19 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index a04b4c8..8d05845 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -61,7 +61,7 @@
;; (delight "1.7")
;; (emms "7.7")
;; (rt-liberation "2.4")))
-(package-initialize))
+ (package-initialize))
(setq package-archive-upload-base "/ssh:caffeine:~/www/p/elpa")
@@ -484,7 +484,8 @@ Effectively a very simple light/dark theme toggle switch."
(expand-file-name
(convert-standard-filename "lisp") user-emacs-directory))
-;; (require 'bandali-exwm)
+(when (member (system-name) '("chaman"))
+ (require 'bandali-exwm))
(require 'bandali-org)
diff --git a/.emacs.d/lisp/bandali-exwm.el b/.emacs.d/lisp/bandali-exwm.el
index 92f9b31..b1b0bba 100644
--- a/.emacs.d/lisp/bandali-exwm.el
+++ b/.emacs.d/lisp/bandali-exwm.el
@@ -104,16 +104,16 @@ around if needed."
command nil command)))
([s-return] . (lambda ()
(interactive)
- (start-process "" nil "urxvt")))
+ (start-process "" nil "xterm")))
([S-s-return] . (lambda ()
(interactive)
- (start-process "" nil "urxvt"
+ (start-process "" nil "xterm"
"-name" "floating")))
([?\C-\s-\s] . counsel-linux-app)
([?\M-\s-\s] . (lambda ()
(interactive)
(start-process-shell-command
- "rofi-pass" nil "rofi-pass")))
+ "passmenu" nil "passmenu --type")))
([?\s-h] . windmove-left)
([?\s-j] . windmove-down)
([?\s-k] . windmove-up)
@@ -182,7 +182,7 @@ around if needed."
([?\s-\'] . (lambda ()
(interactive)
(start-process-shell-command
- "rofi-light" nil "rofi-light")))
+ "dmneu-light" nil "dmenu-light")))
([XF86AudioMute] . ; borken on my X200 :-(
(lambda ()
(interactive)
@@ -279,7 +279,7 @@ around if needed."
(exwm-input-set-local-simulation-keys
`(,@exwm-input-simulation-keys
([?\C-\S-d] . [?\C-d]))))
- ((member exwm-class-name '("URxvt" "Mate-terminal"))
+ ((member exwm-class-name '("XTerm" "Mate-terminal"))
(exwm-input-set-local-simulation-keys
'(([?\C-c ?\C-c] . [?\C-c])
([?\C-c ?\C-u] . [?\C-u]))))
diff --git a/.emacs.d/lisp/exwm b/.emacs.d/lisp/exwm
-Subproject 0368127976bda29d35eed788edfe74644ecd384
+Subproject b62d5e79b0c1799f2cd941b4cec5bf8492cb322
diff --git a/.local/bin/startup-progs b/.local/bin/startup-progs
index 2040de2..39cb82f 100755
--- a/.local/bin/startup-progs
+++ b/.local/bin/startup-progs
@@ -11,8 +11,10 @@ xsetroot -cursor_name left_ptr
xset r rate 200 45
xset b off
-light -N 1
+[ -x "$(command -v light)" ] && light -N 1
-[ -x "$(command -v dunst)" ] && dunst &
+# [ -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 dunst)" ] && dunst &
[ -x "$(command -v nm-applet)" ] && nm-applet &
[ -x "$(command -v pasystray)" ] && pasystray -a &
diff --git a/.xinitrc b/.xinitrc
new file mode 100755
index 0000000..a888a36
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,12 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+#if [ -f "$HOME/.profile" ]; then
+# . "$HOME/.profile";
+#fi
+
+if [ -f "$HOME/.local/bin/startup-progs" ]; then
+ . "$HOME/.local/bin/startup-progs"
+fi
+
+# LC_ALL=C twm &
+[ -x "$(command -v emacs)" ] && exec ssh-agent emacs -ib 0
diff --git a/.xsession b/.xsession
index b2f5609..74e506d 100755
--- a/.xsession
+++ b/.xsession
@@ -1,12 +1,3 @@
if [ -f "$HOME/.xinitrc" ]; then
- . "$HOME/.xinitrc"
+ . "$HOME/.xinitrc"
fi
-
-[ -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 dunst)" ] && dunst &
-# LC_ALL=C twm &
-[ -x "$(command -v emacs)" ] && exec ssh-agent exwm -ib 0