diff options
| -rw-r--r-- | oni/gexp.scm | 2 | ||||
| -rw-r--r-- | oni/home/services/dunst.scm | 2 | ||||
| -rw-r--r-- | oni/home/services/guile.scm | 2 | ||||
| -rw-r--r-- | oni/home/services/herbstluftwm.scm | 21 | ||||
| -rw-r--r-- | oni/home/services/mpd.scm | 2 | ||||
| -rw-r--r-- | oni/home/services/picom.scm | 8 | ||||
| -rw-r--r-- | oni/home/services/rofi.scm | 14 | ||||
| -rw-r--r-- | oni/home/services/unclutter.scm | 2 | ||||
| -rw-r--r-- | oni/home/services/xbindkeys.scm | 32 | ||||
| -rw-r--r-- | oni/kbd.scm | 2 | ||||
| -rw-r--r-- | oni/packages/emacs-config.scm | 14 |
11 files changed, 48 insertions, 53 deletions
diff --git a/oni/gexp.scm b/oni/gexp.scm index 388c7a2..b0d9258 100644 --- a/oni/gexp.scm +++ b/oni/gexp.scm @@ -12,7 +12,7 @@ executable bit set. TEXT is a sequence of strings and file-like objects, as in: (define build (let ((text (if guile (drop text 2) text))) (gexp (call-with-output-file (ungexp output "out") - (lambda (port) + (λ (port) (set-port-encoding! port "UTF-8") (display (string-append (ungexp-splicing text)) port) (chmod port #o555)))))) diff --git a/oni/home/services/dunst.scm b/oni/home/services/dunst.scm index ae80be4..0f33637 100644 --- a/oni/home/services/dunst.scm +++ b/oni/home/services/dunst.scm @@ -218,7 +218,7 @@ horizontal axis.") (define (home-dunst-config-dunstrc config) (computed-file "dunstrc" #~(call-with-output-file #$output - (lambda (port) + (λ (port) (display #$(serialize-dunst-configuration config) port))))) diff --git a/oni/home/services/guile.scm b/oni/home/services/guile.scm index f6f2580..372741f 100644 --- a/oni/home/services/guile.scm +++ b/oni/home/services/guile.scm @@ -45,7 +45,7 @@ (define (home-guile-config-file config) (computed-file "guile" #~(call-with-output-file #$output - (lambda (port) + (λ (port) (display #$(serialize-guile-configuration config) port))))) (define (home-guile-config-files config) diff --git a/oni/home/services/herbstluftwm.scm b/oni/home/services/herbstluftwm.scm index 70aa916..306e497 100644 --- a/oni/home/services/herbstluftwm.scm +++ b/oni/home/services/herbstluftwm.scm @@ -55,7 +55,7 @@ (define (build-keybindings bindings) (append (list "herbstclient keyunbind --all\n") - (map (lambda (binding) + (map (λ (binding) (format #f "herbstclient keybind ~a ~a\n" (kbd (car binding)) (cdr binding))) bindings))) @@ -70,18 +70,16 @@ (home-herbstluftwm-configuration-key-bindings config)) (list "herbstclient mouseunbind --all\n") - (map (lambda (binding) + (map (λ (binding) (format #f "herbstclient mousebind ~a ~a\n" (kbd (car binding)) (cdr binding))) (home-herbstluftwm-configuration-mouse-bindings config)) - (map (lambda (setting) + (map (λ (setting) (format #f "herbstclient set ~s ~s\n" (car setting) (cdr setting))) (home-herbstluftwm-configuration-settings config)) - (map (lambda (tag) - (format #f "herbstclient add ~s\n" tag)) - tags) - (map (lambda (key tag) + (map (λ (tag) (format #f "herbstclient add ~s\n" tag)) tags) + (map (λ (key tag) (format #f "herbstclient keybind Mod4-~a use ~s\n" key tag)) (take (home-herbstluftwm-configuration-tag-keys config) (length tags)) @@ -89,26 +87,25 @@ (if (> (length tags) 0) (list (format #f "herbstclient use ~s\nherbstclient merge_tag default ~s\n" (car tags) (car tags))) '()) - (map (lambda (attribute-pair) + (map (λ (attribute-pair) (format #f "herbstclient attr ~a ~s\n" (string-join (map symbol->string (car attribute-pair)) ".") (cdr attribute-pair))) (home-herbstluftwm-configuration-attributes config)) (list "herbstclient unrule -F\n") - (map (lambda (rule) + (map (λ (rule) (format #f "herbstclient rule ~a\n" (string-join rule " "))) (home-herbstluftwm-configuration-rules config)) (list "herbstclient unlock\n" (format #f "herbstclient pad ~a\n" (string-join (map number->string (home-herbstluftwm-configuration-padding config)) " "))) - (map (lambda (layout-pair) + (map (λ (layout-pair) (format #f "herbstclient load ~s '~s'\n" (car layout-pair) (cdr layout-pair))) (home-herbstluftwm-configuration-layouts config)) - (map (lambda (line) - (format #f "herbstclient ~a\n" line)) + (map (λ (line) (format #f "herbstclient ~a\n" line)) (home-herbstluftwm-configuration-extra config)))))) (define (add-herbstluftwm-executable config) diff --git a/oni/home/services/mpd.scm b/oni/home/services/mpd.scm index 682d988..b59cb41 100644 --- a/oni/home/services/mpd.scm +++ b/oni/home/services/mpd.scm @@ -52,7 +52,7 @@ (define (home-mpd-audio-output-list? value) (and (list? value) - (every (lambda (v) (is-a? v <home-mpd-audio-output>)) value))) + (every (λ (v) (is-a? v <home-mpd-audio-output>)) value))) (define-maybe string) (define-maybe home-mpd-audio-output-list) diff --git a/oni/home/services/picom.scm b/oni/home/services/picom.scm index 332ad89..723895d 100644 --- a/oni/home/services/picom.scm +++ b/oni/home/services/picom.scm @@ -34,7 +34,7 @@ (symbol->string field) ": {\n" (apply string-append - (map (lambda (type) + (map (λ (type) (string-append " " (symbol->string (car type)) @@ -44,7 +44,7 @@ (string-append "{ " (apply string-append - (map (lambda (option) + (map (λ (option) (string-append (symbol->string (car option)) " = " (if (cdr option) "true" "false"))) (cdr type))) " },")) @@ -61,7 +61,7 @@ (define (serialize-list field value) (string-append (symbol->string field) " = [\n" - (apply string-append (map (lambda (item) + (apply string-append (map (λ (item) (string-append " \"" item "\",\n")) value)) "];\n")) @@ -166,7 +166,7 @@ (computed-file "picom.conf" #~(call-with-output-file #$output - (lambda (port) + (λ (port) (display #$(serialize-configuration config home-picom-configuration-fields) port))))) (define (home-picom-files-service config) diff --git a/oni/home/services/rofi.scm b/oni/home/services/rofi.scm index 2cb85df..b3fa65f 100644 --- a/oni/home/services/rofi.scm +++ b/oni/home/services/rofi.scm @@ -95,18 +95,18 @@ "\n}\n"))) (define (format-rofi-theme theme) - (let ((keys (map (lambda (s) + (let ((keys (map (λ (s) (if (symbol? s) (symbol->string s) (object->string s))) (butlast theme 1))) (values (car (list-tail theme (- (length theme) 1))))) - (string-append (string-join keys ", ") - " {\n " - (string-join - (map format-rofi-config values) - "\n ") - "\n}\n"))) + (string-append (string-join keys ", ") + " {\n " + (string-join + (map format-rofi-config values) + "\n ") + "\n}\n"))) (define (serialize-rofi-theme theme) (string-join (map format-rofi-theme theme) "\n")) diff --git a/oni/home/services/unclutter.scm b/oni/home/services/unclutter.scm index 2230673..ba69d20 100644 --- a/oni/home/services/unclutter.scm +++ b/oni/home/services/unclutter.scm @@ -61,7 +61,7 @@ (if (> (length buttons) 0) (list "--ignore-buttons" - (string-join (map (lambda (i) (format #f "~s" i)) buttons) ",")) + (string-join (map (λ (i) (format #f "~s" i)) buttons) ",")) '()))) #:log-file (format #f "~a/.local/var/log/unclutter.log" (getenv "HOME")))) (stop #~(make-kill-destructor))))) diff --git a/oni/home/services/xbindkeys.scm b/oni/home/services/xbindkeys.scm index f361594..67baad6 100644 --- a/oni/home/services/xbindkeys.scm +++ b/oni/home/services/xbindkeys.scm @@ -28,11 +28,11 @@ (define (serialize-keymap parent keymap) (string-join - (let* ((prefixes (filter (lambda (pair) (list? (cdr pair))) keymap)) - (others (filter (lambda (pair) (not (list? (cdr pair)))) keymap)) - (names (map (lambda (_) (gensym)) prefixes))) + (let* ((prefixes (filter (λ (pair) (list? (cdr pair))) keymap)) + (others (filter (λ (pair) (not (list? (cdr pair)))) keymap)) + (names (map (λ (_) (gensym)) prefixes))) (append - (map (lambda (key-pair sym) + (map (λ (key-pair sym) (format #f " (define (~s)\n (ungrab-all-keys)\n (remove-all-keys)\n ~a\n (xbindkey-function '(control g) (reset-higher-level-binding ~a))\n (xbindkey-function '(Return) (reset-higher-level-binding ~a))\n (xbindkey-function '(Escape) (reset-higher-level-binding ~a))\n (grab-all-keys))\n" sym (serialize-keymap sym (cdr key-pair)) @@ -40,7 +40,7 @@ parent parent)) prefixes names) - (map (lambda (key-pair) + (map (λ (key-pair) (let ((key (car key-pair))) (format #f " (xbindkey ~s ~s)\n (xbindkey-function '(release ~s) (reset-higher-level-binding ~a))\n" (if (string? key) key `(quote ,key)) @@ -54,27 +54,27 @@ (apply mixed-text-file "xbindkeysrc.scm" "(define (reset-higher-level-binding level) (lambda () (ungrab-all-keys) (remove-all-keys) (level) (grab-all-keys)))\n" - (let* ((prefixes (filter (lambda (pair) (list? (cdr pair))) + (let* ((prefixes (filter (λ (pair) (list? (cdr pair))) (home-xbindkeys-configuration-keybindings config))) - (others (filter (lambda (pair) (not (list? (cdr pair)))) + (others (filter (λ (pair) (not (list? (cdr pair)))) (home-xbindkeys-configuration-keybindings config))) - (names (map (lambda (_) (gensym)) prefixes))) + (names (map (λ (_) (gensym)) prefixes))) (append - (map (lambda (key-pair sym) + (map (λ (key-pair sym) (format #f " (define (~s)\n (ungrab-all-keys)\n (remove-all-keys)\n ~a\n (xbindkey-function '(control g) (reset-higher-level-binding ~a))\n (xbindkey-function '(Return) (reset-higher-level-binding ~a))\n (xbindkey-function '(Escape) (reset-higher-level-binding ~a))\n (grab-all-keys))\n" - sym - (serialize-keymap "first-binding" (cdr key-pair)) - 'first-binding - 'first-binding - 'first-binding)) + sym + (serialize-keymap "first-binding" (cdr key-pair)) + 'first-binding + 'first-binding + 'first-binding)) prefixes names) (list "(define (first-binding)\n" " \"Top-level bindings\"\n") - (map (lambda (key-pair sym) + (map (λ (key-pair sym) (let ((key (car key-pair))) (format #f "(xbindkey-function ~s ~s)\n" (if (string? key) key `(quote ,key)) sym))) prefixes names) - (map (lambda (key-pair) + (map (λ (key-pair) (format #f " (xbindkey (quote ~s) ~s) \n" (car key-pair) (cdr key-pair))) others) (list " )\n" diff --git a/oni/kbd.scm b/oni/kbd.scm index eb7f8d7..f6956f4 100644 --- a/oni/kbd.scm +++ b/oni/kbd.scm @@ -21,7 +21,7 @@ (define (kbd str) (let ((parts (string-split str #\-))) (string-join - (fold-right (lambda (key previous) + (fold-right (λ (key previous) (if (null? previous) (list (convert-key key)) (cons (convert-modifier key) previous))) diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm index 1e25de7..f1ddc88 100644 --- a/oni/packages/emacs-config.scm +++ b/oni/packages/emacs-config.scm @@ -290,8 +290,7 @@ Emacs"))) `(#:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-oni-bats - (lambda _ - (chdir "oni-bats")))) + (λ _ (chdir "oni-bats")))) #:include '("\\.el$" "^snippets\\/bats-mode\\/"))) (propagated-inputs `(("emacs-bats" ,emacs-bats) @@ -309,8 +308,7 @@ Emacs"))) `(#:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-oni-org - (lambda _ - (chdir "oni-org")))) + (λ _ (chdir "oni-org")))) #:include '("\\.el$" "^snippets\\/org-mode\\/" "^capture-templates\\/" @@ -458,7 +456,7 @@ Emacs"))) `(#:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-oni-conf - (lambda _ (chdir "oni-conf")))) + (λ _ (chdir "oni-conf")))) #:include '("\\.el$" "^snippets\\/conf-mode\\/"))) (propagated-inputs @@ -498,7 +496,7 @@ Emacs"))) '(#:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-oni-csharp - (lambda _ (chdir "oni-csharp")))) + (λ _ (chdir "oni-csharp")))) #:include '("\\.el$" "^snippets\\/"))) (propagated-inputs `(("emacs-csharp-mode" ,emacs-csharp-mode) @@ -519,7 +517,7 @@ Emacs"))) '(#:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-oni-css - (lambda _ (chdir "oni-css")))) + (λ _ (chdir "oni-css")))) #:include '("\\.el$" "^snippets\\/"))) (propagated-inputs `(("emacs-oni-company" ,emacs-oni-company) @@ -548,7 +546,7 @@ Emacs"))) '(#:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-oni-elisp - (lambda _ (chdir "oni-elisp")))) + (λ _ (chdir "oni-elisp")))) #:include '("\\.el$" "^snippets\\/"))) (propagated-inputs `(("emacs-oni-company" ,emacs-oni-company) |