From: Amin Bandali Date: Tue, 13 Oct 2020 02:13:45 +0000 (-0400) Subject: Some adaptations for my current EXWM setup X-Git-Url: https://git.shemshak.org/~bandali/configs/commitdiff_plain/aea662c560fb8fcd37e741adf67be9127f45f03a?ds=sidebyside Some adaptations for my current EXWM setup --- diff --git a/.bashrc b/.bashrc index 246780c..397aa80 100644 --- a/.bashrc +++ b/.bashrc @@ -85,7 +85,7 @@ alias se="SUDO_EDITOR=\"emacsclient\" sudo -e" alias s="startx" aur() { - cd ~/usr/builds + cd ~/s [ -d ${1} ] || git clone https://aur.archlinux.org/${1}.git cd ${1} } diff --git a/.config/rofi/config b/.config/rofi/config index a2b343d..b33d1e6 100644 --- a/.config/rofi/config +++ b/.config/rofi/config @@ -11,4 +11,5 @@ rofi.width: 600 rofi.monitor: -1 !rofi.lines: 10 -rofi.theme: ~/.guix-profile/share/rofi/themes/gruvbox-light-hard.rasi +!rofi.theme: ~/.guix-profile/share/rofi/themes/gruvbox-light-hard.rasi +rofi.theme: /usr/share/rofi/themes/gruvbox-light-hard.rasi diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 435cf97..0dccfff 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -977,16 +977,6 @@ Make N (default: 1) copies of the current line or region." (other-window 1))) (global-set-key (kbd "C-c w q") #'quit-window) -(run-with-idle-timer 0.6 nil #'require 'windmove) -(global-set-key (kbd "C-c w h") #'windmove-left) -(global-set-key (kbd "C-c w j") #'windmove-down) -(global-set-key (kbd "C-c w k") #'windmove-up) -(global-set-key (kbd "C-c w l") #'windmove-right) -(global-set-key (kbd "C-c w H") #'windmove-swap-states-left) -(global-set-key (kbd "C-c w J") #'windmove-swap-states-down) -(global-set-key (kbd "C-c w K") #'windmove-swap-states-up) -(global-set-key (kbd "C-c w L") #'windmove-swap-states-right) - ;; pass ;; (global-set-key (kbd "C-c a p") #'pass) ;; (add-hook 'pass-mode-hook #'View-exit) diff --git a/.emacs.d/lisp/bandali-exwm.el b/.emacs.d/lisp/bandali-exwm.el index 4395d61..ff89112 100644 --- a/.emacs.d/lisp/bandali-exwm.el +++ b/.emacs.d/lisp/bandali-exwm.el @@ -125,20 +125,29 @@ around if needed." (interactive) (start-process-shell-command "rofi-light" nil "rofi-light"))) - ([XF86AudioMute] . + ([XF86AudioMute] . ; borken on my X200 :-( (lambda () (interactive) - (start-process "" nil "amixer" "set" "'Master',0" "toggle"))) + (start-process "" nil "pamixer" "--toggle-mute"))) + ([XF86Launch1] . + (lambda () + (interactive) + (start-process "" nil "pamixer" "--toggle-mute"))) + ([\s-XF86Launch1] . ; toggle mic mute + (lambda () + (interactive) + (start-process + "" nil "pamixer" "--default-source" "--toggle-mute"))) ([XF86AudioLowerVolume] . (lambda () (interactive) (start-process - "" nil "amixer" "set" "'Master',0" "5%-"))) + "" nil "pamixer" "--allow-boost" "--decrease" "5"))) ([XF86AudioRaiseVolume] . (lambda () (interactive) (start-process - "" nil "amixer" "set" "'Master',0" "5%+"))) + "" nil "pamixer" "--allow-boost" "--increase" "5"))) ([XF86AudioPlay] . (lambda () (interactive) diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index ba418db..5263551 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -4,6 +4,6 @@ max-cache-ttl 86400 default-cache-ttl-ssh 43200 max-cache-ttl-ssh 86400 -pinentry-program /home/bandali/.guix-profile/bin/pinentry-emacs -allow-emacs-pinentry -allow-loopback-pinentry +# pinentry-program /home/bandali/.guix-profile/bin/pinentry-emacs +# allow-emacs-pinentry +# allow-loopback-pinentry diff --git a/.xinitrc b/.xinitrc index b0e828e..efd4e31 100644 --- a/.xinitrc +++ b/.xinitrc @@ -15,4 +15,6 @@ xsetroot -cursor_name left_ptr xset r rate 200 45 xset b off -exec emacs -ib 0 +[ -x "$(command -v pasystray)" ] && pasystray -a & +[ -x "$(command -v nm-applet)" ] && nm-applet & +EDITOR=nano exec emacs -ib 0