diff options
| -rw-r--r-- | data/foot.ini | 7 | ||||
| -rw-r--r-- | init.el | 55 |
2 files changed, 32 insertions, 30 deletions
diff --git a/data/foot.ini b/data/foot.ini index 484fd1a..a8497a5 100644 --- a/data/foot.ini +++ b/data/foot.ini @@ -2,7 +2,7 @@ font=DejaVu Sans Mono:size=5 font-bold=DejaVu Sans Mono:size=5:weight=semibold -# underline-offset=10 +underline-offset=10 # font=Iosevka Comfy Fixed:size=5.5 pad=5x1 @@ -26,6 +26,11 @@ style=block color=ffffff b22222 blink=no +[bell] +notify=no +urgent=yes +command="notify-send ping!" + [mouse] hide-when-typing=yes # alternate-scroll-mode=yes @@ -253,8 +253,6 @@ (image-mode "image/*" (display-graphic-p)) ("firefox --private-window \"%s\"" "text/html" (and jao-wayland-enabled (not (display-graphic-p)))) - ;; ("firefox \"%s\" && swaymsg [app_id=Firefox] focus" "text/html" - ;; (and jao-sway-enabled (not (display-graphic-p)))) ("swayimg \"%s\"" "image/*" jao-sway-enabled) ("imv-wayland \"%s\"" "image/*" jao-wayland-enabled) ("imv-x11 \"%s\"" "image/*" (display-graphic-p)))))) @@ -333,8 +331,10 @@ (defun jao-colors-scheme-dark-p () (equal "dark" (getenv "JAO_COLOR_SCHEME"))) -(customize-set-variable 'frame-background-mode - (if (jao-colors-scheme-dark-p) 'dark 'light)) +(defun jao-colors-scheme () + (if (jao-colors-scheme-dark-p) 'dark 'light)) + +(customize-set-variable 'frame-background-mode (jao-colors-scheme)) (setq custom-theme-directory (expand-file-name "lib/themes" jao-emacs-dir)) @@ -463,7 +463,7 @@ (jao-trisect) (message "Welcome to wayland")) -(when jao-sway-enabled +(when jao-wayland-enabled (add-hook 'after-init-hook #'jao-wayland-enable)) (defun jao-wayland-type (&rest args) @@ -471,6 +471,7 @@ ;;;; river (defvar jao-river-enabled (jao-shell-running-p "river")) +(defun jao-river-enabled-p () jao-river-enabled) (defun jao-river-to-ws (n) (jao-wayland-type "-M" "win" (format "%s" n))) @@ -519,6 +520,15 @@ (jao-shell-exec (jao-pdf-zathura-open-cmd file page ""))) (when page (sit-for 0.2) (jao-wayland-type (format "%dg" page))))) +(defun jao-river-set-wallpaper (f) + (jao-shell-exec (concat "swaybg -m fill -i " f))) + +(defun jao-river-restart-i3bar () + (interactive) + (when (jao-shell-running-p "i3bar-river") + (jao-shell-string "killall i3bar-river")) + (jao-shell-exec "i3bar-river")) + ;;;; sway (defmacro jao-def-swaymsg (name msg) `(defun ,(intern (format "jao-sway-%s" name)) () @@ -539,26 +549,15 @@ (defun jao-sway-zathura-org () (jao-pdf-goto-zathura-org (jao-sway-get-active-title) t)) -(defun jao-sway-switch-layout () - (sit-for 0.2) - (let ((n (length (split-string (jao-shell-string "pidof zathura") " ")))) - (cond ((= n 1) (jao-wayland-type "-M" "win" "b")) - ((= n 2) (jao-wayland-type "-M" "win" "lv")) - ((= n 3) (jao-wayland-type "-M" "win" "S"))))) - (defun jao-sway-open-with-zathura (file page) (let ((n (file-name-nondirectory file))) (jao-swaymsg "workspace number 3") (unless (= 0 (jao-swaymsg (format "[title=\"%s\"] focus" n))) (jao-shell-exec (jao-pdf-zathura-open-cmd file page ""))) - ;; (jao-sway-switch-layout) (when page (sit-for 0.2) (jao-wayland-type (format "%dg" page))))) (defun jao-sway-set-wallpaper (f) - (make-symbolic-link f "~/.wallpaper.sway" t) - (if jao-sway-enabled - (jao-swaymsg (format "output * bg %s fill" f)) - (jao-shell-exec "swaybg -m fill -i ~/.wallpaper.sway"))) + (jao-swaymsg (format "output * bg %s fill" f))) (defun jao-sway-run-or-focus (cmd &optional ws) (if (jao-shell-running-p "firefox") @@ -584,17 +583,16 @@ (defun jao-set-wallpaper (&optional path) (interactive) - (let ((current (format "~/.wallpaper.%s" - (if (jao-colors-scheme-dark-p) "dark" "light")))) - (when-let ((f (or path + (let ((current (format "~/.wallpaper.%s" (jao-colors-scheme)))) + (when-let ((f (or (expand-file-name path) (read-file-name "Image: " jao-wallpaper-dir (file-symlink-p current) t)))) - (make-symbolic-link (expand-file-name f) current t) - (if jao-wayland-enabled - (jao-sway-set-wallpaper (expand-file-name f)) - (shell-command (format "xwallpaper --zoom %s" f)))))) + (make-symbolic-link f current t) + (cond (jao-river-enabled (jao-river-set-wallpaper f)) + (jao-sway-enabled (jao-sway-set-wallpaper f)) + (t (format "xwallpaper --zoom %s" f)))))) (defun jao-set-random-wallpaper () (interactive) @@ -3331,17 +3329,16 @@ ("n" "capture note" jao-org-notes-open-or-create) ("/" "search notes" jao-org-notes-open) ("\\" "grep notes" jao-org-notes-grep)] - ["Documents" :if jao-window-system-p + ["Docus and packs" + ("a" "aptitude" jao-term-aptitude) + ("l" "packages" jao-list-packages) ("d" "go to doc" jao-select-pdf) ("D" "open to doc" jao-open-doc)] - ["Packages" - ("a" "aptitude" jao-term-aptitude) - ("l" "packages" jao-list-packages)] ["Monitors" ("p" "htop" jao-term-htop) ("v" "vpn status" jao-mullvad-status) ("m" "set tmr" tmr) - ;; ("X" "toggle xmobar" xmobar-mode :if jao-exwm-enabled-p) + ("x" "restart i3bar" jao-river-restart-i3bar :if jao-river-enabled-p) ("x" "restart xmobar" xmobar-restart :if jao-exwm-enabled-p) ("x" "kill xmobar" jao-xmobar-kill :if jao-xmonad-enabled-p)] ["Network" |