diff options
| author | 2024-03-25 17:03:48 +0000 | |
|---|---|---|
| committer | 2024-03-25 17:03:48 +0000 | |
| commit | 59c6ec1c82b8208423fab9edc193c92291372d1d (patch) | |
| tree | 85dba2bc7583260e0f692bb9fe127438595d7f56 | |
| parent | 20568700dd5124ca89e6f723c86132a8e54fbcac (diff) | |
keyd: combos e mods na nav; emacs: mais atalhos
| -rw-r--r-- | emacs/init.el | 56 | ||||
| -rw-r--r-- | keyd/akko.conf | 21 | ||||
| -rw-r--r-- | keyd/ideapad.conf | 135 |
3 files changed, 38 insertions, 174 deletions
diff --git a/emacs/init.el b/emacs/init.el index 4f78dae..cd40e54 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -126,18 +126,10 @@ If the new path's directories does not exist, create them." (setopt completions-detailed t) (setopt completions-format 'one-column) (setopt completions-group t) -(setopt completion-auto-select 'second-tab) ; Much more eager - ;(setopt completion-auto-select t) ; See `C-h v completion-auto-select' for more possible values +(setopt completion-auto-select 'second-tab) (keymap-set minibuffer-mode-map "TAB" 'minibuffer-complete) ; TAB acts more like how it does in the shell -;; For a fancier built-in completion option, try ido-mode, -;; icomplete-vertical, or fido-mode. See also the file extras/base.el - - ;(icomplete-vertical-mode) - ;(fido-vertical-mode) - ;(setopt icomplete-delay-completions-threshold 4000) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; Interface enhancements/defaults @@ -255,18 +247,6 @@ If the new path's directories does not exist, create them." :hook (org-mode . org-bullets-mode)) -(use-package org-roam - :ensure t - :config - (org-roam-db-autosync-mode) - ;; Dedicated side window for backlinks - (add-to-list 'display-buffer-alist - '("\\*org-roam\\*" - (display-buffer-in-side-window) - (side . right) - (window-width . 0.4) - (window-height . fit-window-to-buffer)))) - (setq org-directory "~/notas") (setq org-agenda-files '("agenda.org")) (setopt org-agenda-include-diary t) @@ -274,9 +254,6 @@ If the new path's directories does not exist, create them." ;; Org-refile: where should org-refile look? (setq org-refile-targets 'FIXME) -;; Org-roam variables -(setq org-roam-directory "~/notas") - ;; Consult: Misc. enhanced commands (use-package consult :ensure t @@ -425,6 +402,12 @@ If the new path's directories does not exist, create them." :ensure t :bind (("C-x g" . magit-status))) +(use-package git-gutter + :ensure t + :hook (prog-mode . git-gutter-mode) + :config + (setopt git-gutter:update-interval 1)) + (use-package markdown-mode :hook ((markdown-mode . visual-line-mode))) @@ -542,17 +525,17 @@ apps are not started from a shell." '("b" . meow-join) '("g" . meow-grab) '("G" . meow-pop-grab) - '("k" . meow-swap-grab) - '("K" . meow-sync-grab) + '("p" . meow-swap-grab) + '("P" . meow-sync-grab) '("j" . meow-cancel-selection) '("J" . meow-pop-selection) '("m" . meow-till) '("x" . meow-find) - '("k" . meow-beginning-of-thing) + '("p" . meow-beginning-of-thing) '("." . meow-end-of-thing) - '("K" . meow-inner-of-thing) + '("P" . meow-inner-of-thing) '(">" . meow-bounds-of-thing) '("t" . meow-kill) @@ -576,10 +559,10 @@ apps are not started from a shell." '(";" . indent-rigidly-left-to-tab-stop) '("=" . indent-rigidly-right-to-tab-stop) - '("ps" . meow-comment) - '("pz" . meow-start-kmacro-or-insert-counter) - '("pw" . meow-start-kmacro) - '("pd" . meow-end-or-call-kmacro) + '("ks" . meow-comment) + '("kz" . meow-start-kmacro-or-insert-counter) + '("kw" . meow-start-kmacro) + '("kd" . meow-end-or-call-kmacro) '("is" . save-buffer) '("iS" . save-some-buffers) @@ -588,7 +571,12 @@ apps are not started from a shell." '("<escape>" . ignore) (meow-leader-define-key - '("t" . vterm-toggle-cd)))) + '("t" . vterm-toggle-cd) + '("vs" . magit-status) + '("pb" . project-list-buffers) + '("pp" . project-switch-project) + '("pd" . project-find-dir) + '("pf" . project-find-file)))) :config (meow-setup) @@ -606,7 +594,7 @@ apps are not started from a shell." '(custom-safe-themes '("603a831e0f2e466480cdc633ba37a0b1ae3c3e9a4e90183833bc4def3421a961" default)) '(package-selected-packages - '(vterm-toggle fish-completion fish-mode org-bullets smartparens meow vterm dracula-theme treesit-auto org-roam-ui json-mode yaml-mode magit wgrep orderless kind-icon cape corfu-terminal corfu marginalia vertico embark-consult embark consult avy which-key))) + '(git-gutter vterm-toggle fish-completion fish-mode org-bullets smartparens meow vterm dracula-theme treesit-auto org-roam-ui json-mode yaml-mode magit wgrep orderless kind-icon cape corfu-terminal corfu marginalia vertico embark-consult embark consult avy which-key))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/keyd/akko.conf b/keyd/akko.conf index 04cc441..c808255 100644 --- a/keyd/akko.conf +++ b/keyd/akko.conf @@ -125,16 +125,22 @@ j+l = oneshot(control) j+; = oneshot(alt) m+, = oneshot(meta) -u+i = enter -i+o = backspace -o+p = delete - w+e = esc -e+r = tab +e+r = enter + +u+i = backspace +i+o = delete + +s+d = tab + +z+x = macro(C-c) +x+c = macro(C-v) w+s = [ +e+d = { r+f = ( u+j = ) +i+k = } o+l = ] space = overloadt(nav, space, 150) @@ -143,6 +149,11 @@ space = overloadt(nav, space, 150) / = ? [nav] +a = layer(meta) +s = layer(alt) +d = layer(shift) +f = layer(control) + j = left k = down l = right diff --git a/keyd/ideapad.conf b/keyd/ideapad.conf deleted file mode 100644 index 3612043..0000000 --- a/keyd/ideapad.conf +++ /dev/null @@ -1,135 +0,0 @@ -[ids] -0001:0001 - -[main] -esc = capslock -` = \ -q = w -w = g -e = d -r = f -t = b -y = q -u = l -i = u -o = o -p = y -[ = oneshot(agudo) -] = [ -capslock = esc -a = overloadt(meta, r, 150) -s = overloadt(alt, s, 150) -d = overloadt(shift, t, 150) -f = overloadt(control, h, 150) -g = k -h = j -j = overloadt(control, n, 150) -k = overloadt(shift, e, 150) -l = overloadt(alt, a, 150) -; = overloadt(meta, i, 150) -' = oneshot(til) -\ = ] -102nd = macro(G-, c) -z = overloadt(numbers, c, 200) -x = m -c = p -v = v -b = x -n = z -m = , -, = . -. = ' -/ = / -rightshift = rightshift -space = overloadt(nav, space, 200) -ro = ; - -w+e = esc -s+d = tab - -i+o = backspace -k+l = enter - -[nav] - -j = left -k = down -l = right -i = up - -a = home -s = end - -u = pageup -o = pagedown - -h = delete - -[numbers] -y = 0 -u = 1 -i = 2 -o = 3 -j = 4 -k = 5 -l = 6 -m = 7 -, = 8 -. = 9 -/ = = -; = + -p = - -h = * -n = / - -[shift] -[ = oneshot(grave) -' = oneshot(circunflexo) - -[agudo] -[ = ´ -space = ´ -a = macro(G-´ ) -o = macro(G-´ o) -d = é -f = ú -g = í - -[shift+agudo] -a = Á -s = Ó -d = É -f = Ú -g = Í - -[grave] -[ = ` -space = ` -a = à -d = è - -[shift+grave] -a = À -d = È - -[til] -' = ~ -space = ~ -a = ã -s = õ - -[shift+til] -a = Ã -s = Õ - -[circunflexo] -' = ^ -space = ^ -a = â -s = ô -d = ê - -[shift+circunflexo] -a = Â -s = Ô -d = Ê |
