diff options
author | Tom Willemse | 2022-07-22 21:12:45 -0700 |
---|---|---|
committer | Tom Willemse | 2022-07-22 21:12:45 -0700 |
commit | e8cdf76fbfaa6bd6c79b7a44a22e277c62781c9e (patch) | |
tree | 749343a36b3e08e8fc8acb52b0cae352e8d3067e /oni/home | |
parent | 7957b236de1638fdcc1c9d16780c463defd8f961 (diff) | |
download | new-dotfiles-e8cdf76fbfaa6bd6c79b7a44a22e277c62781c9e.tar.gz new-dotfiles-e8cdf76fbfaa6bd6c79b7a44a22e277c62781c9e.zip |
Move a couple of keybindings to herbstluftwm
Diffstat (limited to 'oni/home')
-rw-r--r-- | oni/home/data/config.scm | 13 | ||||
-rw-r--r-- | oni/home/services/herbstluftwm.scm | 20 |
2 files changed, 24 insertions, 9 deletions
diff --git a/oni/home/data/config.scm b/oni/home/data/config.scm index f54221f..a81bd1e 100644 --- a/oni/home/data/config.scm +++ b/oni/home/data/config.scm @@ -255,9 +255,7 @@ (service home-xbindkeys-service-type (home-xbindkeys-configuration (keybindings - '(((mod4 shift q) . "herbstclient quit") - ((mod4 shift e) . "herbstclient reload") - ((mod4 k) . "hersbtclient close") + '(((mod4 k) . "hersbtclient close") ((mod4 mod1 k) . "herbstclient remove") ((mod4 Return) . "herbstclient spawn kitty") ((mod4 t) . "herbstclient spawn hlwm-run-or-raise \"\\(URxct\\|Hyper\\|kitty\\)\" kitty") @@ -305,10 +303,13 @@ (service home-herbstluftwm-service-type (home-herbstluftwm-configuration (tags '(dev web game)) + (key-bindings + '(("s-S-q" . "quit") + ("s-S-e" . "reload"))) (mouse-bindings - '(("Mod4-Button1" . "move") - ("Mod4-Button2" . "zoom") - ("Mod4-Button3" . "resize"))) + '(("s-Button1" . "move") + ("s-Button2" . "zoom") + ("s-Button3" . "resize"))) (settings '((default_frame_layout . 2) (frame_border_active_color . "#3d3d3d") diff --git a/oni/home/services/herbstluftwm.scm b/oni/home/services/herbstluftwm.scm index caa78df..70aa916 100644 --- a/oni/home/services/herbstluftwm.scm +++ b/oni/home/services/herbstluftwm.scm @@ -8,6 +8,7 @@ #:use-module (guix gexp) #:use-module (oni home services xinit) #:use-module (oni gexp) + #:use-module (oni kbd) #:use-module (srfi srfi-1) #:export (home-herbstluftwm-service-type @@ -17,6 +18,9 @@ (package (package herbstluftwm) "Package use for setting herbstluftwm") + (key-bindings + (alist '()) + "Key bindings") (mouse-bindings (alist '()) "Mouse bindings") @@ -48,17 +52,27 @@ (define (add-herbstluftwm-packages config) (list (home-herbstluftwm-configuration-package config) zsh)) +(define (build-keybindings bindings) + (append + (list "herbstclient keyunbind --all\n") + (map (lambda (binding) + (format #f "herbstclient keybind ~a ~a\n" + (kbd (car binding)) (cdr binding))) + bindings))) + (define (home-herbstluftwm-autostart-file config) (apply mixed-executable-file "autostart" "#!" zsh "/bin/zsh\n" "herbstclient emit_hook reload\n" - "herbstclient keyunbind --all\n" (let ((tags (home-herbstluftwm-configuration-tags config))) - (append (list "herbstclient mouseunbind --all\n") + (append (build-keybindings + (home-herbstluftwm-configuration-key-bindings config)) + + (list "herbstclient mouseunbind --all\n") (map (lambda (binding) (format #f "herbstclient mousebind ~a ~a\n" - (car binding) (cdr binding))) + (kbd (car binding)) (cdr binding))) (home-herbstluftwm-configuration-mouse-bindings config)) (map (lambda (setting) (format #f "herbstclient set ~s ~s\n" |