mirror of
https://github.com/ebeem/guile-swayer.git
synced 2024-12-27 21:59:13 +01:00
fix general commander path
This commit is contained in:
parent
d6718c0f06
commit
5159d1e45a
2 changed files with 15 additions and 5 deletions
|
@ -17,9 +17,8 @@
|
||||||
(define (keybindings-init)
|
(define (keybindings-init)
|
||||||
(kbd-init)
|
(kbd-init)
|
||||||
|
|
||||||
;; (configure-sway-keybinding-translator custom-sway-keybinding-translator)
|
|
||||||
(define general-module (resolve-module '(modules general)))
|
|
||||||
(configure-sway-keybinding-translator custom-sway-keybinding-translator)
|
(configure-sway-keybinding-translator custom-sway-keybinding-translator)
|
||||||
|
(configure-sway-commander-path "~/.config/sway/commander")
|
||||||
|
|
||||||
;; define root keybindings
|
;; define root keybindings
|
||||||
(sway-define-keys
|
(sway-define-keys
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
#:use-module (srfi srfi-18)
|
#:use-module (srfi srfi-18)
|
||||||
#:use-module (ice-9 hash-table)
|
#:use-module (ice-9 hash-table)
|
||||||
#:export (sway-keybinding-translator
|
#:export (sway-keybinding-translator
|
||||||
|
sway-commander-path
|
||||||
|
configure-sway-commander-path
|
||||||
configure-sway-keybinding-translator
|
configure-sway-keybinding-translator
|
||||||
sway-define-keys
|
sway-define-keys
|
||||||
sway-define-key
|
sway-define-key
|
||||||
|
@ -27,9 +29,17 @@
|
||||||
like key chords. The default implementation doesn't modify passed keybindings"
|
like key chords. The default implementation doesn't modify passed keybindings"
|
||||||
key)
|
key)
|
||||||
|
|
||||||
|
(define sway-commander-path
|
||||||
|
(if current-filename
|
||||||
|
(dirname (dirname current-filename))
|
||||||
|
"commander"))
|
||||||
|
|
||||||
(define (configure-sway-keybinding-translator proc)
|
(define (configure-sway-keybinding-translator proc)
|
||||||
(set! sway-keybinding-translator proc))
|
(set! sway-keybinding-translator proc))
|
||||||
|
|
||||||
|
(define (configure-sway-commander-path path)
|
||||||
|
(set! sway-commander-path path))
|
||||||
|
|
||||||
(define (exp->string exp)
|
(define (exp->string exp)
|
||||||
(call-with-output-string (lambda (p)
|
(call-with-output-string (lambda (p)
|
||||||
(write exp p))))
|
(write exp p))))
|
||||||
|
@ -48,7 +58,7 @@
|
||||||
(car (reverse (string-split key #\+))))
|
(car (reverse (string-split key #\+))))
|
||||||
|
|
||||||
(define (sway-command exp-str)
|
(define (sway-command exp-str)
|
||||||
(string-append "exec '" (dirname (dirname (current-filename))) "/commander "
|
(string-append "exec '" sway-commander-path " "
|
||||||
(exp->string exp-str) "'"))
|
(exp->string exp-str) "'"))
|
||||||
|
|
||||||
(define* (define-keybindings chord key exp wk submap)
|
(define* (define-keybindings chord key exp wk submap)
|
||||||
|
@ -97,11 +107,12 @@
|
||||||
|
|
||||||
(map (lambda (arg)
|
(map (lambda (arg)
|
||||||
(when (list? arg)
|
(when (list? arg)
|
||||||
|
|
||||||
(display "ARG: ")
|
(display "ARG: ")
|
||||||
(display arg)
|
(display arg)
|
||||||
(newline)
|
(newline)
|
||||||
(display (car arg))
|
(display (and
|
||||||
|
(symbol? (car arg))
|
||||||
|
(equal? "sway-define-keys" (symbol->string (car arg)))))
|
||||||
(newline)
|
(newline)
|
||||||
(if (and
|
(if (and
|
||||||
(symbol? (car arg))
|
(symbol? (car arg))
|
||||||
|
|
Loading…
Reference in a new issue