diff options
| -rw-r--r-- | .config/emacs/init.el | 2 | ||||
| -rw-r--r-- | .config/emacs/libraries/selector.el | 1 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--exwm.el | 5 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--files.el | 4 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--notes.el | 6 | ||||
| -rw-r--r-- | .config/emacs/modules/bd--tabs.el | 2 | ||||
| -rw-r--r-- | .config/emacs/modules/buffer.el | 5 | ||||
| -rw-r--r-- | .config/guix/modules/packages/packages.scm | 3 | ||||
| -rw-r--r-- | .config/guix/modules/services/xorg.scm | 22 | ||||
| -rw-r--r-- | .xkb/keymap/rocket | 7 | ||||
| -rw-r--r-- | .xkb/symbols/rocket | 10 |
11 files changed, 33 insertions, 34 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 9fb8e57..d504562 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -21,7 +21,7 @@ (keymap-global-unset "C-z") (keymap-global-unset "C-x C-z") (keymap-global-set "C-x C-b" #'ibuffer) -(keymap-global-set "H-SPC" #'pop-to-mark-command) +(keymap-global-set "C-c SPC" #'pop-to-mark-command) (setopt warning-minimum-level :error diff --git a/.config/emacs/libraries/selector.el b/.config/emacs/libraries/selector.el index c493fd6..c541572 100644 --- a/.config/emacs/libraries/selector.el +++ b/.config/emacs/libraries/selector.el @@ -47,6 +47,7 @@ (define-key selector-minibuffer-map (kbd "C-g") 'selector-quit) (define-key selector-minibuffer-map (kbd "C-c") 'selector-quit) (define-key selector-minibuffer-map (kbd "<return>") 'selector-do) +(define-key selector-minibuffer-map (kbd "C-m") 'selector-do) (define-key selector-minibuffer-map (kbd "<backtab>") 'selector-previous) (define-key selector-minibuffer-map (kbd "<tab>") 'selector-next) (define-key selector-minibuffer-map (kbd "<up>") 'selector-previous) diff --git a/.config/emacs/modules/bd--exwm.el b/.config/emacs/modules/bd--exwm.el index cb59a8c..39d161e 100644 --- a/.config/emacs/modules/bd--exwm.el +++ b/.config/emacs/modules/bd--exwm.el @@ -64,6 +64,7 @@ that buffer." ([?\C-n] . [down]) ([?\C-a] . [home]) ([?\C-e] . [end]) + ([?\C-m] . [return]) ([?\M-v] . [prior]) ([?\C-v] . [next]) ([?\C-d] . [delete]) @@ -74,9 +75,7 @@ that buffer." ([?\C-r] . [C-S-g]) ([?\M-d] . [C-delete]) ([?\M-b] . [C-left]) - ([?\M-f] . [C-right]) - ([?\H-b] . [M-left]) - ([?\H-f] . [M-right])))) + ([?\M-f] . [C-right])))) (use-package server :defer 1 diff --git a/.config/emacs/modules/bd--files.el b/.config/emacs/modules/bd--files.el index 8eab7ed..a67811d 100644 --- a/.config/emacs/modules/bd--files.el +++ b/.config/emacs/modules/bd--files.el @@ -26,7 +26,7 @@ "Open FILE with QEMU." (let ((options `("qemu-system" nil "qemu-system-x86_64" ,(expand-file-name file) "-net" "nic" "-net""user,hostfwd=tcp:127.0.0.1:2222-:22" - "--accel" "kvm" "-m" "4G"))) + "--accel" "kvm" "-m" "4G"))) (unless (string-match-p "graphic" file) (setq options (append options (list "-nographic")))) (apply 'start-process options))) @@ -67,8 +67,6 @@ (use-package dired :demand t - :bind - (("C-c d" . dired-jump)) :config (setopt dired-listing-switches "-alhLG --time-style=long-iso --group-directories-first" dired-recursive-copies 'always diff --git a/.config/emacs/modules/bd--notes.el b/.config/emacs/modules/bd--notes.el index ee17e38..6e71caa 100644 --- a/.config/emacs/modules/bd--notes.el +++ b/.config/emacs/modules/bd--notes.el @@ -35,9 +35,9 @@ then pastes the active region." :defer 1 :hook ((dired-mode . denote-dired-mode-in-directories)) - :bind (("H-d d" . 'denote) - ("H-d f" . 'denote-open-or-create) - ("H-d j" . 'denote-journal-extras-new-or-existing-entry) + :bind (("C-c d d" . 'denote) + ("C-c d f" . 'denote-open-or-create) + ("C-c j" . 'denote-journal-extras-new-or-existing-entry) :map org-mode-map ("C-c l" . 'denote-link)) :config diff --git a/.config/emacs/modules/bd--tabs.el b/.config/emacs/modules/bd--tabs.el index abc7325..49549f7 100644 --- a/.config/emacs/modules/bd--tabs.el +++ b/.config/emacs/modules/bd--tabs.el @@ -20,8 +20,6 @@ (use-package tab-bar :demand t - :bind (("H-f" . tab-bar-history-forward) - ("H-b" . tab-bar-history-back)) :config (defun bd/get-mode-line-modes (buffer) (with-current-buffer buffer diff --git a/.config/emacs/modules/buffer.el b/.config/emacs/modules/buffer.el index 8a3a674..ea433b0 100644 --- a/.config/emacs/modules/buffer.el +++ b/.config/emacs/modules/buffer.el @@ -12,7 +12,7 @@ (use-package midnight :config - ;; kill forgotten browser windows at midnight + ;; kill forgotten browser windows (push "\.\*\\(LibreWolf\\|Chromium\\|IceCat\\|Tor\sBrowser\\)" clean-buffer-list-kill-regexps) @@ -20,7 +20,8 @@ (push ".*operationnull.com" clean-buffer-list-kill-never-regexps) - (setopt clean-buffer-list-delay-special 1800)) + (setopt clean-buffer-list-delay-special 1800 + midnight-period (* 12 3600))) (provide 'bd--buffer) diff --git a/.config/guix/modules/packages/packages.scm b/.config/guix/modules/packages/packages.scm index 645c000..6922f4c 100644 --- a/.config/guix/modules/packages/packages.scm +++ b/.config/guix/modules/packages/packages.scm @@ -113,13 +113,14 @@ pavucontrol picom pulseaudio + setxkbmap texlive texlive-dvipng xf86-input-libinput xf86-video-fbdev xinit xinput - xmodmap + xkbcomp xorg-server xrandr xrdb diff --git a/.config/guix/modules/services/xorg.scm b/.config/guix/modules/services/xorg.scm index 070a360..c3e585f 100644 --- a/.config/guix/modules/services/xorg.scm +++ b/.config/guix/modules/services/xorg.scm @@ -35,25 +35,7 @@ (list (simple-service 'dotfiles home-files-service-type - `((".Xmodmap" - ,(plain-file "Xmodmap" " -clear lock -clear control -clear mod1 -clear mod2 -clear mod3 -clear mod4 -clear mod5 -keycode 37 = Hyper_L -keycode 66 = Control_L -add control = Control_L Control_R -add mod1 = Alt_L Alt_R Meta_L -add mod2 = Num_Lock -add mod3 = Hyper_L -add mod4 = Super_L Super_R -add mod5 = Mode_switch ISO_Level3_Shift -")) - (".Xresources" + `((".Xresources" ,(plain-file "Xresources" " Nsxiv.window.background: #000000 Nsxiv.window.foreground: #FFFFFF @@ -85,6 +67,8 @@ xset s 600 touchpad-defaults xrandr-toggle xkeyboard-auto & +test -f ~/.xkb/symbols/rocker && + xkbcomp -I$HOME/.xkb ~/.xkb/keymap/rocket $DISPLAY exec emacs -mm")) (".config/gtk-2.0/settings.ini" ,(plain-file "settings.ini" " diff --git a/.xkb/keymap/rocket b/.xkb/keymap/rocket new file mode 100644 index 0000000..528dd72 --- /dev/null +++ b/.xkb/keymap/rocket @@ -0,0 +1,7 @@ +xkb_keymap { + xkb_keycodes { include "evdev+aliases(qwerty)" }; + xkb_types { include "complete" }; + xkb_compat { include "complete" }; + xkb_symbols { include "pc+us+inet(evdev)+rocket(rocket)" }; + xkb_geometry { include "pc(pc105)" }; +}; diff --git a/.xkb/symbols/rocket b/.xkb/symbols/rocket new file mode 100644 index 0000000..92831d8 --- /dev/null +++ b/.xkb/symbols/rocket @@ -0,0 +1,10 @@ +partial modifier_keys +xkb_symbols "rocket" { + key <TAB> {[ BackSpace, Escape, BackSpace, BackSpace ]}; + key <CAPS> {[ space, space, space, nobreakspace ]}; + key <LCTL> {[ Tab, ISO_Left_Tab, Tab, ISO_Left_Tab ]}; + key <BKSL> {[ bar, backslash, bar, backslash ]}; + key <RTRN> {[ space, space, space, nobreakspace ]}; + key <RCTL> {[ Return, Return, Return, Return ]}; + key <SPCE> {[ Control_L, Control_R, Control_L, Control_R ]}; +}; |