|
diff --git a/.gitignore b/.gitignore
index 583f27f..d6530b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,4 +49,7 @@ emacs/%backup%
emacs/tree-sitter
emacs/org-roam.db
emacs/projects
-emacs/tramp
\ No newline at end of file
+emacs/straight
+emacs/tramp
+bin/rivercarro\n
+bin/rivercarro
diff --git a/emacs/init.el b/emacs/init.el
index 4ca0680..47a11d1 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -89,7 +89,35 @@ If the new path's directories does not exist, create them."
(setopt use-short-answers t)
(add-to-list 'load-path "~/.emacs.d/elisp/")
-(add-to-list 'exec-path "~/.local/share/asdf/shims/")
+
+;; straight.el bootstrap
+(defvar bootstrap-version)
+(let ((bootstrap-file
+ (expand-file-name
+ "straight/repos/straight.el/bootstrap.el"
+ (or (bound-and-true-p straight-base-dir)
+ user-emacs-directory)))
+ (bootstrap-version 7))
+ (unless (file-exists-p bootstrap-file)
+ (with-current-buffer
+ (url-retrieve-synchronously
+ "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
+ 'silent 'inhibit-cookies)
+ (goto-char (point-max))
+ (eval-print-last-sexp)))
+ (load bootstrap-file nil 'nomessage))
+(straight-use-package 'use-package)
+(setopt straight-use-package-by-default t)
+
+(use-package asdf
+ :straight (asdf
+ :type git
+ :host github
+ :repo "tabfugnic/asdf.el")
+ :config
+ (setopt asdf-path (concat (getenv "HOME") "/.local/share/asdf/shims"))
+ (setopt asdf-binary "/opt/asdf-vm/bin/asdf")
+ (asdf-enable))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
@@ -103,7 +131,6 @@ If the new path's directories does not exist, create them."
;; which-key: shows a popup of available keybindings when typing a long key
;; sequence (e.g. C-x ...)
(use-package which-key
- :ensure t
:config
(which-key-mode))
@@ -186,6 +213,8 @@ If the new path's directories does not exist, create them."
;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-package dracula-theme)
+
(defun pinoinha/set-face ()
(set-face-attribute 'default nil :font (font-spec :family "Iosevka Nerd Font" :weight 'normal :size 18))
(load-theme 'dracula t))
@@ -227,8 +256,8 @@ If the new path's directories does not exist, create them."
(after-init . recentf-mode))
(use-package org
+ :straight nil
:hook ((org-mode . visual-line-mode))
-
:bind (:map global-map
("C-c l s" . org-store-link)
("C-c l i" . org-insert-link-global))
@@ -243,7 +272,6 @@ If the new path's directories does not exist, create them."
(setq org-export-with-smart-quotes t))
(use-package org-bullets
- :ensure t
:hook
(org-mode . org-bullets-mode))
@@ -256,7 +284,6 @@ If the new path's directories does not exist, create them."
;; Consult: Misc. enhanced commands
(use-package consult
- :ensure t
:bind (
;; Drop-in replacements
("C-c M-x" . consult-mode-command)
@@ -277,7 +304,6 @@ If the new path's directories does not exist, create them."
(setq consult-narrow-key "<"))
(use-package embark
- :ensure t
:demand t
:after avy
:bind (("C-c a" . embark-act)) ; bind this to an easy key to hit
@@ -295,29 +321,28 @@ If the new path's directories does not exist, create them."
;; candidate you select
(setf (alist-get ?. avy-dispatch-alist) 'bedrock/avy-action-embark))
-(use-package embark-consult
- :ensure t)
+(use-package embark-consult)
;; Vertico: better vertical completion for minibuffer commands
(use-package vertico
- :ensure t
+ :straight (:files (:defaults "extensions/*"))
:init
(vertico-mode))
(use-package vertico-directory
+ :straight nil
:after vertico
:bind (:map vertico-map
("M-DEL" . vertico-directory-delete-word)))
;; Marginalia: annotations for minibuffer
(use-package marginalia
- :ensure t
:config
(marginalia-mode))
;; Popup completion-at-point
(use-package corfu
- :ensure t
+ :straight (:files (:defaults "extensions/*"))
:init
(global-corfu-mode)
:bind
@@ -328,6 +353,7 @@ If the new path's directories does not exist, create them."
;; Part of corfu
(use-package corfu-popupinfo
+ :straight nil
:after corfu
:hook (corfu-mode . corfu-popupinfo-mode)
:custom
@@ -339,14 +365,12 @@ If the new path's directories does not exist, create them."
;; Make corfu popup come up in terminal overlay
(use-package corfu-terminal
:if (not (display-graphic-p))
- :ensure t
:config
(corfu-terminal-mode))
;; Fancy completion-at-point functions; there's too much in the cape package to
;; configure here; dive in when you're comfortable!
(use-package cape
- :ensure t
:init
(add-to-list 'completion-at-point-functions #'cape-dabbrev)
(add-to-list 'completion-at-point-functions #'cape-file))
@@ -354,26 +378,22 @@ If the new path's directories does not exist, create them."
;; Pretty icons for corfu
(use-package kind-icon
:if (display-graphic-p)
- :ensure t
:after corfu
:config
(add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
;; Orderless: powerful completion style
(use-package orderless
- :ensure t
:config
(setq completion-styles '(orderless)))
;; Modify search results en masse
(use-package wgrep
- :ensure t
:config
(setq wgrep-auto-save-buffer t))
(use-package eglot
- ;; no :ensure t here because it's built-in
-
+ :straight nil
;; Configure hooks to automatically turn-on eglot for selected modes
:hook
(rust-ts-mode . eglot-ensure)
@@ -390,20 +410,24 @@ If the new path's directories does not exist, create them."
)
(use-package treesit-auto
+ :straight
+ '(treesit-auto
+ :type git
+ :host github
+ :repo "renzmann/treesit-auto"
+ :build (:not autoloads)
+ :build (:not compile))
:custom
(treesit-auto-install 'prompt)
- :ensure t
:config
(treesit-auto-add-to-auto-mode-alist 'all)
(global-treesit-auto-mode))
;; Magit: best Git client to ever exist
(use-package magit
- :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))
@@ -411,11 +435,9 @@ If the new path's directories does not exist, create them."
(use-package markdown-mode
:hook ((markdown-mode . visual-line-mode)))
-(use-package yaml-mode
- :ensure t)
+(use-package yaml-mode)
-(use-package json-mode
- :ensure t)
+(use-package json-mode)
(defun set-exec-path-from-shell-PATH ()
"Set up Emacs' `exec-path' and PATH environment variable to match
@@ -438,16 +460,13 @@ apps are not started from a shell."
(find-file (concat "/sudo::" filename)))
(use-package avy
- :ensure t
:demand t
:init
(setq avy-timeout-seconds 1.0)
:bind (("C-;" . avy-goto-char-timer)))
-(use-package dracula-theme :ensure t)
-
(use-package vterm
- :ensure t
+ :load-path "~/.emacs.d/straight/repos/emacs-libvterm"
:commands vterm
:config
(setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *")
@@ -455,17 +474,16 @@ apps are not started from a shell."
(setq vterm-max-scrollback 10000))
(use-package vterm-toggle
- :ensure t
:after vterm)
(use-package smartparens-mode
+ :straight nil
:ensure smartparens
:hook (prog-mode text-mode markdown-mode org-mode)
:config
(require 'smartparens-config))
(use-package meow
- :ensure t
:init
(defun meow-setup ()
(setopt meow-use-clipboard t)
@@ -517,8 +535,8 @@ apps are not started from a shell."
'("N" . meow-left-expand)
'("I" . meow-right-expand)
- '("x" . meow-back-word)
- '("X" . meow-back-symbol)
+ '("j" . meow-back-word)
+ '("J" . meow-back-symbol)
'("u" . meow-next-word)
'("U" . meow-next-symbol)
@@ -538,7 +556,7 @@ apps are not started from a shell."
'("Ç" . meow-pop-selection)
'("v" . meow-till)
- '("j" . meow-find)
+ '("x" . meow-find)
'("/" . meow-beginning-of-thing)
'("," . meow-end-of-thing)
@@ -592,14 +610,19 @@ apps are not started from a shell."
'("ff" . find-file)
'("fs" . sudo-find-file)
- '("fr" . recentf-open))))
+ '("fr" . recentf-open)
+
+ '("dd" . dired))))
:config
(meow-setup)
(meow-global-mode 1))
-(use-package fish-mode
- :ensure t)
+(use-package fish-mode)
+
+(use-package powerline
+ :config
+ (powerline-default-theme))
(custom-set-variables
;; custom-set-variables was added by Custom.
@@ -610,7 +633,7 @@ apps are not started from a shell."
'(custom-safe-themes
'("603a831e0f2e466480cdc633ba37a0b1ae3c3e9a4e90183833bc4def3421a961" default))
'(package-selected-packages
- '(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)))
+ '(asdf powerline 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/kanata/akko.kbd b/kanata/akko.kbd
index b98e46c..3e545cc 100644
--- a/kanata/akko.kbd
+++ b/kanata/akko.kbd
@@ -18,7 +18,7 @@
p (chord chords p)
k (chord chords k)
z (chord chords z)
- x (chord chords x)
+ j (chord chords j)
o (chord chords o)
u (chord chords u)
@@ -43,7 +43,6 @@
can (layer-switch canary)
nav (layer-while-held nav)
num (layer-while-held num)
- mods (layer-while-held mods)
lmet (one-shot-release 1000 lmet)
lalt (one-shot-release 1000 lalt)
@@ -51,7 +50,7 @@
lctl (one-shot-release 1000 lctl)
c (tap-hold-press 150 150 c @nav)
- spc (tap-hold-press 150 150 spc @mods)
+ a (tap-hold-press 150 150 a @num)
;; mouse
mous (layer-switch mouse)
@@ -72,7 +71,7 @@
(p ) p
(k ) k
(z ) z
- (x ) x
+ (j ) j
(o ) o
(u ) u
@@ -110,12 +109,12 @@
(p t) S-4
(k b) S-5
(r v) grv
- (s g) \
+ (s g) S-1
(t d) =
(b q) S-grv
;; combos laterais - lado direito
- (x o) bspc
+ (j o) bspc
(o u) del
(n e) S-9
(e i) S-0
@@ -124,7 +123,7 @@
;; combos verticais - lado direito
(z f) S-6
- (x n) +
+ (j n) +
(o e) S-8
(u i) S-7
(f m) S--
@@ -143,10 +142,10 @@
;; https://github.com/Apsu/Canary
(deflayer canary
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 bspc grv
- tab w @l @y @p @k @z @x @o @u ; [ ] \
- caps @c @r @s @t @b @f @n @e @i a ' ret
- lsft j @v @g @d @q @m @h @/ @, . rsft
- @num lmet @mous @spc ralt rctl
+ tab w @l @y @p @k @z @j @o @u ; [ ] \
+ caps @c @r @s @t @b @f @n @e @i @a ' ret
+ lsft x @v @g @d @q @m @h @/ @, . rsft
+ lctl lmet @mous spc ralt rctl
)
(deflayer empty
@@ -165,21 +164,29 @@
_ _ _ _ _ _
)
+;; (deflayer num
+;; _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+;; _ _ _ _ _ _ _ 7 8 9 _ _ _ _
+;; _ _ @lalt @lctl @lsft _ _ 4 5 6 _ _ _
+;; _ _ _ _ @lmet _ 0 1 2 3 _ _
+;; _ _ _ _ _ _
+;; )
+
(deflayer num
- _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
- _ _ _ _ _ _ _ 7 8 9 _ _ _ _
- _ _ @lalt @lctl @lsft _ _ 4 5 6 _ _ _
- _ _ _ _ @lmet _ 0 1 2 3 _ _
- _ _ _ _ _ _
+ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ _ _ 9 8 7 _ _ _ _ _ _ _ _ _
+ _ _ 6 5 4 _ _ @lsft @lctl @lalt _ _ _
+ _ _ 3 2 1 0 _ @lmet _ _ _ _
+ _ _ _ _ _ _
)
-(deflayer mods
- _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
- _ _ _ _ _ _ _ _ _ _ _ _ _ _
- _ _ @lalt @lctl @lsft _ _ @lsft @lctl @lalt _ _ _
- _ _ _ _ @lmet _ _ @lmet _ _ _ _
- _ _ _ _ _ _
-)
+;; (deflayer mods
+;; _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+;; _ _ _ _ _ _ _ _ _ _ _ _ _ _
+;; _ _ @lalt @lctl @lsft _ _ @lsft @lctl @lalt _ _ _
+;; _ _ _ _ @lmet _ _ @lmet _ _ _ _
+;; _ _ _ _ _ _
+;; )
(deflayer mouse
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|