ryuslash/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: ryuslash:8e2f5eed4a253b313d7503790ecc6450e8dcfd15
Branches Tags
ryuslash:master
..
compare: ryuslash:af77f610b6733906e349d0c72397a919a950c088
Branches Tags
ryuslash:master

No commits in common. "8e2f5eed4a253b313d7503790ecc6450e8dcfd15" and "af77f610b6733906e349d0c72397a919a950c088" have entirely different histories.
8e2f5eed4a ... af77f610b6

15 changed files with 58 additions and 130 deletions
Show stats Expand all files Collapse all files

2
oni/gexp.scm
View file

@ -12,7 +12,7 @@ executable bit set. TEXT is a sequence of strings and file-like objects, as in:
(define build (define build
(let ((text (if guile (drop text 2) text))) (let ((text (if guile (drop text 2) text)))
(gexp (call-with-output-file (ungexp output "out") (gexp (call-with-output-file (ungexp output "out")
(λ (port) (lambda (port)
(set-port-encoding! port "UTF-8") (set-port-encoding! port "UTF-8")
(display (string-append (ungexp-splicing text)) port) (display (string-append (ungexp-splicing text)) port)
(chmod port #o555)))))) (chmod port #o555))))))

1
oni/home/config/common.scm
View file

@ -93,7 +93,6 @@
"alias hc=herbstclient\n" "alias hc=herbstclient\n"
"setopt SHARE_HISTORY\n" "setopt SHARE_HISTORY\n"
"setopt HIST_IGNORE_ALL_DUPS\n" "setopt HIST_IGNORE_ALL_DUPS\n"
"setopt HIST_IGNORE_SPACE\n"
"setopt PROMPT_SUBST\n" "setopt PROMPT_SUBST\n"
"zle -N x-copy-region-as-kill\n" "zle -N x-copy-region-as-kill\n"
"zle -N x-kill-region\n" "zle -N x-kill-region\n"

2
oni/home/services/dunst.scm
View file

@ -218,7 +218,7 @@ horizontal axis.")
(define (home-dunst-config-dunstrc config) (define (home-dunst-config-dunstrc config)
(computed-file "dunstrc" (computed-file "dunstrc"
#~(call-with-output-file #$output #~(call-with-output-file #$output
(λ (port) (lambda (port)
(display #$(serialize-dunst-configuration config) (display #$(serialize-dunst-configuration config)
port))))) port)))))

2
oni/home/services/guile.scm
View file

@ -45,7 +45,7 @@
(define (home-guile-config-file config) (define (home-guile-config-file config)
(computed-file "guile" (computed-file "guile"
#~(call-with-output-file #$output #~(call-with-output-file #$output
(λ (port) (lambda (port)
(display #$(serialize-guile-configuration config) port))))) (display #$(serialize-guile-configuration config) port)))))
(define (home-guile-config-files config) (define (home-guile-config-files config)

21
oni/home/services/herbstluftwm.scm
View file

@ -55,7 +55,7 @@
(define (build-keybindings bindings) (define (build-keybindings bindings)
(append (append
(list "herbstclient keyunbind --all\n") (list "herbstclient keyunbind --all\n")
(map (λ (binding) (map (lambda (binding)
(format #f "herbstclient keybind ~a ~a\n" (format #f "herbstclient keybind ~a ~a\n"
(kbd (car binding)) (cdr binding))) (kbd (car binding)) (cdr binding)))
bindings))) bindings)))
@ -70,16 +70,18 @@
(home-herbstluftwm-configuration-key-bindings config)) (home-herbstluftwm-configuration-key-bindings config))
(list "herbstclient mouseunbind --all\n") (list "herbstclient mouseunbind --all\n")
(map (λ (binding) (map (lambda (binding)
(format #f "herbstclient mousebind ~a ~a\n" (format #f "herbstclient mousebind ~a ~a\n"
(kbd (car binding)) (cdr binding))) (kbd (car binding)) (cdr binding)))
(home-herbstluftwm-configuration-mouse-bindings config)) (home-herbstluftwm-configuration-mouse-bindings config))
(map (λ (setting) (map (lambda (setting)
(format #f "herbstclient set ~s ~s\n" (format #f "herbstclient set ~s ~s\n"
(car setting) (cdr setting))) (car setting) (cdr setting)))
(home-herbstluftwm-configuration-settings config)) (home-herbstluftwm-configuration-settings config))
(map (λ (tag) (format #f "herbstclient add ~s\n" tag)) tags) (map (lambda (tag)
(map (λ (key tag) (format #f "herbstclient add ~s\n" tag))
tags)
(map (lambda (key tag)
(format #f "herbstclient keybind Mod4-~a use ~s\n" key tag)) (format #f "herbstclient keybind Mod4-~a use ~s\n" key tag))
(take (home-herbstluftwm-configuration-tag-keys config) (take (home-herbstluftwm-configuration-tag-keys config)
(length tags)) (length tags))
@ -87,25 +89,26 @@
(if (> (length tags) 0) (if (> (length tags) 0)
(list (format #f "herbstclient use ~s\nherbstclient merge_tag default ~s\n" (car tags) (car tags))) (list (format #f "herbstclient use ~s\nherbstclient merge_tag default ~s\n" (car tags) (car tags)))
'()) '())
(map (λ (attribute-pair) (map (lambda (attribute-pair)
(format #f "herbstclient attr ~a ~s\n" (format #f "herbstclient attr ~a ~s\n"
(string-join (map symbol->string (car attribute-pair)) ".") (string-join (map symbol->string (car attribute-pair)) ".")
(cdr attribute-pair))) (cdr attribute-pair)))
(home-herbstluftwm-configuration-attributes config)) (home-herbstluftwm-configuration-attributes config))
(list "herbstclient unrule -F\n") (list "herbstclient unrule -F\n")
(map (λ (rule) (map (lambda (rule)
(format #f "herbstclient rule ~a\n" (format #f "herbstclient rule ~a\n"
(string-join rule " "))) (string-join rule " ")))
(home-herbstluftwm-configuration-rules config)) (home-herbstluftwm-configuration-rules config))
(list "herbstclient unlock\n" (list "herbstclient unlock\n"
(format #f "herbstclient pad ~a\n" (format #f "herbstclient pad ~a\n"
(string-join (map number->string (home-herbstluftwm-configuration-padding config)) " "))) (string-join (map number->string (home-herbstluftwm-configuration-padding config)) " ")))
(map (λ (layout-pair) (map (lambda (layout-pair)
(format #f "herbstclient load ~s '~s'\n" (format #f "herbstclient load ~s '~s'\n"
(car layout-pair) (car layout-pair)
(cdr layout-pair))) (cdr layout-pair)))
(home-herbstluftwm-configuration-layouts config)) (home-herbstluftwm-configuration-layouts config))
(map (λ (line) (format #f "herbstclient ~a\n" line)) (map (lambda (line)
(format #f "herbstclient ~a\n" line))
(home-herbstluftwm-configuration-extra config)))))) (home-herbstluftwm-configuration-extra config))))))
(define (add-herbstluftwm-executable config) (define (add-herbstluftwm-executable config)

2
oni/home/services/mpd.scm
View file

@ -52,7 +52,7 @@
(define (home-mpd-audio-output-list? value) (define (home-mpd-audio-output-list? value)
(and (list? value) (and (list? value)
(every (λ (v) (is-a? v <home-mpd-audio-output>)) value))) (every (lambda (v) (is-a? v <home-mpd-audio-output>)) value)))
(define-maybe string) (define-maybe string)
(define-maybe home-mpd-audio-output-list) (define-maybe home-mpd-audio-output-list)

8
oni/home/services/picom.scm
View file

@ -34,7 +34,7 @@
(symbol->string field) (symbol->string field)
": {\n" ": {\n"
(apply string-append (apply string-append
(map (λ (type) (map (lambda (type)
(string-append (string-append
" " " "
(symbol->string (car type)) (symbol->string (car type))
@ -44,7 +44,7 @@
(string-append (string-append
"{ " "{ "
(apply string-append (apply string-append
(map (λ (option) (map (lambda (option)
(string-append (symbol->string (car option)) " = " (if (cdr option) "true" "false"))) (string-append (symbol->string (car option)) " = " (if (cdr option) "true" "false")))
(cdr type))) (cdr type)))
" },")) " },"))
@ -61,7 +61,7 @@
(define (serialize-list field value) (define (serialize-list field value)
(string-append (symbol->string field) " = [\n" (string-append (symbol->string field) " = [\n"
(apply string-append (map (λ (item) (apply string-append (map (lambda (item)
(string-append " \"" item "\",\n")) (string-append " \"" item "\",\n"))
value)) value))
"];\n")) "];\n"))
@ -166,7 +166,7 @@
(computed-file (computed-file
"picom.conf" "picom.conf"
#~(call-with-output-file #$output #~(call-with-output-file #$output
(λ (port) (lambda (port)
(display #$(serialize-configuration config home-picom-configuration-fields) port))))) (display #$(serialize-configuration config home-picom-configuration-fields) port)))))
(define (home-picom-files-service config) (define (home-picom-files-service config)

14
oni/home/services/rofi.scm
View file

@ -95,18 +95,18 @@
"\n}\n"))) "\n}\n")))
(define (format-rofi-theme theme) (define (format-rofi-theme theme)
(let ((keys (map (λ (s) (let ((keys (map (lambda (s)
(if (symbol? s) (if (symbol? s)
(symbol->string s) (symbol->string s)
(object->string s))) (object->string s)))
(butlast theme 1))) (butlast theme 1)))
(values (car (list-tail theme (- (length theme) 1))))) (values (car (list-tail theme (- (length theme) 1)))))
(string-append (string-join keys ", ") (string-append (string-join keys ", ")
" {\n " " {\n "
(string-join (string-join
(map format-rofi-config values) (map format-rofi-config values)
"\n ") "\n ")
"\n}\n"))) "\n}\n")))
(define (serialize-rofi-theme theme) (define (serialize-rofi-theme theme)
(string-join (map format-rofi-theme theme) "\n")) (string-join (map format-rofi-theme theme) "\n"))

15
oni/home/services/stumpwm.scm
View file

@ -2,12 +2,9 @@
#:use-module ((gnu services configuration) #:use-module ((gnu services configuration)
#:select (serialize-package #:select (serialize-package
define-configuration)) define-configuration))
#:use-module ((gnu packages lisp)
#:select (sbcl))
#:use-module ((gnu packages wm) #:use-module ((gnu packages wm)
#:select (stumpwm #:select (stumpwm
stumpish stumpish))
sbcl-stumpwm-swm-gaps))
#:use-module ((gnu home services) #:use-module ((gnu home services)
#:select (service-type #:select (service-type
service-extension service-extension
@ -28,19 +25,13 @@
(package (package
(package stumpwm) (package stumpwm)
"Package to use for setting Stumpwm") "Package to use for setting Stumpwm")
(gaps-package
(package sbcl-stumpwm-swm-gaps)
"Package to use for setting Stumpwm Gaps")
(stumpish-package (stumpish-package
(package stumpish) (package stumpish)
"Package to use for setting Stumpish")) "Package to use for setting Stumpish"))
(define (add-stumpwm-packages config) (define (add-stumpwm-packages config)
(list sbcl (list (home-stumpwm-configuration-package config)
(home-stumpwm-configuration-package config) (home-stumpwm-configuration-stumpish-package config)))
(list stumpwm "lib")
(home-stumpwm-configuration-stumpish-package config)
(home-stumpwm-configuration-gaps-package config)))
(define (home-stumpwm-config-files config) (define (home-stumpwm-config-files config)
`(("stumpwm/config" ,(local-file "stumpwm/config")))) `(("stumpwm/config" ,(local-file "stumpwm/config"))))

65
oni/home/services/stumpwm/config
View file

@ -2,7 +2,6 @@
(in-package :stumpwm-user) (in-package :stumpwm-user)
(require 'swank) (require 'swank)
(require 'swm-gaps)
(set-prefix-key (kbd "s-x")) (set-prefix-key (kbd "s-x"))
@ -77,70 +76,6 @@ after it has been unlocked."
"%d ")) "%d "))
(mode-line) (mode-line)
;;; Redefine this function again because for some reason on my system
;;; `(frame-width ...)' returns a ratio, not an integer, which is not accepted
;;; by `xlib:drawable-width'.
(defun stumpwm::maximize-window (win)
"Redefined gaps aware maximize function."
(multiple-value-bind (x y wx wy width height border stick)
(stumpwm::geometry-hints win)
(let ((ox 0) (oy 0) (ow 0) (oh 0)
(frame (stumpwm::window-frame win)))
(if (swm-gaps::apply-gaps-p win)
(multiple-value-setq (ox oy ow oh) (swm-gaps::gaps-offsets win)))
;; Only do width or height subtraction if result will be positive,
;; otherwise stumpwm will crash. Also, only modify window dimensions
;; if needed (i.e. window at least fills frame minus gap).
(when (and (< ow width)
(>= width (- (frame-width frame) ow)))
(setf width (- width ow)))
(when (and (< oh height)
(>= height (- (frame-height frame) oh)))
(setf height (- height oh)))
(setf x (+ x ox)
y (+ y oy))
;; This is the only place a window's geometry should change
(set-window-geometry win :x wx :y wy :width width :height height :border-width 0)
(xlib:with-state ((window-parent win))
;; FIXME: updating the border doesn't need to be run everytime
;; the window is maximized, but only when the border style or
;; window type changes. The overhead is probably minimal,
;; though.
(setf (xlib:drawable-x (window-parent win)) x
(xlib:drawable-y (window-parent win)) y
(xlib:drawable-border-width (window-parent win)) border)
;; the parent window should stick to the size of the window
;; unless it isn't being maximized to fill the frame.
(if (or stick
(find *window-border-style* '(:tight :none)))
(setf (xlib:drawable-width (window-parent win)) (window-width win)
(xlib:drawable-height (window-parent win)) (window-height win))
(let ((frame (stumpwm::window-frame win)))
(setf (xlib:drawable-width (window-parent win)) (- (round (frame-width frame))
(* 2 (xlib:drawable-border-width (window-parent win)))
ow)
(xlib:drawable-height (window-parent win)) (- (stumpwm::frame-display-height (window-group win) frame)
(* 2 (xlib:drawable-border-width (window-parent win)))
oh))))
;; update the "extents"
(xlib:change-property (window-xwin win) :_NET_FRAME_EXTENTS
(list wx
(- (xlib:drawable-width (window-parent win)) width wx)
wy
(- (xlib:drawable-height (window-parent win)) height wy))
:cardinal 32))
(update-configuration win))))
(setf swm-gaps:*head-gaps-size* 0)
(setf swm-gaps:*inner-gaps-size* 15)
(setf swm-gaps:*outer-gaps-size* 15)
(swm-gaps:toggle-gaps-on)
(restore-from-file "default") (restore-from-file "default")
(define-frame-preference "Default" (define-frame-preference "Default"

2
oni/home/services/unclutter.scm
View file

@ -61,7 +61,7 @@
(if (> (length buttons) 0) (if (> (length buttons) 0)
(list (list
"--ignore-buttons" "--ignore-buttons"
(string-join (map (λ (i) (format #f "~s" i)) buttons) ",")) (string-join (map (lambda (i) (format #f "~s" i)) buttons) ","))
'()))) '())))
#:log-file (format #f "~a/.local/var/log/unclutter.log" (getenv "HOME")))) #:log-file (format #f "~a/.local/var/log/unclutter.log" (getenv "HOME"))))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))

32
oni/home/services/xbindkeys.scm
View file

@ -28,11 +28,11 @@
(define (serialize-keymap parent keymap) (define (serialize-keymap parent keymap)
(string-join (string-join
(let* ((prefixes (filter (λ (pair) (list? (cdr pair))) keymap)) (let* ((prefixes (filter (lambda (pair) (list? (cdr pair))) keymap))
(others (filter (λ (pair) (not (list? (cdr pair)))) keymap)) (others (filter (lambda (pair) (not (list? (cdr pair)))) keymap))
(names (map (λ (_) (gensym)) prefixes))) (names (map (lambda (_) (gensym)) prefixes)))
(append (append
(map (λ (key-pair sym) (map (lambda (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" (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 sym
(serialize-keymap sym (cdr key-pair)) (serialize-keymap sym (cdr key-pair))
@ -40,7 +40,7 @@
parent parent
parent)) parent))
prefixes names) prefixes names)
(map (λ (key-pair) (map (lambda (key-pair)
(let ((key (car key-pair))) (let ((key (car key-pair)))
(format #f " (xbindkey ~s ~s)\n (xbindkey-function '(release ~s) (reset-higher-level-binding ~a))\n" (format #f " (xbindkey ~s ~s)\n (xbindkey-function '(release ~s) (reset-higher-level-binding ~a))\n"
(if (string? key) key `(quote ,key)) (if (string? key) key `(quote ,key))
@ -54,27 +54,27 @@
(apply mixed-text-file (apply mixed-text-file
"xbindkeysrc.scm" "xbindkeysrc.scm"
"(define (reset-higher-level-binding level) (lambda () (ungrab-all-keys) (remove-all-keys) (level) (grab-all-keys)))\n" "(define (reset-higher-level-binding level) (lambda () (ungrab-all-keys) (remove-all-keys) (level) (grab-all-keys)))\n"
(let* ((prefixes (filter (λ (pair) (list? (cdr pair))) (let* ((prefixes (filter (lambda (pair) (list? (cdr pair)))
(home-xbindkeys-configuration-keybindings config))) (home-xbindkeys-configuration-keybindings config)))
(others (filter (λ (pair) (not (list? (cdr pair)))) (others (filter (lambda (pair) (not (list? (cdr pair))))
(home-xbindkeys-configuration-keybindings config))) (home-xbindkeys-configuration-keybindings config)))
(names (map (λ (_) (gensym)) prefixes))) (names (map (lambda (_) (gensym)) prefixes)))
(append (append
(map (λ (key-pair sym) (map (lambda (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" (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 sym
(serialize-keymap "first-binding" (cdr key-pair)) (serialize-keymap "first-binding" (cdr key-pair))
'first-binding 'first-binding
'first-binding 'first-binding
'first-binding)) 'first-binding))
prefixes names) prefixes names)
(list "(define (first-binding)\n" (list "(define (first-binding)\n"
" \"Top-level bindings\"\n") " \"Top-level bindings\"\n")
(map (λ (key-pair sym) (map (lambda (key-pair sym)
(let ((key (car key-pair))) (let ((key (car key-pair)))
(format #f "(xbindkey-function ~s ~s)\n" (if (string? key) key `(quote ,key)) sym))) (format #f "(xbindkey-function ~s ~s)\n" (if (string? key) key `(quote ,key)) sym)))
prefixes names) prefixes names)
(map (λ (key-pair) (map (lambda (key-pair)
(format #f " (xbindkey (quote ~s) ~s) \n" (car key-pair) (cdr key-pair))) (format #f " (xbindkey (quote ~s) ~s) \n" (car key-pair) (cdr key-pair)))
others) others)
(list " )\n" (list " )\n"

2
oni/kbd.scm
View file

@ -21,7 +21,7 @@
(define (kbd str) (define (kbd str)
(let ((parts (string-split str #\-))) (let ((parts (string-split str #\-)))
(string-join (string-join
(fold-right (λ (key previous) (fold-right (lambda (key previous)
(if (null? previous) (if (null? previous)
(list (convert-key key)) (list (convert-key key))
(cons (convert-modifier key) previous))) (cons (convert-modifier key) previous)))

18
oni/packages/emacs-config.scm
View file

@ -11,7 +11,7 @@
#:use-module (oni packages go)) #:use-module (oni packages go))
(define-public emacs-oni-config (define-public emacs-oni-config
(let ((commit "dddc309e9e775069ae09de320668bb3ec8667745") (let ((commit "4ab9d3c4b3c7ff057b68cc45e39730a406a37612")
(revision "0")) (revision "0"))
(package (package
(name "emacs-oni-config") (name "emacs-oni-config")
@ -24,7 +24,7 @@
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0cr05brmjp4fjxmj420613ja6gd8m9jkh32f2vl825d0kn5d0yr6")))) (base32 "0ipzspx4kkry8gi534yd62qq8506s9phvymw4m719mm4l2wi3mq6"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://code.ryuslash.org/ryuslash/emacs-config") (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
(synopsis "My Emacs configuration") (synopsis "My Emacs configuration")
@ -290,7 +290,8 @@ Emacs")))
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir-oni-bats (add-after 'unpack 'chdir-oni-bats
(λ _ (chdir "oni-bats")))) (lambda _
(chdir "oni-bats"))))
#:include '("\\.el$" "^snippets\\/bats-mode\\/"))) #:include '("\\.el$" "^snippets\\/bats-mode\\/")))
(propagated-inputs (propagated-inputs
`(("emacs-bats" ,emacs-bats) `(("emacs-bats" ,emacs-bats)
@ -308,7 +309,8 @@ Emacs")))
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir-oni-org (add-after 'unpack 'chdir-oni-org
(λ _ (chdir "oni-org")))) (lambda _
(chdir "oni-org"))))
#:include '("\\.el$" #:include '("\\.el$"
"^snippets\\/org-mode\\/" "^snippets\\/org-mode\\/"
"^capture-templates\\/" "^capture-templates\\/"
@ -456,7 +458,7 @@ Emacs")))
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir-oni-conf (add-after 'unpack 'chdir-oni-conf
(λ _ (chdir "oni-conf")))) (lambda _ (chdir "oni-conf"))))
#:include '("\\.el$" #:include '("\\.el$"
"^snippets\\/conf-mode\\/"))) "^snippets\\/conf-mode\\/")))
(propagated-inputs (propagated-inputs
@ -496,7 +498,7 @@ Emacs")))
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir-oni-csharp (add-after 'unpack 'chdir-oni-csharp
(λ _ (chdir "oni-csharp")))) (lambda _ (chdir "oni-csharp"))))
#:include '("\\.el$" "^snippets\\/"))) #:include '("\\.el$" "^snippets\\/")))
(propagated-inputs (propagated-inputs
`(("emacs-csharp-mode" ,emacs-csharp-mode) `(("emacs-csharp-mode" ,emacs-csharp-mode)
@ -517,7 +519,7 @@ Emacs")))
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir-oni-css (add-after 'unpack 'chdir-oni-css
(λ _ (chdir "oni-css")))) (lambda _ (chdir "oni-css"))))
#:include '("\\.el$" "^snippets\\/"))) #:include '("\\.el$" "^snippets\\/")))
(propagated-inputs (propagated-inputs
`(("emacs-oni-company" ,emacs-oni-company) `(("emacs-oni-company" ,emacs-oni-company)
@ -546,7 +548,7 @@ Emacs")))
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir-oni-elisp (add-after 'unpack 'chdir-oni-elisp
(λ _ (chdir "oni-elisp")))) (lambda _ (chdir "oni-elisp"))))
#:include '("\\.el$" "^snippets\\/"))) #:include '("\\.el$" "^snippets\\/")))
(propagated-inputs (propagated-inputs
`(("emacs-oni-company" ,emacs-oni-company) `(("emacs-oni-company" ,emacs-oni-company)

2
surfingkeys/surfingkeys.js
View file

@ -25,7 +25,6 @@ api.map('r', 'D');
api.map('c0', 'yy'); api.map('c0', 'yy');
api.map('<Alt-p>', 'E'); api.map('<Alt-p>', 'E');
api.map('<Alt-n>', 'R'); api.map('<Alt-n>', 'R');
api.map('<Ctrl-u>f', 'af');
api.unmap('h'); api.unmap('h');
api.unmap('j'); api.unmap('j');
@ -35,7 +34,6 @@ api.unmap('D');
api.unmap('yy'); api.unmap('yy');
api.unmap('E'); api.unmap('E');
api.unmap('R'); api.unmap('R');
api.unmap('af');
api.map('<Ctrl-v>', 'P'); api.map('<Ctrl-v>', 'P');
api.map('<Alt-v>', 'U'); api.map('<Alt-v>', 'U');