+2

.config/emacs/early-init.el

··· 1 1 + ;; early-init.el -*- lexical-binding: t; -*- 1 2 (setq default-frame-alist 2 3 '( 3 4 (background-color . "#1F1F28") 5 5 + (foreground-color . "#DCD7BA") 4 6 (ns-appearance . dark)))

+134 -13

.config/emacs/init.el

··· 2 2 ;;;;;;;;;;; 3 3 ;; UTILS ;; 4 4 ;;;;;;;;;;; 5 5 - (defun conf-dir(path) (concat (expand-file-name user-emacs-directory) path)) 5 5 + (defun conf-dir(&optional path) 6 6 + (expand-file-name (or path "") user-emacs-directory)) 6 7 (defun temp-dir(path) 7 7 - (let ((temp-dir (concat (expand-file-name temporary-file-directory) path))) 8 8 + (let ((temp-dir (expand-file-name path temporary-file-directory))) 8 9 (unless (file-exists-p temp-dir) 9 10 (make-directory temp-dir)) 10 11 temp-dir)) ··· 23 24 (add-to-list 'package-archives 24 25 '("melpa" . "https://melpa.org/packages/") t) 25 26 27 27 + ;;;;;;;;;;;;;; 28 28 + ;; LOAD ENV ;; 29 29 + ;;;;;;;;;;;;;; 30 30 + (setq krg-env-file-name ".env.el") 31 31 + (when window-system 32 32 + (let ((env-file (conf-dir krg-env-file-name))) 33 33 + (when (file-exists-p env-file) 34 34 + (load env-file)))) 35 35 + 36 36 + (defun update-env-file() 37 37 + (interactive) 38 38 + (let ((shell-path (getenv "PATH")) 39 39 + (env-file (conf-dir krg-env-file-name))) 40 40 + (with-temp-buffer 41 41 + (make-local-variable 'make-backup-files) 42 42 + (setq make-backup-files nil) 43 43 + (insert 44 44 + ";;; " krg-env-file-name " -*- lexical-binding: t; -*-\n" 45 45 + ";;; " (current-time-string) " " (nth 1 (current-time-zone)) ".\n" 46 46 + "(setenv \"PATH\" \"" shell-path "\")\n" 47 47 + "(setq exec-path (split-string \"" shell-path "\" \":\"))") 48 48 + (when (file-writable-p env-file) 49 49 + (write-file env-file))))) 50 50 + 26 51 ;;;;;;;;;;;;;;;;;;;; 27 52 ;; BASIC SETTINGS ;; 28 53 ;;;;;;;;;;;;;;;;;;;; 29 29 - (tool-bar-mode -1) 54 54 + (when window-system 55 55 + (tool-bar-mode -1) 56 56 + (scroll-bar-mode -1)) 30 57 (menu-bar-mode -1) 31 31 - (scroll-bar-mode -1) 32 58 (global-display-line-numbers-mode 1) 59 59 + (prefer-coding-system 'utf-8-unix) 33 60 (setq inhibit-splash-screen t) 34 61 (setq initial-scratch-message nil) 35 62 (setq ring-bell-function 'ignore) 36 63 (let ((temp-dir (temp-dir "emacs/"))) 37 64 (setq backup-directory-alist `((".*" . ,temp-dir))) 38 65 (setq auto-save-file-name-transforms `((".*" ,temp-dir t))) 39 39 - (setq lock-file-name-transforms `((".*" ,temp-dir t)))) 66 66 + (setq lock-file-name-transforms `((".*" ,temp-dir t))) 67 67 + (setq desktop-path `(,temp-dir))) 40 68 (setq-default indent-tabs-mode nil) 41 69 (setq-default tab-width 4) 70 70 + (setq-default display-line-numbers-width 4) 71 71 + (setq desktop-restore-frames nil) 72 72 + (setq use-dialog-box nil) 73 73 + (setq use-short-answers t) 74 74 + (setq dabbrev-case-replace nil) 75 75 + (setq read-file-name-completion-ignore-case t) 76 76 + (setq switch-to-prev-buffer-skip-regexp "\\*[^\\*]+\\*") 42 77 (setq c-basic-offset 4) 43 78 (setq scroll-margin 10) 44 79 (setq select-enable-clipboard nil) 80 80 + (setq evil-normal-state-cursor 'hbar) 81 81 + (setq evil-visual-state-cursor 'hbar) 45 82 46 83 ;;;;;;;;;;;;;;;; 47 84 ;; APPEARANCE ;; ··· 54 91 (load-file (conf-dir "kanagawa-theme.el")) 55 92 (load-theme 'kanagawa) 56 93 57 57 - 58 94 ;;;;;;;;;;;;;;;;; 59 95 ;; EVIL CONFIG ;; 60 96 ;;;;;;;;;;;;;;;;; ··· 72 108 (when (not (eql elt (current-buffer))) 73 109 (message "Closing " (buffer-name elt)) 74 110 (kill-buffer elt)))) 111 111 + (defun search-configs() (interactive) (consult-fd (conf-dir) "init.el")) 112 112 + (defun grep-current-word() (interactive) (consult-ripgrep nil (current-word))) 113 113 + (defun save-session() (interactive) (desktop-save (car desktop-path) t)) 114 114 + (defun load-session() (interactive) (desktop-read (car desktop-path))) 75 115 :config 76 116 (evil-mode 1) 77 117 (evil-define-operator yank-to-plus-register (beg end &optional type register yank-handler) ··· 81 121 (interactive "<R><x><y>") 82 122 (evil-yank beg end type ?+ yank-handler)) 83 123 (evil-set-leader '(normal visual replace operator) (kbd "SPC")) 124 124 + (evil-define-key 'insert 'global 125 125 + (kbd "C-v") 'clipboard-yank 126 126 + (kbd "C-a") 'move-beginning-of-line 127 127 + (kbd "C-e") 'move-end-of-line) 84 128 (evil-define-key 'normal 'global 85 129 (kbd "<leader>.") 'find-file 86 86 - (kbd "<leader>bb") 'switch-to-buffer 130 130 + (kbd "<leader>bb") 'evil-switch-to-windows-last-buffer 131 131 + (kbd "<leader>bB") 'switch-to-buffer 87 132 (kbd "<leader>bs") 'consult-buffer 88 133 (kbd "<leader>bB") 'project-switch-to-buffer 89 134 (kbd "<leader>bd") 'kill-current-buffer ··· 97 142 (kbd "<leader>cf") 'format-all-buffer 98 143 (kbd "<leader>cF") 'format-all-region 99 144 (kbd "<leader>sg") 'consult-ripgrep 145 145 + (kbd "<leader>sw") 'grep-current-word 100 146 (kbd "<leader>sf") 'consult-fd 101 147 (kbd "<leader>sb") 'consult-line 102 148 (kbd "<leader>sB") 'consult-line-multi 149 149 + (kbd "<leader>sc") 'search-configs 103 150 (kbd "<leader>p") "\"+p" 104 151 (kbd "<leader>P") "\"+P" 105 152 (kbd "<leader>y") 'yank-to-plus-register ··· 108 155 (kbd "<leader>gr") 'git-gutter:revert-hunk 109 156 (kbd "<leader>gu") 'git-gutter 110 157 (kbd "<leader>mu") 'toggle-frame-maximized 158 158 + (kbd "<leader>qs") 'save-session 159 159 + (kbd "<leader>ql") 'load-session 111 160 (kbd "[c") 'git-gutter:previous-hunk 112 161 (kbd "]c") 'git-gutter:next-hunk 113 162 (kbd "L") 'evil-next-buffer ··· 158 207 (define-key corfu-map (kbd "C-p") 'corfu-previous) 159 208 (define-key corfu-map (kbd "C-l") 'corfu-insert) 160 209 (define-key corfu-map (kbd "C-e") 'corfu-reset)) 210 210 + (use-package corfu-terminal 211 211 + :ensure t 212 212 + :after corfu 213 213 + :init 214 214 + (unless (display-graphic-p) 215 215 + (corfu-terminal-mode +1))) 161 216 (use-package cape 162 217 :ensure t 163 218 :bind ("C-c p" . cape-prefix-map) ··· 169 224 ;;;;;;;;;;;;;;;;;;;; 170 225 ;; LANGUAGE MODES ;; 171 226 ;;;;;;;;;;;;;;;;;;;; 172 172 - (use-package cmake-mode :ensure t) 227 227 + (use-package cmake-mode :ensure t :if (executable-find "cmake")) 173 228 (use-package toml-mode :ensure t) 174 174 - (use-package zig-mode :ensure t) 175 175 - (use-package rust-mode :ensure t) 229 229 + (use-package zig-mode :ensure t :if (executable-find "zig")) 230 230 + (use-package rust-mode :ensure t :if (or (executable-find "cargo") (executable-find "rustc"))) 176 231 (mapc 'load (file-expand-wildcards (conf-dir "local-modes/*.el"))) 177 232 178 233 ··· 189 244 :hook (completion-list-mode . consult-preview-at-point-mode) 190 245 ) 191 246 247 247 + (use-package orderless 248 248 + :ensure t 249 249 + :custom 250 250 + (completion-styles '(orderless basic)) 251 251 + (completion-category-overrides '((file (styles basic partial-completion))))) 252 252 + 192 253 (use-package hl-todo 193 254 :ensure t 194 255 :hook (prog-mode . hl-todo-mode) ··· 204 265 205 266 (use-package git-gutter 206 267 :ensure t 268 268 + :init 269 269 + (setq git-gutter:update-interval 2) 207 270 :config 208 271 (global-git-gutter-mode +1)) 209 272 ··· 213 276 (use-package format-all 214 277 :ensure t 215 278 :after language-id 216 216 - :commands format-all-mode 217 217 - :hook (prog-mode . format-all-mode) 218 218 - :config) 279 279 + :config 280 280 + (define-format-all-formatter gersemi 281 281 + (:executable "gersemi") 282 282 + (:install) 283 283 + (:languages "CMake") 284 284 + (:features) 285 285 + (:format (format-all--buffer-easy executable "-"))) 286 286 + (setq-default format-all-formatters 287 287 + `(("C" (clang-format)) 288 288 + ("C++" (clang-format)) 289 289 + ("Rust" (rustfmt)) 290 290 + ("TOML" (taplo-fmt)) 291 291 + ("CMake" (gersemi)) 292 292 + ("Shell" (shfmt "-i" ,(format "%d" tab-width)))))) 219 293 220 294 221 295 (use-package emacs 296 296 + :hook (kill-emacs . save-session) 222 297 :custom 223 298 (enable-recursive-minibuffers t) 224 299 (tab-always-indent 'complete) 225 300 (read-extended-command-predicate #'command-completion-default-include-p)) 301 301 + 302 302 + ;;;;;;;;;;;;;;;;;;;; 303 303 + ;; PERSIST VALUES ;; 304 304 + ;;;;;;;;;;;;;;;;;;;; 305 305 + 306 306 + (defcustom krg-persist-file-name ".emacs.persist" 307 307 + "Filename for persist-file." 308 308 + :type 'string) 309 309 + (defun krg-persist-file () 310 310 + "Returns expanded path to current persist-file. 311 311 + Filename for the file can be set using ‘krg-persist-file-name'." 312 312 + (conf-dir krg-persist-file-name)) 313 313 + 314 314 + (defun krg-save-persist-file () 315 315 + "Save persist-file on disk at location defined by \\[krg-persist-file]." 316 316 + (let ((frame-left (frame-parameter (selected-frame) 'left)) 317 317 + (frame-top (frame-parameter (selected-frame) 'top)) 318 318 + (frame-width (frame-parameter (selected-frame) 'width)) 319 319 + (frame-height (frame-parameter (selected-frame) 'height)) 320 320 + (persist-file (krg-persist-file))) 321 321 + (with-temp-buffer 322 322 + (make-local-variable 'make-backup-files) 323 323 + (setq make-backup-files nil) 324 324 + (insert 325 325 + ";;; " krg-persist-file-name " -*- lexical-binding: t; -*-\n" 326 326 + ";;; " (current-time-string) " " (nth 1 (current-time-zone)) ".\n" 327 327 + "(setq initial-frame-alist '(\n" 328 328 + (format " (top . %d)\n" (max frame-top 0)) 329 329 + (format " (left . %d)\n" (max frame-left 0)) 330 330 + (format " (width . %d)\n" (max frame-width 0)) 331 331 + (format " (height . %d)))\n" (max frame-height 0))) 332 332 + (when (file-writable-p persist-file) 333 333 + (write-file persist-file))))) 334 334 + 335 335 + (defun krg-load-persist-file () 336 336 + "Load persisted settings from the file location defined by \\[krg-persist-file]." 337 337 + (let ((persist-file (krg-persist-file))) 338 338 + (when (file-readable-p persist-file) 339 339 + (load-file persist-file)))) 340 340 + 341 341 + (when window-system 342 342 + (add-hook 'after-init-hook 'krg-load-persist-file) 343 343 + (add-hook 'kill-emacs-hook 'krg-save-persist-file)) 344 344 + 345 345 + (unless window-system 346 346 + (xterm-mouse-mode +1))

+32

.config/foot/foot.ini

··· 1 1 + [main] 2 2 + font = monospace:size=13 3 3 + dpi-aware = yes 4 4 + pad = 8x4 5 5 + 6 6 + [colors] 7 7 + foreground = dcd7ba 8 8 + background = 1f1f28 9 9 + 10 10 + selection-foreground = c8c093 11 11 + selection-background = 2d4f67 12 12 + 13 13 + regular0 = 090618 14 14 + regular1 = c34043 15 15 + regular2 = 76946a 16 16 + regular3 = c0a36e 17 17 + regular4 = 7e9cd8 18 18 + regular5 = 957fb8 19 19 + regular6 = 6a9589 20 20 + regular7 = c8c093 21 21 + 22 22 + bright0 = 727169 23 23 + bright1 = e82424 24 24 + bright2 = 98bb6c 25 25 + bright3 = e6c384 26 26 + bright4 = 7fb4ca 27 27 + bright5 = 938aa9 28 28 + bright6 = 7aa89f 29 29 + bright7 = dcd7ba 30 30 + 31 31 + 16 = ffa066 32 32 + 17 = ff5d62

+2

.config/ghostty/config

··· 24 24 window-padding-color = extend 25 25 26 26 theme = "Kanagawa Wave" 27 27 + 28 28 + custom-shader = "cursor.glsl"

+111

.config/ghostty/cursor.glsl

··· 1 1 + // Adapted from: https://github.com/KroneCorylus/shader-playground/blob/main/shaders/cursor_smear_fade.glsl 2 2 + 3 3 + float getSdfRectangle(in vec2 p, in vec2 xy, in vec2 b) 4 4 + { 5 5 + vec2 d = abs(p - xy) - b; 6 6 + return length(max(d, 0.0)) + min(max(d.x, d.y), 0.0); 7 7 + } 8 8 + 9 9 + // Based on Inigo Quilez's 2D distance functions article: https://iquilezles.org/articles/distfunctions2d/ 10 10 + // Potencially optimized by eliminating conditionals and loops to enhance performance and reduce branching 11 11 + 12 12 + float seg(in vec2 p, in vec2 a, in vec2 b, inout float s, float d) { 13 13 + vec2 e = b - a; 14 14 + vec2 w = p - a; 15 15 + vec2 proj = a + e * clamp(dot(w, e) / dot(e, e), 0.0, 1.0); 16 16 + float segd = dot(p - proj, p - proj); 17 17 + d = min(d, segd); 18 18 + 19 19 + float c0 = step(0.0, p.y - a.y); 20 20 + float c1 = 1.0 - step(0.0, p.y - b.y); 21 21 + float c2 = 1.0 - step(0.0, e.x * w.y - e.y * w.x); 22 22 + float allCond = c0 * c1 * c2; 23 23 + float noneCond = (1.0 - c0) * (1.0 - c1) * (1.0 - c2); 24 24 + float flip = mix(1.0, -1.0, step(0.5, allCond + noneCond)); 25 25 + s *= flip; 26 26 + return d; 27 27 + } 28 28 + 29 29 + float getSdfParallelogram(in vec2 p, in vec2 v0, in vec2 v1, in vec2 v2, in vec2 v3) { 30 30 + float s = 1.0; 31 31 + float d = dot(p - v0, p - v0); 32 32 + 33 33 + d = seg(p, v0, v3, s, d); 34 34 + d = seg(p, v1, v0, s, d); 35 35 + d = seg(p, v2, v1, s, d); 36 36 + d = seg(p, v3, v2, s, d); 37 37 + 38 38 + return s * sqrt(d); 39 39 + } 40 40 + 41 41 + vec2 normalize(vec2 value, float isPosition) { 42 42 + return (value * 2.0 - (iResolution.xy * isPosition)) / iResolution.y; 43 43 + } 44 44 + 45 45 + float antialising(float distance) { 46 46 + return 1. - smoothstep(0., normalize(vec2(2., 2.), 0.).x, distance); 47 47 + } 48 48 + 49 49 + float determineStartVertexFactor(vec2 a, vec2 b) { 50 50 + // Conditions using step 51 51 + float condition1 = step(b.x, a.x) * step(a.y, b.y); // a.x < b.x && a.y > b.y 52 52 + float condition2 = step(a.x, b.x) * step(b.y, a.y); // a.x > b.x && a.y < b.y 53 53 + 54 54 + // If neither condition is met, return 1 (else case) 55 55 + return 1.0 - max(condition1, condition2); 56 56 + } 57 57 + 58 58 + vec2 getRectangleCenter(vec4 rectangle) { 59 59 + return vec2(rectangle.x + (rectangle.z / 2.), rectangle.y - (rectangle.w / 2.)); 60 60 + } 61 61 + float ease(float x) { 62 62 + return pow(1.0 - x, 3.0); 63 63 + } 64 64 + 65 65 + const float DURATION = 0.25; //IN SECONDS 66 66 + 67 67 + void mainImage(out vec4 fragColor, in vec2 fragCoord) 68 68 + { 69 69 + #if !defined(WEB) 70 70 + fragColor = texture(iChannel0, fragCoord.xy / iResolution.xy); 71 71 + #endif 72 72 + // Normalization for fragCoord to a space of -1 to 1; 73 73 + vec2 vu = normalize(fragCoord, 1.); 74 74 + vec2 offsetFactor = vec2(-.5, 0.5); 75 75 + 76 76 + // Normalization for cursor position and size; 77 77 + // cursor xy has the postion in a space of -1 to 1; 78 78 + // zw has the width and height 79 79 + vec4 currentCursor = vec4(normalize(iCurrentCursor.xy, 1.), normalize(iCurrentCursor.zw, 0.)); 80 80 + vec4 previousCursor = vec4(normalize(iPreviousCursor.xy, 1.), normalize(iPreviousCursor.zw, 0.)); 81 81 + 82 82 + // When drawing a parellelogram between cursors for the trail i need to determine where to start at the top-left or top-right vertex of the cursor 83 83 + float vertexFactor = determineStartVertexFactor(currentCursor.xy, previousCursor.xy); 84 84 + float invertedVertexFactor = 1.0 - vertexFactor; 85 85 + 86 86 + // Set every vertex of my parellogram 87 87 + vec2 v0 = vec2(currentCursor.x + currentCursor.z * vertexFactor, currentCursor.y - currentCursor.w); 88 88 + vec2 v1 = vec2(currentCursor.x + currentCursor.z * invertedVertexFactor, currentCursor.y); 89 89 + vec2 v2 = vec2(previousCursor.x + currentCursor.z * invertedVertexFactor, previousCursor.y); 90 90 + vec2 v3 = vec2(previousCursor.x + currentCursor.z * vertexFactor, previousCursor.y - previousCursor.w); 91 91 + 92 92 + float sdfCurrentCursor = getSdfRectangle(vu, currentCursor.xy - (currentCursor.zw * offsetFactor), currentCursor.zw * 0.5); 93 93 + float sdfTrail = getSdfParallelogram(vu, v0, v1, v2, v3); 94 94 + 95 95 + float progress = clamp((iTime - iTimeCursorChange) / DURATION, 0.0, 1.0); 96 96 + float easedProgress = ease(progress); 97 97 + // Distance between cursors determine the total length of the parallelogram; 98 98 + vec2 centerCC = getRectangleCenter(currentCursor); 99 99 + vec2 centerCP = getRectangleCenter(previousCursor); 100 100 + float lineLength = distance(centerCC, centerCP); 101 101 + 102 102 + vec4 newColor = vec4(fragColor); 103 103 + vec4 trailColor = mix(iPreviousCursorColor * 0.9, iCurrentCursorColor * 0.9, easedProgress); 104 104 + trailColor = mix(trailColor, vec4(trailColor.rgb * 0.1, 0), easedProgress); 105 105 + 106 106 + newColor = mix(newColor, trailColor, antialising(sdfTrail)); 107 107 + // Draw current cursor 108 108 + newColor = mix(newColor, trailColor, antialising(sdfCurrentCursor)); 109 109 + newColor = mix(newColor, fragColor, step(sdfCurrentCursor, 0.)); 110 110 + fragColor = mix(fragColor, newColor, step(sdfCurrentCursor, easedProgress * lineLength)); 111 111 + }

+15

.config/i3bar-river/config.toml

··· 1 1 + command = "i3status-rs" 2 2 + 3 3 + background = "#16161D" 4 4 + color = "#C8C093" 5 5 + separator = "#2A2A37" 6 6 + tag_fg = "#54546D" 7 7 + tag_bg = "#363646" 8 8 + tag_focused_fg = "#DCD7BA" 9 9 + tag_focused_bg = "#E46876" 10 10 + tag_urgent_fg = "#DCD7BA" 11 11 + tag_urgent_bg = "#FFA066" 12 12 + 13 13 + separator_width = 0 14 14 + tags_r = 6 15 15 + blocks_r = 6

+53

.config/i3status-rust/config.toml

··· 1 1 + [theme] 2 2 + theme = "slick" 3 3 + [theme.overrides] 4 4 + separator = "native" 5 5 + alternating_tint_bg = "none" 6 6 + alternating_tint_fg = "none" 7 7 + idle_fg = "#DCD7BA" 8 8 + idle_bg = "#363646" 9 9 + good_fg = "#DCD7BA" 10 10 + good_bg = "#76946A" 11 11 + warning_fg = { link = "good_fg" } 12 12 + warning_bg = "#FF9E3B" 13 13 + critical_fg = { link = "good_fg" } 14 14 + critical_bg = "#E82424" 15 15 + info_fg = { link = "good_fg" } 16 16 + info_bg = "#6A9589" 17 17 + 18 18 + 19 19 + [icons] 20 20 + icons = "awesome4" 21 21 + 22 22 + [[block]] 23 23 + block = "cpu" 24 24 + info_cpu = 20 25 25 + warning_cpu = 50 26 26 + critical_cpu = 90 27 27 + 28 28 + [[block]] 29 29 + block = "memory" 30 30 + format = " $icon $mem_total_used_percents.eng(w:2) " 31 31 + format_alt = " $icon_swap $swap_used_percents.eng(w:2) " 32 32 + 33 33 + [[block]] 34 34 + block = "battery" 35 35 + 36 36 + [[block]] 37 37 + block = "sound" 38 38 + [[block.click]] 39 39 + button = "left" 40 40 + cmd = "pavucontrol" 41 41 + 42 42 + [[block]] 43 43 + block = "time" 44 44 + interval = 5 45 45 + format = " $timestamp.datetime(f:'%a %d/%m %R') " 46 46 + 47 47 + [[block]] 48 48 + block = "custom" 49 49 + command = "echo \uf011" # assumes fontawesome icons 50 50 + interval = "once" 51 51 + [[block.click]] 52 52 + button = "left" 53 53 + cmd = "loginctl `echo -e 'suspend\npoweroff\nreboot' | tofi --prompt-text 'power '`"

+3 -3

.config/jj/config.toml

··· 4 4 5 5 [ui] 6 6 default-command = "status" 7 7 - diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"] 7 7 + diff-editor = ":builtin" 8 8 9 9 [aliases] 10 10 b = ["bookmark"] ··· 12 12 bu = ["bookmark", "move", "--to", "@-"] 13 13 14 14 [signing] 15 15 - sign-all = true 15 15 + behavior = "own" 16 16 backend = "gpg" 17 17 18 18 [template-aliases] ··· 27 27 indent("JJ: ", diff.summary()), 28 28 ), 29 29 "\nJJ: ignore-rest\n", 30 30 - indent(" " ,diff.git()), 30 30 + diff.git(), 31 31 ) 32 32 '''

+4

.config/mako/config

··· 1 1 + background-color=#16161D 2 2 + text-color=#C8C093 3 3 + border-color=#16161D 4 4 + border-radius=5

+4

.config/nvim/init.lua

··· 17 17 vim.opt.cursorline = true 18 18 vim.opt.scrolloff = 10 19 19 vim.opt.hlsearch = true 20 20 + if vim.fn.has("nvim-0.12") == 1 then 21 21 + vim.opt.autocomplete = true 22 22 + end 23 23 + vim.opt.completeopt = "noselect,menuone,fuzzy" 20 24 vim.o.textwidth = 100 21 25 vim.o.colorcolumn = "+1" 22 26 vim.o.showbreak = "↪ "

+16 -21

.config/nvim/lazy-lock.json

··· 1 1 { 2 2 - "blink.cmp": { "branch": "main", "commit": "5b0f52d42ecbb374695da1a93fa40eca4dc7a7ff" }, 3 3 - "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, 4 4 - "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, 5 5 - "fzf-lua": { "branch": "main", "commit": "3d7e5db8fa56cfc2b92a38999016a51abe9e1d23" }, 6 6 - "gitsigns.nvim": { "branch": "main", "commit": "b544bd62623ca1b483d8b9bfb6d65805f112a320" }, 7 7 - "grug-far.nvim": { "branch": "main", "commit": "08f32182335754abf461dfb77b2c4e24bfe4d614" }, 8 8 - "hunk.nvim": { "branch": "master", "commit": "eb89245a66bdfce10436d15923bf4deb43d23c96" }, 9 9 - "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, 10 10 - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, 11 11 - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, 12 12 - "mini.files": { "branch": "main", "commit": "4d2359158a171564d0a46d4a48da8b4491649f6a" }, 13 13 - "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, 14 14 - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, 15 15 - "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, 16 16 - "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, 17 17 - "nvim-treesitter": { "branch": "master", "commit": "622a4a6ba76d1de52b72a965159213ae655b4ac7" }, 18 18 - "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" }, 19 19 - "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, 20 20 - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, 21 21 - "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, 22 22 - "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } 2 2 + "conform.nvim": { "branch": "master", "commit": "9b8fa5e0b78168f68bee9bf886dc20f287c61e02" }, 3 3 + "fzf-lua": { "branch": "main", "commit": "3b53b0eb26972686c5825d7c0e63b3cffd0c4f2b" }, 4 4 + "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" }, 5 5 + "grug-far.nvim": { "branch": "main", "commit": "b58b2d65863f4ebad88b10a1ddd519e5380466e0" }, 6 6 + "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, 7 7 + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, 8 8 + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, 9 9 + "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" }, 10 10 + "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, 11 11 + "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, 12 12 + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, 13 13 + "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, 14 14 + "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, 15 15 + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, 16 16 + "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, 17 17 + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } 23 18 }

+8 -30

.config/nvim/lua/config/keys.lua

··· 17 17 vim.cmd.bp() 18 18 end, { desc = "Previous buffer" }) 19 19 20 20 - vim.keymap.set("n", "<leader>bd", function() 21 21 - local bufnr = vim.api.nvim_get_current_buf() 22 22 - 23 23 - if not vim.bo[bufnr].modified then 24 24 - vim.cmd.bd() 25 25 - return 26 26 - end 27 27 - 28 28 - local buf_name = vim.api.nvim_buf_get_name(bufnr) 29 29 - local choice = vim.fn.confirm("Unsaved changes in " .. buf_name .. ", save?", "&Yes\n&No\n&Cancel", "Cancel", "Question") 30 30 - 31 31 - if choice == 1 then 32 32 - vim.notify("Saved buffer", vim.log.levels.INFO, { title = buf_name }) 33 33 - vim.cmd.write() 34 34 - vim.api.nvim_buf_delete(bufnr, { force = false }) 35 35 - elseif choice == 2 then 36 36 - vim.notify("Closed buffer without saving", vim.log.levels.WARN, { title = buf_name }) 37 37 - vim.api.nvim_buf_delete(bufnr, { force = true }) 38 38 - else 39 39 - vim.notify("Cancelled closing buffer", vim.log.levels.WARN, { title = buf_name }) 40 40 - end 41 41 - end, { desc = "Close current buffer" }) 20 20 + vim.keymap.set("n", "<leader>bb", function() 21 21 + vim.cmd.b("#") 22 22 + end, { desc = "Go to last buffer" }) 42 23 43 43 - vim.keymap.set("n", "<leader>bD", function() 44 44 - vim.api.nvim_buf_delete(vim.api.nvim_get_current_buf(), { force = true }) 45 45 - 46 46 - local bufnr = vim.api.nvim_get_current_buf() 47 47 - if vim.bo[bufnr].modified then 48 48 - vim.notify("Closed buffer without saving", vim.log.levels.WARN) 49 49 - end 50 50 - end, { desc = "Force close current buffer" }) 24 24 + vim.keymap.set("n", "<leader>bd", "<cmd>BufDel<cr>", { desc = "Close current buffer" }) 25 25 + vim.keymap.set("n", "<leader>bD", "<cmd>BufDel!<cr>", { desc = "Force close current buffer" }) 26 26 + vim.keymap.set("n", "<leader>bo", "<cmd>BufDelOthers<cr>", { desc = "Close all other buffers" }) 27 27 + vim.keymap.set("n", "<leader>bO", "<cmd>BufDelOthers!<cr>", { desc = "Force close all other buffers" }) 28 28 + vim.keymap.set("n", "<leader>bA", "<cmd>BufDelAll!<cr>", { desc = "Force close all buffers" })

-52

.config/nvim/lua/plugins/completion.lua

··· 1 1 - return { 2 2 - "saghen/blink.cmp", 3 3 - lazy = false, 4 4 - version = "v0.*", 5 5 - dependencies = { 6 6 - { 7 7 - "garymjr/nvim-snippets", 8 8 - opts = { 9 9 - create_autocmd = true, 10 10 - create_cmp_source = false, 11 11 - friendly_snippets = true, 12 12 - }, 13 13 - }, 14 14 - "rafamadriz/friendly-snippets", 15 15 - }, 16 16 - opts = { 17 17 - keymap = { 18 18 - preset = "default", 19 19 - ["<CR>"] = { "accept", "fallback" }, 20 20 - ["<C-K>"] = { "show_documentation", "hide_documentation" }, 21 21 - ["<C-L>"] = { "snippet_forward", "fallback" }, 22 22 - ["<C-H>"] = { "snippet_backward", "fallback" }, 23 23 - ["<Tab>"] = { "fallback" }, 24 24 - ["<S-Tab>"] = { "fallback" }, 25 25 - }, 26 26 - appearance = { 27 27 - use_nvim_cmp_as_default = true, 28 28 - nerd_font_variant = "mono", 29 29 - }, 30 30 - signature = { 31 31 - enabled = true, 32 32 - }, 33 33 - sources = { 34 34 - default = { "lsp", "path", "snippets", "buffer" }, 35 35 - cmdline = {}, 36 36 - }, 37 37 - completion = { 38 38 - menu = { 39 39 - draw = { 40 40 - treesitter = { "lsp" }, 41 41 - }, 42 42 - }, 43 43 - documentation = { 44 44 - auto_show = true, 45 45 - auto_show_delay_ms = 200, 46 46 - }, 47 47 - ghost_text = { 48 48 - enabled = false, 49 49 - }, 50 50 - }, 51 51 - }, 52 52 - }

+17

.config/nvim/lua/plugins/format.lua

··· 16 16 }, 17 17 } 18 18 19 19 + local ok, local_fmt = pcall(require, "local_fmt") 20 20 + if ok then 21 21 + if local_fmt.ft_formatters ~= nil then 22 22 + ft_formatters = vim.tbl_deep_extend("force", ft_formatters, local_fmt.ft_formatters) 23 23 + end 24 24 + if local_fmt.formatters ~= nil then 25 25 + formatters = vim.tbl_deep_extend("force", formatters, local_fmt.formatters) 26 26 + end 27 27 + else 28 28 + vim.print("error loading local_fmt") 29 29 + end 30 30 + 19 31 return { 20 32 "stevearc/conform.nvim", 21 33 lazy = true, ··· 36 48 end, 37 49 mode = { "x", "v" }, 38 50 desc = "Format selection", 51 51 + }, 52 52 + { 53 53 + "<leader>ci", 54 54 + "<cmd>ConformInfo<cr>", 55 55 + desc = "Formatter info", 39 56 }, 40 57 }, 41 58 opts = {

-19

.config/nvim/lua/plugins/mini.lua

··· 1 1 ---@type LazySpec 2 2 return { 3 3 { 4 4 - "echasnovski/mini.files", 5 5 - version = false, 6 6 - opts = { 7 7 - windows = { preview = true, width_preview = 80 }, 8 8 - options = { 9 9 - use_as_default_explorer = false, 10 10 - }, 11 11 - }, 12 12 - keys = { 13 13 - { 14 14 - "<leader>f", 15 15 - function() 16 16 - require("mini.files").open(vim.api.nvim_buf_get_name(0), true) 17 17 - end, 18 18 - desc = "Open mini files", 19 19 - }, 20 20 - }, 21 21 - }, 22 22 - { 23 4 "echasnovski/mini.surround", 24 5 event = "VeryLazy", 25 6 opts = {

+3 -15

.config/nvim/lua/plugins/misc.lua

··· 16 16 end, 17 17 }, 18 18 { 19 19 - "julienvincent/hunk.nvim", 20 20 - dependencies = { 21 21 - "MunifTanjim/nui.nvim", 22 22 - }, 23 23 - cond = function() 24 24 - return vim.fn.executable("jj") == 1 25 25 - end, 26 26 - cmd = { "DiffEditor" }, 19 19 + "ojroques/nvim-bufdel", 20 20 + cmd = { "BufDel", "BufDelOthers", "BufDelAll" }, 27 21 opts = { 28 28 - ui = { 29 29 - tree = { 30 30 - mode = "flat", 31 31 - }, 32 32 - layout = "horizontal", 33 33 - }, 22 22 + quit = false, 34 23 }, 35 35 - config = true, 36 24 }, 37 25 }

+1 -1

.config/nvim/lua/plugins/search.lua

··· 1 1 ---@type LazySpec 2 2 return { 3 3 "ibhagwan/fzf-lua", 4 4 - opts = {}, 4 4 + opts = { "ivy" }, 5 5 cmd = "FzfLua", 6 6 keys = { 7 7 { "<leader><leader>", "<cmd>FzfLua files<cr>", desc = "Search files" },

+93

.config/river/init

··· 1 1 + #!/bin/sh 2 2 + 3 3 + USE_BSP=0 4 4 + if [ -e "$(which river-bsp-layout)" ]; then 5 5 + USE_BSP=1 6 6 + fi 7 7 + MAIN_MOD=Super 8 8 + 9 9 + riverctl map normal $MAIN_MOD+Shift Return spawn ghostty 10 10 + riverctl map normal $MAIN_MOD+Shift B spawn epiphany 11 11 + riverctl map normal $MAIN_MOD+Shift E spawn emacs 12 12 + riverctl map normal $MAIN_MOD Space spawn 'tofi-drun | xargs -I % riverctl spawn %' 13 13 + 14 14 + riverctl map normal $MAIN_MOD Q close 15 15 + 16 16 + riverctl map normal $MAIN_MOD+Shift+Control Q exit 17 17 + 18 18 + riverctl map normal $MAIN_MOD H focus-view left 19 19 + riverctl map normal $MAIN_MOD J focus-view next 20 20 + riverctl map normal $MAIN_MOD K focus-view previous 21 21 + riverctl map normal $MAIN_MOD L focus-view right 22 22 + 23 23 + riverctl map normal $MAIN_MOD+Shift H swap left 24 24 + riverctl map normal $MAIN_MOD+Shift J swap next 25 25 + riverctl map normal $MAIN_MOD+Shift K swap previous 26 26 + riverctl map normal $MAIN_MOD+Shift L swap right 27 27 + 28 28 + riverctl map normal $MAIN_MOD+Shift+Control K zoom 29 29 + 30 30 + riverctl map normal $MAIN_MOD Period focus-output next 31 31 + riverctl map normal $MAIN_MOD Comma focus-output previous 32 32 + 33 33 + riverctl map normal $MAIN_MOD+Shift Period send-to-output next 34 34 + riverctl map normal $MAIN_MOD+Shift Comma send-to-output previous 35 35 + 36 36 + riverctl map normal $MAIN_MOD Return zoom 37 37 + 38 38 + if [ $USE_BSP -eq 1 ]; then 39 39 + riverctl map normal $MAIN_MOD Up send-layout-cmd bsp-layout "--dec-hsplit 0.05" 40 40 + riverctl map normal $MAIN_MOD Down send-layout-cmd bsp-layout "--inc-hsplit 0.05" 41 41 + riverctl map normal $MAIN_MOD Left send-layout-cmd bsp-layout "--dec-vsplit 0.05" 42 42 + riverctl map normal $MAIN_MOD Right send-layout-cmd bsp-layout "--inc-vsplit 0.05" 43 43 + riverctl map normal $MAIN_MOD+Shift Up send-layout-cmd bsp-layout "--start-vsplit" 44 44 + riverctl map normal $MAIN_MOD+Shift Right send-layout-cmd bsp-layout "--start-hsplit" 45 45 + riverctl map normal $MAIN_MOD+Shift Left send-layout-cmd bsp-layout "--reverse" 46 46 + else 47 47 + riverctl map normal $MAIN_MOD Left send-layout-cmd rivertile "main-ratio -0.05" 48 48 + riverctl map normal $MAIN_MOD Right send-layout-cmd rivertile "main-ratio +0.05" 49 49 + fi 50 50 + 51 51 + riverctl map-pointer normal $MAIN_MOD BTN_LEFT move-view 52 52 + 53 53 + riverctl map-pointer normal $MAIN_MOD BTN_RIGHT resize-view 54 54 + 55 55 + riverctl map-pointer normal $MAIN_MOD BTN_MIDDLE toggle-float 56 56 + 57 57 + for i in $(seq 1 9); do 58 58 + tags=$((1 << ($i - 1))) 59 59 + 60 60 + riverctl map normal $MAIN_MOD $i set-focused-tags $tags 61 61 + riverctl map normal $MAIN_MOD+Shift $i set-view-tags $tags 62 62 + riverctl map normal $MAIN_MOD+Control $i toggle-focused-tags $tags 63 63 + riverctl map normal $MAIN_MOD+Shift+Control $i toggle-view-tags $tags 64 64 + done 65 65 + 66 66 + riverctl map normal $MAIN_MOD+Shift F toggle-float 67 67 + 68 68 + riverctl map normal $MAIN_MOD F toggle-fullscreen 69 69 + 70 70 + riverctl background-color 0x16161d 71 71 + riverctl border-color-unfocused 0x54546D 72 72 + riverctl border-color-focused 0xE46876 73 73 + riverctl border-width 5 74 74 + 75 75 + riverctl set-repeat 50 300 76 76 + 77 77 + riverctl rule-add -app-id 'float*' float 78 78 + riverctl rule-add ssd 79 79 + 80 80 + riverctl focus-follows-cursor normal 81 81 + riverctl default-attach-mode below 82 82 + 83 83 + if [ $USE_BSP -eq 1 ]; then 84 84 + riverctl default-layout bsp-layout 85 85 + river-bsp-layout --inner-gap 7 --outer-gap 18 --split-perc 0.5 & 86 86 + else 87 87 + riverctl default-layout rivertile 88 88 + rivertile -view-padding 6 -outer-padding 6 & 89 89 + fi 90 90 + 91 91 + swaybg -m fill -i $(cat ~/.current_wallpaper) & 92 92 + riverctl spawn i3bar-river 93 93 + riverctl spawn mako

+2 -2

.config/starship.toml

··· 40 40 ) 41 41 ' 42 42 ''' 43 43 - detect_folders = [".jj"] 44 44 - symbol = "󰝴 " 43 43 + when = "jj root --ignore-working-copy" 44 44 + symbol = "🐦 " 45 45 style = "bold blue"

+1 -1

.gitconfig

··· 5 5 [pull] 6 6 rebase = true 7 7 [core] 8 8 - editor = emacs -nw 8 8 + editor = nvim 9 9 pager = delta 10 10 11 11 [interactive]

-1

.zshenv

··· 1 1 - . "$HOME/.cargo/env"

+46 -9

.zshrc

··· 5 5 6 6 ZSH_AUTOSUGGEST_STRATEGY=(history completion) 7 7 8 8 + if [ -x "$(which jj)" ]; then 9 9 + JJ_INSTALLED="$(which jj)" 10 10 + fi 11 11 + 8 12 zinit wait lucid for \ 9 13 atinit"zicompinit; zicdreplay" \ 10 14 zdharma-continuum/fast-syntax-highlighting \ 11 15 atload"_zsh_autosuggest_start" \ 12 16 zsh-users/zsh-autosuggestions \ 13 17 blockf atpull'zinit creinstall -q .' \ 14 14 - atload"source <(jj util completion zsh)" \ 15 15 - atload"source <(COMPLETE=zsh jj)" \ 18 18 + atload"if [ -v JJ_INSTALLED ]; then; source <(jj util completion zsh); fi" \ 19 19 + atload"if [ -v JJ_INSTALLED ]; then; source <(COMPLETE=zsh jj); fi" \ 16 20 zsh-users/zsh-completions 17 21 18 22 zinit id-as"auto" for \ ··· 25 29 unsetopt LIST_BEEP 26 30 27 31 export PATH=~/.cargo/bin/:$PATH 28 28 - export PATH=~/.zig/:$PATH 32 32 + export PATH=~/.zvm/bin:$PATH 29 33 export PATH=~/.local/bin:$PATH 30 34 31 31 - eval "$(starship init zsh)" 32 32 - eval "$(zoxide init zsh --cmd cd)" 35 35 + if [ -x "$(which starship)" ]; then 36 36 + eval "$(starship init zsh)" 37 37 + else 38 38 + echo "starship not in path" 39 39 + fi 40 40 + 41 41 + if [ -x "$(which zoxide)" ]; then 42 42 + eval "$(zoxide init zsh --cmd cd)" 43 43 + else 44 44 + echo "zoxide not in path" 45 45 + fi 46 46 + 33 47 export GPG_TTY=$(tty) 34 34 - export EDITOR='emacs -nw' 35 35 - export MANPAGER="sh -c 'col -xbf | bat -p -l man'" 48 48 + 49 49 + if [ -x "$(which nvim)" ]; then 50 50 + export EDITOR='nvim' 51 51 + elif [ -x "$(which vim)" ]; then 52 52 + export EDITOR='vim' 53 53 + else 54 54 + export EDITOR='vi' 55 55 + fi 56 56 + 57 57 + if [ -x "$(which batman)" ]; then 58 58 + eval "$(batman --export-env)" 59 59 + fi 60 60 + 61 61 + if [ -x "$(which opam)" ]; then 62 62 + eval "$(opam env --switch=default)" 63 63 + fi 64 64 + 65 65 + 66 66 + LOCAL_ZSH_PATH="$HOME/.local.zsh" 67 67 + if [ -f "$LOCAL_ZSH_PATH" ]; then 68 68 + source "$LOCAL_ZSH_PATH" 69 69 + fi 36 70 37 71 # git 38 72 alias gs="git status" ··· 42 76 alias gc="git commit" 43 77 alias lzg=lazygit 44 78 45 45 - 46 46 - alias ls="lsd" 79 79 + if [ -x "$(which lsr)" ]; then 80 80 + alias ls="lsr" 81 81 + elif [ -x "$(which lsd)" ]; then 82 82 + alias ls="lsd" 83 83 + fi 47 84 alias l="ls -la" 48 85 alias la="ls -lA"