Compare commits

...
6 Commits
Author SHA1 Message Date
jasonhilder 625713cbb4 Small cleanup for trimmed configs. 2026-10-14 07:45:32 +02:00
jasonhilder 20f501c2b1 Cleanup of old configs. 2026-10-14 07:44:59 +02:00
jasonhilder 8fa53a582c Added the old emacs config. 2026-10-14 07:44:06 +02:00
jasonhilder ed196212ed Clean up of old configs. 2026-10-14 07:42:20 +02:00
jasonhilder 7d9fc403b0 Simple vis plugin add. 2026-10-09 07:07:53 +02:00
jasonhilder dc575dc2fd added some helpers for niri. 2026-10-09 07:07:42 +02:00
19 changed files with 439 additions and 1747 deletions
+12
View File
@@ -1,3 +1,15 @@
config/emacs/backups/
config/emacs/eln-cache/
config/emacs/elpa/
config/emacs/auto-save/
config/emacs/auto-save-list/
config/emacs/custom.el
config/emacs/places.eld
config/emacs/projects.eld
config/emacs/recentf.eld
config/emacs/.ignore
config/emacs/session*
config/emacs/history
config/fish/conf.d
config/fish/functions
config/fish/fish_variables
+40
View File
@@ -0,0 +1,40 @@
;;;; Markdown
(use-package markdown-mode)
;;;; Odin
(use-package odin-mode
:vc (:url "https://github.com/mattt-b/odin-mode"
:rev :newest)
:mode "\\.odin\\'"
:hook (odin-mode . eglot-ensure))
(use-package eglot
:ensure nil
:config
(setq eglot-autoshutdown t)
(add-to-list 'eglot-ignored-server-capabilities :signatureHelpProvider)
;; Explicit OLS configuration.
(add-to-list
'eglot-server-programs
'(odin-mode
. ("/home/jason/.local/bin/ols"
:initializationOptions
(:odin_command "/home/jason/.odin/odin"
:enable_document_symbols t
:enable_format t
:collections
[(:name "core"
:path "/home/jason/.odin/core")
(:name "vendor"
:path "/home/jason/.odin/vendor")])))))
;; OLS built-in definitions.
(setenv "OLS_BUILTIN_FOLDER" "/home/jason/ThirdParty/ols/builtin")
;; Vim-style code navigation.
(evil-define-key '(normal motion) 'global
"gd" #'xref-find-definitions
"gD" #'xref-find-references
"K" #'eldoc
(kbd "C-t") #'xref-go-back)
+44
View File
@@ -0,0 +1,44 @@
;;; early-init.el --- Pre-init: GC ceiling and frame chrome -*- lexical-binding: t; -*-
;;; Commentary:
;; Runs before package.el initialises and before the first frame is drawn, so
;; it is the only place two things can take effect:
;; 1. Raising the GC ceiling, so the whole startup (package load + init.el)
;; runs without garbage-collection pauses.
;; 2. Removing the menu/tool/scroll bars via `default-frame-alist', so they
;; are never drawn — toggling the minor modes in init.el instead draws
;; them and then removes them, a visible flicker on launch.
;;
;; Nothing here may depend on a package: none are loaded yet.
;;
;; IMPORTANT: the GC bump below is only half the pair. Restore a working value
;; once startup is done by adding this to init.el:
;;
;; (add-hook 'emacs-startup-hook
;; (lambda () (setq gc-cons-threshold (* 16 1024 1024))))
;;
;; Without it, GC never runs again and Emacs slowly eats memory.
;;; Code:
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Garbage Collection
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Hold GC off for the whole startup; init.el lowers it back on
;; `emacs-startup-hook' (see the Commentary above).
(setq gc-cons-threshold most-positive-fixnum)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Frame Chrome (no flicker)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Disable the bars before the first frame exists.
(push '(menu-bar-lines . 0) default-frame-alist)
(push '(tool-bar-lines . 0) default-frame-alist)
(push '(vertical-scroll-bars) default-frame-alist)
;; Don't resize the frame when the UI/fonts change during startup.
(setq frame-inhibit-implied-resize t)
;;; early-init.el ends here
+58
View File
@@ -0,0 +1,58 @@
;;; git.el --- Magit, set up for Evil -*- lexical-binding: t; -*-
;;; Commentary:
;; Loaded from init.el, which must set `evil-want-keybinding' to nil before
;; Evil loads (Evil Collection needs it).
;;
;; :git Magit status for the current repo, full frame.
;; q puts your previous window layout back.
;; :git ARGS Run `git ARGS' from the repo root, e.g. :git log --oneline
;;
;; In Magit (Evil Collection layout):
;; j/k move, TAB folds, s stage, u unstage, x discard, c c commit,
;; p push, F pull, l log, d diff, b branch, z stash, gr refresh, q quit,
;; ? lists every command.
;; Commit message: opens in insert state; ZZ or C-c C-c commits,
;; ZQ or C-c C-k cancels.
;; Ctrl+hjkl, C-f and C-b keep their global meaning in Magit buffers.
;;; Code:
(use-package magit
:defer t
:custom
;; Status takes the whole frame; q restores the previous window layout.
(magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
(magit-bury-buffer-function #'magit-restore-window-configuration))
;; Vim-style keys for Magit, its section folding, and the commit message buffer.
;; (magit magit-submodule) is the form Evil Collection's own default list uses.
(with-eval-after-load 'evil-collection
;; Evil Collection puts section jumps on C-j/C-k and page scrolling on C-f/C-b.
;; Unbind them so your window and Consult keys show through. Sibling sections
;; are still on ] and [, and scrolling on C-d/C-u.
(add-hook 'evil-collection-setup-hook
(lambda (mode &rest _)
(when (eq mode 'magit)
(evil-define-key 'normal magit-mode-map
(kbd "C-j") nil
(kbd "C-k") nil
(kbd "C-f") nil
(kbd "C-b") nil))))
(evil-collection-init '((magit magit-submodule) magit-section with-editor)))
;; Commit messages start in insert state. Added after git-commit loads so its
;; default hook functions are kept.
(with-eval-after-load 'git-commit
(add-hook 'git-commit-setup-hook #'evil-insert-state))
;; :git opens Magit; :git ARGS runs a git command.
(evil-define-command my/git (args)
"Open Magit status, or run `git ARGS' from the repository root."
(interactive "<a>")
(if (and args (string-match-p "[^[:space:]]" args))
(magit-git-command-topdir (concat "git " args))
(magit-status)))
(evil-ex-define-cmd "git" #'my/git)
;;; git.el ends here
+280
View File
@@ -0,0 +1,280 @@
;;; init.el --- Minimal Emacs: built-ins + evil + consult -*- lexical-binding: t; -*-
;; Learning: F1 k KEY, F1 f FUNCTION, F1 v VARIABLE,
;; F1 m (modes), F1 b (bindings).
;; C-h works too, except in normal/motion state where it moves
;; to the window on the left.
;;; Code:
;;;; 1. Basics
(let ((bin (expand-file-name "~/.local/bin")))
(add-to-list 'exec-path bin)
(setenv "PATH" (concat bin path-separator (getenv "PATH"))))
;; Custom's output goes to its own file, not here.
(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
(load custom-file 'noerror 'nomessage)
;; Package archives: GNU and NonGNU are built in, MELPA is added at lowest priority.
(require 'package)
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
(setq package-archive-priorities '(("gnu" . 3) ("nongnu" . 2) ("melpa" . 1)))
(package-initialize)
(require 'use-package)
(setq use-package-always-ensure t)
;;;; 2. UI
(menu-bar-mode -1)
(tool-bar-mode -1)
(scroll-bar-mode -1)
(blink-cursor-mode -1)
(setq inhibit-startup-screen t
initial-scratch-message nil
ring-bell-function #'ignore
use-short-answers t
scroll-conservatively 101
scroll-margin 15)
(setq-default indent-tabs-mode nil
tab-width 4)
(global-hl-line-mode 1)
(global-display-line-numbers-mode 1)
(pixel-scroll-precision-mode 1)
(column-number-mode 1)
(electric-pair-mode 1)
(which-key-mode 1)
;; Jellybeans theme.
(add-to-list 'warning-suppress-types '(files))
(use-package jbeans-theme
:config
(load-theme 'jbeans t))
;; Font, on a darker background than the theme's.
(set-face-attribute 'default nil
:family "JetBrainsMono Nerd Font"
:height 120
:background "#131313")
;; Mode line at the top of each window: the header line takes over its
;; format and look, on the editor background.
(setq-default header-line-format mode-line-format mode-line-format nil)
(set-face-attribute 'header-line nil :inherit 'mode-line :background "#131313")
(setq-default line-spacing '(4 . 4))
;; Command launcher.
(keymap-global-set "C-S-p" #'execute-extended-command)
;; Escape cancels prompts. keyboard-quit can't leave the minibuffer, so there
;; Escape runs abort-minibuffers, as C-g does.
(keymap-global-set "<escape>" #'keyboard-quit)
(keymap-set minibuffer-local-map "<escape>" #'abort-minibuffers)
(add-to-list 'default-frame-alist '(fullscreen . maximized))
;;;; 3. Files
(dolist (d '("backups/" "auto-save/"))
(make-directory (locate-user-emacs-file d) t))
(setq backup-directory-alist
`(("." . ,(locate-user-emacs-file "backups/")))
auto-save-file-name-transforms
`((".*" ,(locate-user-emacs-file "auto-save/") t))
create-lockfiles nil
confirm-kill-processes nil
vc-follow-symlinks t)
(save-place-mode 1)
(savehist-mode 1)
(recentf-mode 1)
(global-auto-revert-mode 1)
;;;; 4. Completion
;; C-n/C-p move through candidates: Vertico remaps next-line/previous-line,
;; and section 5 stops Evil from taking those keys in the minibuffer.
(use-package vertico
:init
(vertico-mode 1)
:custom
(vertico-count 15))
(setq completion-styles '(basic partial-completion flex)
completion-ignore-case t
read-buffer-completion-ignore-case t
read-file-name-completion-ignore-case t
completions-format 'one-column
isearch-lazy-count t
xref-search-program 'ripgrep)
(use-package vertico-posframe
:after vertico
:custom
(vertico-posframe-poshandler #'posframe-poshandler-frame-center)
:config
(vertico-posframe-mode 1))
;;;; 5. Evil
;; Evil 1.15.0 on Emacs 31 reads this legacy variable, which Emacs no longer defines.
(defvar evil-mode-buffers nil)
(defun my/insert-tab ()
"Insert a literal tab character."
(interactive)
(insert "\t"))
(use-package evil
:init
;; evil-want-keybinding: Evil Collection (below) supplies mode bindings instead
;; of Evil's small built-in set. It has to be set before Evil loads.
(setq evil-want-C-u-scroll t
evil-undo-system 'undo-redo
evil-want-keybinding nil)
:config
(evil-mode 1)
(evil-define-key 'insert 'global
;; Literal tab. <tab> as well, or a mode's own <tab> binding wins in GUI frames.
(kbd "TAB") #'my/insert-tab
(kbd "<tab>") #'my/insert-tab
;; C-SPC: complete using the buffer's completion sources.
(kbd "C-SPC") #'completion-at-point
(kbd "C-@") #'completion-at-point)
;; Global navigation.
;; C-p, C-f and C-b are assigned to Consult below.
(evil-define-key '(normal motion) 'global
(kbd "C-e") #'dired-jump))
;; Evil Collection: vim-style bindings for other packages, one mode at a time.
;; Info here (F1 i); Magit, Magit sections and commit messages in git.el.
(use-package evil-collection
:after evil
:custom
;; Don't add its global [b ]b [e ]e ... bindings.
(evil-collection-want-unimpaired-p nil)
:config
(evil-collection-init '(info)))
;; Minibuffer. Vertico
(with-eval-after-load 'vertico
(evil-define-key '(insert normal) vertico-map
(kbd "C-n") #'vertico-next
(kbd "C-p") #'vertico-previous
(kbd "TAB") #'vertico-insert
(kbd "<tab>") #'vertico-insert))
(evil-define-key '(insert normal) minibuffer-local-map
(kbd "<escape>") #'abort-minibuffers)
;; Window navigation (normal/motion state): Ctrl+hjkl move, Ctrl+` closes.
;; GUI only for C-`: terminals send it as C-@.
(evil-define-key '(normal motion) 'global
(kbd "C-h") #'windmove-left
(kbd "C-j") #'windmove-down
(kbd "C-k") #'windmove-up
(kbd "C-l") #'windmove-right
(kbd "C-`") #'delete-window)
;; Result buffers: hjkl motions and RET to jump to a result.
(dolist (m '(occur-mode grep-mode xref--xref-buffer-mode))
(evil-set-initial-state m 'motion))
(with-eval-after-load 'compile
(evil-define-key 'motion compilation-mode-map
(kbd "RET") #'compile-goto-error))
(with-eval-after-load 'grep
(evil-define-key 'motion grep-mode-map
(kbd "RET") #'compile-goto-error))
(with-eval-after-load 'replace
(evil-define-key 'motion occur-mode-map
(kbd "RET") #'occur-mode-goto-occurrence))
(with-eval-after-load 'xref
(evil-define-key 'motion xref--xref-buffer-mode-map
(kbd "RET") #'xref-goto-xref))
;;;; 6. Consult
;; Requires the external `fd` and `rg` executables. Both honour .ignore files,
;; so keep excludes (node_modules, elpa, ...) in ~/.ignore or per-project .ignore.
;; Searches start at the project root when there is one, else the current directory.
(use-package consult
:config
;; Hide noise from the buffer picker.
(dolist (re '("\\`\\*scratch\\*\\'"
"\\`\\*Messages\\*\\'"
"\\`\\*Warnings\\*\\'"
"\\`\\*xref\\*\\'"))
(add-to-list 'consult-buffer-filter re))
;; Don't re-run the preview on every keystroke while typing a search.
(consult-customize consult-ripgrep
:preview-key '(:debounce 0.4 any)))
;; Bind immediately, without waiting for consult to load.
(evil-define-key '(normal motion) 'global
(kbd "C-p") #'consult-fd
(kbd "C-f") #'consult-ripgrep
(kbd "C-b") #'consult-buffer)
;;;; 7. Dired
(setq dired-dwim-target t
dired-kill-when-opening-new-dired-buffer t
dired-listing-switches "-agho --group-directories-first"
dired-recursive-copies 'always
delete-by-moving-to-trash t)
(with-eval-after-load 'dired
(evil-set-initial-state 'dired-mode 'motion)
(evil-define-key 'motion dired-mode-map
"h" #'dired-up-directory
"l" #'dired-find-file
(kbd "RET") #'dired-find-file))
;;;; 8. Build
(setq compile-command "./build.sh"
compilation-read-command nil
compilation-ask-about-save nil
compilation-scroll-output t)
(add-hook 'compilation-filter-hook #'ansi-color-compilation-filter)
;; Compilation buffer always at the bottom, full frame width.
(add-to-list 'display-buffer-alist
'((derived-mode . compilation-mode)
(display-buffer-reuse-window display-buffer-at-bottom)
(window-height . 0.45)))
;; C-c C-c builds from the project root.
;; C-c b asks first: the prompt is pre-filled with ./build.sh, so type the args after it.
(defun my/project-compile-prompt ()
"Run `project-compile', prompting to edit the command."
(interactive)
(let ((compilation-read-command t))
(call-interactively #'project-compile)))
(keymap-global-set "C-c C-c" #'project-compile)
(keymap-global-set "C-c b" #'my/project-compile-prompt)
;; Focus the compilation window when a build starts.
(add-hook 'compilation-start-hook
(lambda (proc)
(when-let* ((win (get-buffer-window (process-buffer proc))))
(select-window win))))
;;;; 9. Languages
;; Setup for dev languages, modes, lsp and lsp keybinds.
(load (locate-user-emacs-file "development.el") nil 'nomessage)
;;;; 10. Git
;; Magit and the :git command live in git.el, next to this file.
(load (locate-user-emacs-file "git.el") nil 'nomessage)
;;; init.el ends here
-1
View File
@@ -82,7 +82,6 @@ alias bat 'bat --theme="ansi" --paging=never'
alias :q 'exit'
alias files 'thunar .'
alias fetch 'pfetch'
alias vi 'vis'
# Custom shortcuts
alias reload 'source ~/.config/fish/config.fish'
-256
View File
@@ -1,256 +0,0 @@
// ============================================================================
// GENERAL & SYSTEM SETTINGS
// Wiki: https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction
// ============================================================================
config-notification {
disable-failed
}
hotkey-overlay {
skip-at-startup
}
prefer-no-csd
screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
debug {
honor-xdg-activation-with-invalid-serial
}
// ============================================================================
// ENVIRONMENT VARIABLES
// ============================================================================
environment {
XDG_CURRENT_DESKTOP "niri"
QT_QPA_PLATFORM "wayland;xcb"
ELECTRON_OZONE_PLATFORM_HINT "auto"
QT_QPA_PLATFORMTHEME "gtk3"
QT_QPA_PLATFORMTHEME_QT6 "gtk3"
TERMINAL "alacritty"
}
// ============================================================================
// AUTOSTART / SPAWN AT STARTUP
// ============================================================================
spawn-at-startup "dms" "run"
// Export the session env to D-Bus so xdg-desktop-portal works
spawn-at-startup "dbus-update-activation-environment" "--all"
// Audio stack
spawn-at-startup "pipewire"
// PolicyKit authentication agent (verify path: xbps-query -f mate-polkit | grep -i agent)
spawn-at-startup "sh" "-c" "/usr/libexec/polkit-mate-authentication-agent-1 &"
// Clipboard history backing store for Mod+V
spawn-at-startup "sh" "-c" "wl-paste --watch cliphist store"
// Automount removable media
spawn-at-startup "udiskie" "--no-tray"
// ============================================================================
// INPUT & GESTURES
// Wiki: https://github.com/YaLTeR/niri/wiki/Configuration:-Input
// ============================================================================
input {
keyboard {
xkb {
// If this section is empty, niri will fetch xkb settings
// from org.freedesktop.locale1. You can control these using
// localectl set-x11-keymap.
}
// Enable numlock on startup, omitting this setting disables it.
numlock
}
// Focus windows and outputs automatically when moving the mouse into them.
focus-follows-mouse max-scroll-amount="95%"
}
gestures {
hot-corners {
off
}
}
// ============================================================================
// LAYOUT & VISUAL APPEARANCE
// Wiki: https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
// ============================================================================
layout {
background-color "transparent"
// When to center a column when changing focus: "never", "always", or "on-overflow"
center-focused-column "never"
// Custom widths toggled by "switch-preset-column-width" (Mod+R)
preset-column-widths {
proportion 0.5
proportion 1.0
}
default-column-width { proportion 0.5; }
border {
off
width 4
active-color "#707070" // Neutral gray
inactive-color "#d0d0d0" // Light gray
urgent-color "#cc4444" // Softer red
}
shadow {
softness 30
spread 5
offset x=0 y=5
color "#0007"
}
struts {
}
}
overview {
workspace-shadow {
off
}
}
// ============================================================================
// ANIMATIONS
// ============================================================================
animations {
workspace-switch {
spring damping-ratio=0.80 stiffness=523 epsilon=0.0001
}
window-open {
duration-ms 150
curve "ease-out-expo"
}
window-close {
duration-ms 150
curve "ease-out-quad"
}
horizontal-view-movement {
spring damping-ratio=0.85 stiffness=423 epsilon=0.0001
}
window-movement {
spring damping-ratio=0.75 stiffness=323 epsilon=0.0001
}
window-resize {
spring damping-ratio=0.85 stiffness=423 epsilon=0.0001
}
config-notification-open-close {
spring damping-ratio=0.65 stiffness=923 epsilon=0.001
}
screenshot-ui-open {
duration-ms 200
curve "ease-out-quad"
}
overview-open-close {
spring damping-ratio=0.85 stiffness=800 epsilon=0.0001
}
}
// ============================================================================
// WINDOW & LAYER RULES
// Wiki: https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
// ============================================================================
layer-rule {
match namespace="^quickshell$"
place-within-backdrop true
}
window-rule {
match app-id=r#"^org\.gnome\."#
draw-border-with-background false
geometry-corner-radius 12
clip-to-geometry true
}
window-rule {
match app-id=r#"^gnome-control-center$"#
match app-id=r#"^pavucontrol$"#
match app-id=r#"^nm-connection-editor$"#
default-column-width { proportion 0.5; }
open-floating false
}
window-rule {
match app-id=r#"^org\.gnome\.Calculator$"#
match app-id=r#"^gnome-calculator$"#
match app-id=r#"^galculator$"#
match app-id=r#"^blueman-manager$"#
match app-id=r#"^org\.gnome\.Nautilus$"#
match app-id=r#"^xdg-desktop-portal$"#
open-floating true
}
window-rule {
match app-id="Alacritty"
match app-id="kitty"
draw-border-with-background false
}
window-rule {
match app-id=r#"firefox$"# title="^Picture-in-Picture$"
match app-id="zoom"
open-floating true
}
// Force the Steam client, Friends List, and settings windows to float
window-rule {
match app-id="steam"
open-floating true
}
window-rule {
match app-id="steam"
match title="Friends List"
open-floating true
default-floating-position x=10 y=10 relative-to="bottom-right"
}
window-rule {
match app-id=r#"^steam$"# title=r#"^notificationtoasts_\d+_desktop$"#
default-floating-position x=10 y=10 relative-to="top-right"
open-focused false
}
// Automatically fullscreen games launched via Proton
window-rule {
// Proton games typically use "steam_app_<id>" as their app-id.
// The r#"..."# syntax tells niri to evaluate this as a regular expression.
match app-id=r#"^steam_app_\d+$"#
open-fullscreen true
}
// ============================================================================
// NAVIGATION & KEYBINDINGS
// ============================================================================
// Override to disable super+tab
recent-windows {
binds {
Alt+Tab { next-window scope="output"; }
Alt+Shift+Tab { previous-window scope="output"; }
Alt+grave { next-window filter="app-id"; }
Alt+Shift+grave { previous-window filter="app-id"; }
}
}
// ============================================================================
// INCLUDES (DMS MANAGEMENT)
// ============================================================================
// @NOTE: only dms file we could edit
include optional=true "dms/binds.kdl"
// @NOTE: Non-editable files below all managed by dms
include optional=true "dms/colors.kdl"
include optional=true "dms/layout.kdl"
include optional=true "dms/alttab.kdl"
include optional=true "dms/outputs.kdl"
include optional=true "dms/cursor.kdl"
include optional=true "dms/input.kdl"
-152
View File
@@ -1,152 +0,0 @@
binds {
// ========================================================================
// SYSTEM & DMS APPLICATION LAUNCHERS
// ========================================================================
// Screenshots
Alt+Print hotkey-overlay-title="Screenshot: Window" { spawn "dms" "screenshot" "window"; }
Alt+XF86Launch1 hotkey-overlay-title="Screenshot: Window" { spawn "dms" "screenshot" "window"; }
Ctrl+Print hotkey-overlay-title="Screenshot: Full Screen" { spawn "dms" "screenshot" "full"; }
Ctrl+XF86Launch1 hotkey-overlay-title="Screenshot: Full Screen" { spawn "dms" "screenshot" "full"; }
Mod+P hotkey-overlay-title="Screenshot: Region" { spawn "dms" "screenshot"; }
// Launchers & Overlays
Mod+D hotkey-overlay-title="Application Launcher" { spawn "dms" "ipc" "call" "spotlight" "toggle"; }
Mod+space hotkey-overlay-title="Spotlight Bar: Toggle" { spawn "dms" "ipc" "call" "spotlight-bar" "toggle"; }
Mod+Y hotkey-overlay-title="Browse Wallpapers" { spawn "dms" "ipc" "call" "dash" "toggle" "wallpaper"; }
Super+Backspace hotkey-overlay-title="Power Menu: Toggle" { spawn "dms" "ipc" "call" "powermenu" "toggle"; }
Mod+Alt+L hotkey-overlay-title="Lock Screen" { spawn "dms" "ipc" "call" "lock" "lock"; }
// Utilities & Tools
Ctrl+Alt+Delete hotkey-overlay-title="Task Manager" { spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; }
Mod+M hotkey-overlay-title="Task Manager" { spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; }
Mod+N hotkey-overlay-title="Notification Center" { spawn "dms" "ipc" "call" "notifications" "toggle"; }
Mod+S hotkey-overlay-title="Notepad" { spawn "dms" "ipc" "call" "notepad" "toggle"; }
Mod+V hotkey-overlay-title="Clipboard Manager" { spawn "dms" "ipc" "call" "clipboard" "toggle"; }
Mod+Comma hotkey-overlay-title="Settings" { spawn "dms" "ipc" "call" "settings" "focusOrToggle"; }
// Configuration Helpers
Ctrl+Shift+R hotkey-overlay-title="Rename Workspace" { spawn "dms" "ipc" "call" "workspace-rename" "open"; }
Mod+Shift+W hotkey-overlay-title="Create window rule" { spawn "dms" "ipc" "call" "window-rules" "toggle"; }
// Audio Control (MPRIS)
Ctrl+XF86AudioLowerVolume allow-when-locked=true { spawn "dms" "ipc" "call" "mpris" "decrement" "3"; }
Ctrl+XF86AudioRaiseVolume allow-when-locked=true { spawn "dms" "ipc" "call" "mpris" "increment" "3"; }
// ========================================================================
// WINDOW & COLUMN FOCUS
// ========================================================================
// Focus Columns (Horizontal)
Mod+H { focus-column-left; }
Mod+Left { focus-column-left; }
Mod+L { focus-column-right; }
Mod+Right { focus-column-right; }
Mod+Home { focus-column-first; }
Mod+End { focus-column-last; }
// Focus Windows within Column (Vertical)
Mod+J { focus-window-down; }
Mod+Down { focus-window-down; }
Mod+K { focus-window-up; }
Mod+Up { focus-window-up; }
// Mouse Wheel Focus Navigation
Mod+WheelScrollLeft { focus-column-left; }
Mod+WheelScrollRight { focus-column-right; }
Mod+Shift+WheelScrollUp { focus-column-left; }
Mod+Shift+WheelScrollDown { focus-column-right; }
// ========================================================================
// WINDOW & COLUMN MANIPULATION
// ========================================================================
// Close Window
Mod+Q repeat=false { close-window; }
// Move Columns (Horizontal)
Mod+Shift+H { move-column-left; }
Mod+Shift+Left { move-column-left; }
Mod+Shift+L { move-column-right; }
Mod+Shift+Right { move-column-right; }
Mod+Ctrl+Home { move-column-to-first; }
Mod+Ctrl+End { move-column-to-last; }
Mod+Ctrl+WheelScrollLeft { move-column-left; }
Mod+Ctrl+WheelScrollRight { move-column-right; }
Mod+Ctrl+Shift+WheelScrollUp { move-column-left; }
Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
// Move Windows within Column (Vertical)
Mod+Shift+J { move-window-down; }
Mod+Shift+Down { move-window-down; }
Mod+Shift+K { move-window-up; }
Mod+Shift+Up { move-window-up; }
// Sizing & Layout Constraints
Mod+Equal { set-column-width "+10%"; }
Mod+Minus { set-column-width "-10%"; }
Mod+Shift+Equal { set-window-height "+10%"; }
Mod+Shift+Minus { set-window-height "-10%"; }
Mod+R { switch-preset-column-width; }
Mod+Shift+R { switch-preset-window-height; }
Mod+Ctrl+R { reset-window-height; }
Mod+Ctrl+F { expand-column-to-available-width; }
Mod+F { maximize-column; }
Mod+Shift+F { fullscreen-window; }
// Positioning, Floating & Tiling States
Mod+C { center-column; }
Mod+Ctrl+C { center-visible-columns; }
Mod+W { toggle-column-tabbed-display; }
Mod+Shift+T { toggle-window-floating; }
Mod+Shift+V { switch-focus-between-floating-and-tiling; }
Mod+BracketLeft { consume-or-expel-window-left; }
Mod+BracketRight { consume-or-expel-window-right; }
Mod+Period { expel-window-from-column; }
// ========================================================================
// WORKSPACE MANAGEMENT
// ========================================================================
// Switch Workspace Focus
Mod+Page_Up { focus-workspace-up; }
Mod+I { focus-workspace-up; }
Mod+Page_Down { focus-workspace-down; }
Mod+U { focus-workspace-down; }
Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; }
Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; }
// Switch Workspace by Index
Mod+1 { focus-workspace 1; }
Mod+2 { focus-workspace 2; }
Mod+3 { focus-workspace 3; }
Mod+4 { focus-workspace 4; }
// Move Focused Column to Workspace
Mod+Ctrl+Up { move-column-to-workspace-up; }
Mod+Ctrl+I { move-column-to-workspace-up; }
Mod+Ctrl+Down { move-column-to-workspace-down; }
Mod+Ctrl+U { move-column-to-workspace-down; }
Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; }
Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
// Move Focused Column to Workspace Index
Mod+Shift+1 { move-column-to-workspace 1; }
Mod+Shift+2 { move-column-to-workspace 2; }
Mod+Shift+3 { move-column-to-workspace 3; }
Mod+Shift+4 { move-column-to-workspace 4; }
// Move Entire Workspace Position
Mod+Shift+Page_Up { move-workspace-up; }
Mod+Shift+I { move-workspace-up; }
Mod+Shift+Page_Down { move-workspace-down; }
Mod+Shift+U { move-workspace-down; }
// ========================================================================
// COMPOSITOR & SESSION CONTROLS
// ========================================================================
Mod+T hotkey-overlay-title="Open Terminal" { spawn "alacritty"; }
Mod+O repeat=false { toggle-overview; }
Mod+Tab repeat=false { toggle-overview; }
Mod+Slash { show-hotkey-overlay; }
Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
Mod+Shift+P { power-off-monitors; }
Mod+Shift+E { quit; }
}
-68
View File
@@ -1,68 +0,0 @@
-- Runs ./build.sh from vis's cwd (project root), logs the output for the
-- error picker (pickers.errors), and returns to vis on Enter/Esc.
local M = {}
-- last build's output; pickers.errors() reads it
M.log = '/tmp/vis-build.log'
-- single-quote a string for the shell
local function q(s) return "'" .. s:gsub("'", "'\\''") .. "'" end
-- write a raw escape sequence straight to the terminal
local function tty(s)
local t = io.open('/dev/tty', 'w')
if t then t:write(s) t:close() end
end
local function exists(path)
local f = io.open(path, 'r')
if f then f:close() end
return f ~= nil
end
-- args: flags passed through to build.sh, e.g. { 'run' }
function M.run(args)
if not exists('build.sh') then
vis:info('No build.sh in current directory')
return
end
-- save so the build sees your latest changes
local file = vis.win and vis.win.file
if file and file.modified and file.path then vis:command('w') end
local parts = {}
for _, a in ipairs(args or {}) do parts[#parts + 1] = q(a) end
local argstr = table.concat(parts, ' ')
local script = table.concat({
'saved=$(stty -g); stty sane',
-- script runs the build on a pty (colors stay on) and logs it to M.log
'script -qefc ' .. q('bash ./build.sh ' .. argstr) .. ' ' .. q(M.log),
'st=$?',
[[printf '\n[exit %s] enter/esc: back to vis ' "$st"]],
[[while IFS= read -rsn1 k; do [ -z "$k" ] || [ "$k" = $'\e' ] && break; done]],
'stty "$saved"',
}, '\n')
-- leave the alt screen and clear it, so each run starts fresh and the
-- output lands in normal scrollback; run; come back to vis
tty('\27[?1049l\27[H\27[2J')
os.execute('bash -c ' .. q(script) .. ' </dev/tty >/dev/tty 2>&1')
tty('\27[?1049h')
vis:redraw()
end
-- ---------------------------------------------------------------------------
-- events
-- ---------------------------------------------------------------------------
-- re-index tags in the background after saving an .odin file
-- (build.sh -t re-scans src and merges it with the cached stdlib tags)
vis.events.subscribe(vis.events.FILE_SAVE_POST, function(file, path) -- luacheck: no unused args
if path and path:match('%.odin$') and exists('build.sh') then
os.execute('bash ./build.sh -t </dev/null >/dev/null 2>&1 &')
end
end)
return M
-130
View File
@@ -1,130 +0,0 @@
-- Copyright 2026 Artur Ugnivenko. See LICENSE.
-- Odin LPeg lexer.
-- References:
-- https://odin-lang.org/spec/grammar/
-- https://pkg.odin-lang.org/base/builtin/
local lexer = lexer
local P, S, R = lpeg.P, lpeg.S, lpeg.R
local lex = lexer.new(...)
local ws = S(' \t')^0
local word_end = -(lexer.alnum + '_')
-- Keywords.
lex:add_rule('keyword', lex:tag(lexer.KEYWORD, lex:word_match(lexer.KEYWORD)))
-- Definitions: `name :: proc` and `Name :: struct / enum / union / distinct ...`.
local proc_def = lex:tag(lexer.FUNCTION, lexer.word) *
#(ws * '::' * ws * ('#' * lexer.word * ws)^0 * 'proc' * word_end)
local type_def = lex:tag(lexer.TYPE, lexer.word) *
#(ws * '::' * ws *
(P('struct') + 'enum' + 'union' + 'bit_set' + 'bit_field' + 'distinct') * word_end)
lex:add_rule('definition', proc_def + type_def)
-- Types.
lex:add_rule('type', lex:tag(lexer.TYPE, lex:word_match(lexer.TYPE)))
-- Polymorphic parameters: $T, $N.
lex:add_rule('poly', lex:tag(lexer.TYPE, '$' * lexer.word))
-- Functions.
local builtin_func = -lpeg.B('.') *
lex:tag(lexer.FUNCTION_BUILTIN, lex:word_match(lexer.FUNCTION_BUILTIN))
local func = lex:tag(lexer.FUNCTION, lexer.word)
lex:add_rule('function', (builtin_func + func) * #P('('))
-- Constants.
lex:add_rule('constant', lex:tag(lexer.CONSTANT_BUILTIN, lex:word_match(lexer.CONSTANT_BUILTIN)))
-- Variables.
lex:add_rule('variable',
lex:tag(lexer.VARIABLE_BUILTIN, lex:word_match(lexer.VARIABLE_BUILTIN)))
-- Identifiers.
lex:add_rule('identifier', lex:tag(lexer.IDENTIFIER, lexer.word))
-- Strings. Quoted strings end at the line; raw strings span lines, no escapes.
local sq_str = lexer.range("'", true)
local dq_str = lexer.range('"', true)
local raw_str = lexer.range('`', false, false)
lex:add_rule('string', lex:tag(lexer.STRING, sq_str + dq_str + raw_str))
-- Comments.
local comment = lexer.to_eol(P('//') + '#!')
local block_comment = lexer.range('/*', '*/', false, false, true)
local file_tag = lexer.to_eol('#+')
lex:add_rule('comment', lex:tag(lexer.COMMENT, comment + block_comment + file_tag))
-- Directives.
lex:add_rule('directive', lex:tag(lexer.PREPROCESSOR, '#' * S(' \t')^0 * lexer.word))
-- Attributes.
lex:add_rule('attribute', lex:tag(lexer.PREPROCESSOR, '@' * lexer.word^-1))
-- Numbers: 1_000_000, 1.5e-3, 0xff, 0b1010, 0o17, 0z1a (dozenal), 0h3f80_0000 (hex float), 2i.
local function digits(d) return d * (P('_')^-1 * d)^0 end
local dec = digits(lexer.digit)
local float = (dec * '.' * dec^-1 * -P('.') + '.' * dec) * (S('eE') * S('+-')^-1 * dec)^-1 +
dec * S('eE') * S('+-')^-1 * dec
local int = '0' * (
S('xh') * P('_')^-1 * digits(lexer.xdigit) +
'b' * P('_')^-1 * digits(S('01')) +
'o' * P('_')^-1 * digits(R('07')) +
'z' * P('_')^-1 * digits(R('09') + S('abAB'))) + dec
lex:add_rule('number', lex:tag(lexer.NUMBER, (float + int) * S('ijk')^-1))
-- Operators.
lex:add_rule('operator', lex:tag(lexer.OPERATOR, '..' + S('+-/*%<>!=^&|?~:;,.()[]{}')))
-- Fold points.
lex:add_fold_point(lexer.OPERATOR, '(', ')')
lex:add_fold_point(lexer.OPERATOR, '[', ']')
lex:add_fold_point(lexer.OPERATOR, '{', '}')
lex:add_fold_point(lexer.COMMENT, '/*', '*/')
-- Word lists.
lex:set_word_list(lexer.KEYWORD, {
'asm', 'auto_cast', 'bit_field', 'bit_set', 'break', 'case', 'cast', 'continue', 'defer',
'distinct', 'do', 'dynamic', 'else', 'enum', 'fallthrough', 'for', 'foreign', 'if', 'import',
'in', 'map', 'matrix', 'not_in', 'or_break', 'or_continue', 'or_else', 'or_return', 'package',
'proc', 'return', 'struct', 'switch', 'transmute', 'union', 'using', 'when', 'where'
})
lex:set_word_list(lexer.TYPE, {
'any', 'b8', 'b16', 'b32', 'b64', 'bool', 'byte', 'complex32', 'complex64', 'complex128',
'cstring', 'cstring16', 'f16', 'f16le', 'f16be', 'f32', 'f32le', 'f32be', 'f64', 'f64le', 'f64be',
'i8', 'i16', 'i16le', 'i16be', 'i32', 'i32le', 'i32be', 'i64', 'i64le', 'i64be', 'i128',
'i128le', 'i128be', 'int', 'quaternion64', 'quaternion128', 'quaternion256', 'rawptr', 'rune',
'string', 'string16', 'typeid', 'u8', 'u16', 'u16le', 'u16be', 'u32', 'u32le', 'u32be', 'u64',
'u64le', 'u64be', 'u128', 'u128le', 'u128be', 'uint', 'uintptr'
})
lex:set_word_list(lexer.FUNCTION_BUILTIN, {
-- compiler built-ins
'abs', 'align_of', 'cap', 'clamp', 'complex', 'compress_values', 'conj', 'expand_values', 'imag',
'jmag', 'kmag', 'len', 'max', 'min', 'offset_of', 'offset_of_by_string', 'offset_of_member',
'offset_of_selector', 'quaternion', 'raw_data', 'real', 'size_of', 'soa_unzip', 'soa_zip',
'swizzle', 'type_info_of', 'type_of', 'typeid_of',
-- base:runtime procs exported as @(builtin)
'append', 'assert', 'card', 'clear', 'copy', 'delete', 'delete_key', 'ensure', 'free',
'free_all', 'inject_at', 'make', 'new', 'new_clone', 'ordered_remove', 'panic', 'pop',
'pop_front', 'reserve', 'resize', 'shrink', 'unimplemented', 'unordered_remove', 'unreachable'
})
lex:set_word_list(lexer.CONSTANT_BUILTIN, {
'false', 'true', 'nil', 'ODIN_ARCH', 'ODIN_BUILD_MODE', 'ODIN_COMPILE_TIMESTAMP', 'ODIN_DEBUG',
'ODIN_DEFAULT_TO_NIL_ALLOCATOR', 'ODIN_DEFAULT_TO_PANIC_ALLOCATOR', 'ODIN_DISABLE_ASSERT',
'ODIN_ENDIAN', 'ODIN_ERROR_POS_STYLE', 'ODIN_NO_BOUNDS_CHECK', 'ODIN_NO_CRT',
'ODIN_NO_ENTRY_POINT', 'ODIN_NO_RTTI', 'ODIN_NO_TYPE_ASSERT', 'ODIN_OPTIMIZATION_MODE',
'ODIN_OS', 'ODIN_PLATFORM_SUBTARGET', 'ODIN_ROOT', 'ODIN_TEST', 'ODIN_VENDOR', 'ODIN_VERSION',
'ODIN_WINDOWS_SUBSYSTEM'
})
lex:set_word_list(lexer.VARIABLE_BUILTIN, {
'context', 'runtime'
})
return lex
-285
View File
@@ -1,285 +0,0 @@
-- pickers: fuzzy file finder, live ripgrep, build errors, yazi file manager, gitu.
local M = {}
-- height of the drop-down fzf panel at the top ('100%' = full screen)
M.height = '100%'
-- ---------------------------------------------------------------------------
-- shared constants
-- ---------------------------------------------------------------------------
local BAT = 'bat --theme=custom_zen --color=always --style=numbers'
local PREVIEW_FILE = BAT .. ' --line-range=:500 {}' -- {} = path
local PREVIEW_AT = BAT .. ' --highlight-line {2} {1}' -- {1}=path {2}=line
local KEYS_NAV = 'ctrl-n:down,ctrl-p:up'
local KEYS_PREVIEW = 'ctrl-/:toggle-preview,shift-up:preview-up,shift-down:preview-down'
-- an Odin error line (-error-pos-style:unix): path.odin:line:col: message
local ERROR_PATTERN = '^(.-%.odin):(%d+):(%d+):'
-- ---------------------------------------------------------------------------
-- helpers
-- ---------------------------------------------------------------------------
-- single-quote a string for the shell
local function q(s)
return "'" .. s:gsub("'", "'\\''") .. "'"
end
-- write a raw escape sequence straight to the terminal
local function tty_write(seq)
local tty = io.open('/dev/tty', 'w')
if tty then
tty:write(seq)
tty:close()
end
end
-- hand the terminal back to vis: re-enter the alt screen and repaint
local function restore_screen()
tty_write('\27[?1049h')
vis:redraw()
end
-- fzf command line: common flags + a list of extra options
local function fzf(prompt, opts)
return 'fzf --height=' .. M.height .. ' --layout=reverse --border'
.. ' --prompt ' .. q(prompt) .. ' ' .. table.concat(opts, ' ')
end
-- "--flag 'value'"
local function opt(flag, value)
return flag .. ' ' .. q(value)
end
-- run an fzf pipeline; returns its output lines and exit code
local function run_fzf(cmd)
-- --height mode draws from the cursor down, so start at the top-left
tty_write('\27[H')
local handle = io.popen(cmd)
if not handle then
vis:info('fzf: failed to start')
return nil
end
local lines = {}
for line in handle:lines() do table.insert(lines, line) end
local _, _, code = handle:close()
restore_screen()
return lines, code
end
-- open a path in the current window, unless it's already the current file.
-- returns false if the buffer has unsaved changes and nothing was opened
local function open_path(path)
local win = vis.win
local current = win and win.file and win.file.path
if current and (current == path or current:sub(-#path - 1) == '/' .. path) then
return true
end
if win and win.file and win.file.modified then
vis:info('Buffer has unsaved changes — :w first (or use :e! manually)')
return false
end
vis:command(string.format("e '%s'", path))
return true
end
-- ---------------------------------------------------------------------------
-- files: fuzzy-find a file, or create one from the query
-- enter open in the current window
-- ctrl-v open in a vertical split
-- alt-enter create a file named after the query
-- ctrl-n/p move down/up
-- ---------------------------------------------------------------------------
function M.files()
local cmd = 'fd --type f --hidden --exclude .git | ' .. fzf('files> ', {
'--print-query --expect=alt-enter,ctrl-v', -- output: query, key, choice
opt('--header', 'enter: open · alt-enter: new file · ctrl-v: vsplit'),
opt('--preview', PREVIEW_FILE),
opt('--preview-window', 'down:75%:border-top'),
opt('--bind', KEYS_NAV),
opt('--bind', KEYS_PREVIEW),
})
local out, code = run_fzf(cmd)
if not out or code == 130 then return end -- failed, or Esc / Ctrl-C
local query, key, choice = out[1], out[2], out[3]
local is_new = key == 'alt-enter' or not choice or choice == ''
local path = is_new and query or choice
if not path or path == '' then return end
if key == 'ctrl-v' then
vis:command(string.format("vsplit '%s'", path))
elseif not open_path(path) then
return
end
if is_new then
vis:info('New file: ' .. path .. ' (written to disk on :w)')
end
end
-- ---------------------------------------------------------------------------
-- grep: live ripgrep search across the project, jump to the match
-- M.grep() start empty, results appear as you type
-- M.grep_selection() visual mode: start with the selected text
-- ---------------------------------------------------------------------------
local function grep_with(query)
-- don't run rg on an empty query (it would match every line)
local reload = '[ -n {q} ] && rg --column --line-number --no-heading'
.. ' --color=always --smart-case --hidden --glob "!.git" -- {q} || true'
local opts = {
'--ansi --disabled', -- let rg do the matching, not fzf
'--delimiter :', -- fields: path:line:col:text
opt('--bind', 'change:reload:' .. reload),
opt('--preview', PREVIEW_AT),
opt('--preview-window', 'down:90%:border-top:+{2}/2'),
opt('--bind', KEYS_PREVIEW),
}
if query then
table.insert(opts, opt('--query', query))
table.insert(opts, opt('--bind', 'start:reload:' .. reload))
end
-- empty stdin: results only appear once there is a query
local out = run_fzf(': | ' .. fzf('rg> ', opts))
local choice = out and out[1]
if not choice or choice == '' then return end
choice = choice:gsub('\27%[[%d;]*m', '') -- strip colour codes
local path, line, col = choice:match('^(.-):(%d+):(%d+):')
if not path or not open_path(path) then return end
vis.win.selection:to(tonumber(line), tonumber(col))
end
function M.grep()
grep_with(nil)
end
function M.grep_selection()
local win = vis.win
local text
if win and win.file and win.selection.range then
text = win.file:content(win.selection.range)
end
-- leave visual mode before fzf takes over the screen
vis.mode = vis.modes.NORMAL
-- first line of the selection only; nothing usable -> plain grep
text = text and text:match('^[^\n]*')
if not text or text:match('^%s*$') then
grep_with(nil)
else
grep_with(text)
end
end
-- ---------------------------------------------------------------------------
-- errors: browse the errors from the last build (the log build.lua writes)
-- enter jump to the error
-- ---------------------------------------------------------------------------
function M.errors()
local f = io.open(require('build').log, 'r')
if not f then
vis:info('No build log yet — run a build first')
return
end
-- keep only the path.odin:line:col: lines; the log comes from a pty, so
-- strip colour escapes and carriage returns first
local errors = {}
for line in f:lines() do
local clean = line:gsub('\27%[[%d;?]*%a', ''):gsub('\r', '')
if clean:match(ERROR_PATTERN) then table.insert(errors, clean) end
end
f:close()
if #errors == 0 then
vis:info('No errors in the last build')
return
end
local tmp = os.tmpname()
f = io.open(tmp, 'w')
if not f then
vis:info('errors: cannot write temp file')
return
end
f:write(table.concat(errors, '\n'), '\n')
f:close()
local cmd = fzf('errors> ', {
'--no-sort', -- keep build order: the first error is the one to fix first
'--delimiter :',
opt('--preview', PREVIEW_AT),
opt('--preview-window', 'down:75%:border-top:+{2}/2'),
opt('--bind', KEYS_NAV),
opt('--bind', KEYS_PREVIEW),
}) .. ' < ' .. q(tmp)
local out = run_fzf(cmd)
os.remove(tmp)
local choice = out and out[1]
if not choice or choice == '' then return end
local path, line, col = choice:match(ERROR_PATTERN)
if not path or not open_path(path) then return end
vis.win.selection:to(tonumber(line), tonumber(col))
end
-- ---------------------------------------------------------------------------
-- fm: browse/create/rename/delete in yazi, then open the file you pick
-- ---------------------------------------------------------------------------
function M.fm()
local tmp = os.tmpname()
os.execute(string.format("yazi --chooser-file='%s' </dev/tty >/dev/tty 2>&1", tmp))
restore_screen()
local f = io.open(tmp, 'r')
local path = f and f:read('*l')
if f then f:close() end
os.remove(tmp)
if path and path ~= '' then open_path(path) end
end
-- ---------------------------------------------------------------------------
-- git: run gitu, then hand the screen back to vis
-- ---------------------------------------------------------------------------
function M.git()
tty_write('\27[?1049l')
os.execute('gitu </dev/tty >/dev/tty 2>&1')
restore_screen()
-- gitu may have changed files on disk (checkout, discard, stash, ...):
-- reload the current buffer if there's nothing unsaved to lose
local win = vis.win
if win and win.file and win.file.path and not win.file.modified then
vis:command('e!')
end
end
-- ---------------------------------------------------------------------------
-- events
-- ---------------------------------------------------------------------------
-- create missing parent directories on save, so a new file like
-- src/util/new.odin can be written even if src/util/ doesn't exist yet
vis.events.subscribe(vis.events.FILE_SAVE_PRE, function(file, path) -- luacheck: no unused args
local dir = path and path:match('^(.*)/[^/]+$')
if dir and dir ~= '' then
os.execute('mkdir -p ' .. q(dir))
end
return true
end)
return M
Submodule config/vis/plugins/vis-ctags deleted from 40a537beaf
-59
View File
@@ -1,59 +0,0 @@
-- vis-minimal-jellybeans-soft
-- Dark neutral background, warm off-white, and muted, low-brightness accents
local bg_dark = '#131313' -- Dark off-black background instead of harsh pure black
local black1 = '#303030'
local black2 = '#585858'
local offwhite0 = '#b9b9b9' -- Softened off-white base (reduces glare)
local offwhite1 = '#b0b0b0'
local offwhite2 = '#888888'
local clear0 = '#00000000'
-- Darkened, lower-contrast Jellybeans accents
local jelly_yellow_muted = '#d9b36a' -- Subdued warm yellow (Methods / Functions)
local jelly_blue_muted = '#75a0bc' -- Muted ice blue (Types / Classes)
local lexers = vis.lexers
-- Default Softened Base
lexers.STYLE_DEFAULT = 'back:'..clear0..',fore:'..offwhite0
lexers.STYLE_NOTHING = 'back:'..bg_dark
lexers.STYLE_COMMENT = 'fore:'..black2
lexers.STYLE_ERROR = 'fore:'..offwhite0
lexers.STYLE_WHITESPACE = ''
lexers.STYLE_EMBEDDED = 'back:'..black1
-- The ONLY Colored Highlights (Deepened / Softened)
lexers.STYLE_FUNCTION = 'fore:'..jelly_yellow_muted
lexers.STYLE_TYPE = 'fore:'..jelly_blue_muted
lexers.STYLE_CLASS = 'fore:'..jelly_blue_muted
-- Neutral / Off-White Text
lexers.STYLE_VARIABLE = 'fore:'..offwhite0
lexers.STYLE_IDENTIFIER = 'fore:'..offwhite0
lexers.STYLE_KEYWORD = 'fore:'..offwhite2
lexers.STYLE_CONSTANT = 'fore:'..offwhite0
lexers.STYLE_DEFINITION = 'fore:'..offwhite0
lexers.STYLE_LABEL = 'fore:'..offwhite0
lexers.STYLE_NUMBER = 'fore:'..offwhite1
lexers.STYLE_OPERATOR = 'fore:'..offwhite0
lexers.STYLE_REGEX = 'fore:'..offwhite1
lexers.STYLE_STRING = 'fore:'..offwhite1
lexers.STYLE_PREPROCESSOR= 'fore:'..offwhite0
lexers.STYLE_TAG = 'fore:'..offwhite0
-- Editor Interface UI
lexers.STYLE_LINENUMBER = 'fore:'..black2
lexers.STYLE_LINENUMBER_CURSOR = 'fore:'..offwhite1
lexers.STYLE_CURSOR = 'back:'..offwhite2
lexers.STYLE_CURSOR_PRIMARY = lexers.STYLE_CURSOR..',fore:'..bg_dark
lexers.STYLE_CURSOR_LINE = 'underlined'
lexers.STYLE_COLOR_COLUMN = 'back:'..black1
lexers.STYLE_SELECTION = 'back:'..black1
lexers.STYLE_STATUS = 'reverse'
lexers.STYLE_STATUS_FOCUSED = 'back:'..black1..',fore:'..offwhite1
lexers.STYLE_SEPARATOR = lexers.STYLE_DEFAULT
lexers.STYLE_INFO = 'fore:default,back:default'
lexers.STYLE_EOF = ''
-36
View File
@@ -1,36 +0,0 @@
local lexers = vis.lexers
lexers.STYLE_DEFAULT = 'fore:#d7d7d7,back:#131313'
lexers.STYLE_NOTHING = ''
lexers.STYLE_CLASS = 'fore:#c4bd97'
lexers.STYLE_COMMENT = 'fore:#7d6d5d'
lexers.STYLE_CONSTANT = 'fore:#cdadad,bold'
lexers.STYLE_DEFINITION = 'fore:#f2d1af,bold'
lexers.STYLE_ERROR = 'fore:#8bc8aa,back:#303030,bold'
lexers.STYLE_FUNCTION = 'fore:#7a96b0'
lexers.STYLE_KEYWORD = 'fore:#787879,bold'
lexers.STYLE_LABEL = 'fore:#7a96b0'
lexers.STYLE_NUMBER = 'fore:#87d7d7'
lexers.STYLE_OPERATOR = 'fore:#d5ce90'
lexers.STYLE_REGEX = 'fore:#d0c195'
lexers.STYLE_STRING = 'fore:#6c836c'
lexers.STYLE_PREPROCESSOR = 'fore:#f2d1af,bold'
lexers.STYLE_TAG = 'fore:#cdadad,bold'
lexers.STYLE_TYPE = 'fore:#7a96b0,bold'
lexers.STYLE_VARIABLE = 'fore:#c9ba9c'
lexers.STYLE_WHITESPACE = ''
lexers.STYLE_EMBEDDED = 'fore:#c09494'
lexers.STYLE_IDENTIFIER = ''
lexers.STYLE_LINENUMBER = 'fore:#585858'
lexers.STYLE_LINENUMBER_CURSOR = 'fore:#666666'
lexers.STYLE_CURSOR = 'back:#585858,keep_attribute'
lexers.STYLE_CURSOR_PRIMARY = 'fore:#1c1c1c,back:#87afaf,bold,keep_attribute'
lexers.STYLE_CURSOR_LINE = 'back:#444444,keep_attribute'
lexers.STYLE_COLOR_COLUMN = 'back:#444444'
lexers.STYLE_SELECTION = 'back:#4a604a'
lexers.STYLE_STATUS = 'back:#262626,fore:#6c836c'
lexers.STYLE_STATUS_FOCUSED = 'back:#303030,fore:#cacaca,bold'
lexers.STYLE_SEPARATOR = ''
lexers.STYLE_INFO = ''
lexers.STYLE_EOF = 'fore:#585858'
-108
View File
@@ -1,108 +0,0 @@
require('vis')
require('plugins/vis-ctags')
local build = require('build')
local pickers = require('pickers')
-- ---------------------------------------------------------------------------
-- Global options, key mappings and commands
-- ---------------------------------------------------------------------------
vis.events.subscribe(vis.events.INIT, function()
vis:command('set escdelay 1')
vis:command('set autoindent off')
vis:command('set ignorecase on')
vis:command('set theme custom_zen')
-- jump list
vis:map(vis.modes.NORMAL, "<M-j>", "g>")
vis:map(vis.modes.NORMAL, "<M-k>", "g<")
-- pickers
vis:map(vis.modes.NORMAL, '<C-p>', pickers.files, 'Fuzzy find / create a file')
vis:map(vis.modes.NORMAL, '<C-f>', pickers.grep, 'Live grep the project with ripgrep')
vis:map(vis.modes.VISUAL, '<C-f>', pickers.grep_selection, 'Live grep for the selected text')
vis:map(vis.modes.NORMAL, '<C-e>', pickers.fm, 'terminal file manager')
vis:map(vis.modes.NORMAL, '<M-e>', pickers.errors, 'Browse errors from the last build')
-- picker commands
vis:command_register('files', function() pickers.files() return true end, 'Fuzzy find / create a file')
vis:command_register('grep', function() pickers.grep() return true end, 'Live grep the project with ripgrep')
vis:command_register('fm', function() pickers.fm() return true end, 'Pick a file with a terminal file manager')
vis:command_register('git', function() pickers.git() return true end, 'Open gitu')
vis:command_register('errors', function() pickers.errors() return true end, 'Browse errors from the last build')
-- build.sh setup
vis:map(vis.modes.NORMAL, '<C-b>', function() build.run({}) end, 'Run ./build.sh')
vis:command_register('build', function(argv)
local args = {}
for i = 1, #argv do table.insert(args, argv[i]) end
build.run(args)
return true
end, 'Run ./build.sh with optional flags, e.g :build run')
-- system clipboard
local function clip_copy()
vis:feedkeys(':>wl-copy 2>/dev/null<Enter>')
vis:feedkeys('<Escape>') -- drop the selection / leave visual mode
end
local function clip_paste()
vis:feedkeys(':<wl-paste --no-newline<Enter>')
vis:feedkeys('<Escape>') -- clear any selection left on the pasted text
end
vis:map(vis.modes.VISUAL, '<C-c>', clip_copy, 'Copy selection to system clipboard')
vis:map(vis.modes.VISUAL, '<C-v>', clip_paste, 'Paste system clipboard at cursor')
vis:map(vis.modes.NORMAL, '<C-v>', clip_paste, 'Paste system clipboard at cursor')
-- ctag navigation
vis:map(vis.modes.NORMAL, 'gd', '<C-]>', 'Go to definition (ctags picker)')
end)
-- ---------------------------------------------------------------------------
-- Per-window options
-- ---------------------------------------------------------------------------
vis.events.subscribe(vis.events.WIN_OPEN, function(win)
vis:command('set tabwidth 4')
vis:command('set expandtab on')
vis:command('set number on')
end)
-- ---------------------------------------------------------------------------
-- Syntax highlighting: ~/.config/vis/lexers/odin.lua
-- ---------------------------------------------------------------------------
if vis.ftdetect then
-- vis 0.9 and earlier
if vis.ftdetect.filetypes then
vis.ftdetect.filetypes.odin = { ext = { '%.odin$' } }
end
end
-- ---------------------------------------------------------------------------
-- On save: strip trailing spaces/tabs and extra blank lines at the end of
-- the file. Skips files where trailing whitespace means something.
-- ---------------------------------------------------------------------------
local keep_whitespace = { md = true, markdown = true, diff = true, patch = true }
vis.events.subscribe(vis.events.FILE_SAVE_PRE, function(file, path)
local ext = path and path:match('%.(%w+)$')
if ext and keep_whitespace[ext:lower()] then return true end
-- trailing spaces/tabs (not \r, so CRLF files stay CRLF);
-- read every line first, then rewrite only the ones that changed
local trimmed, n = {}, 0
for line in file:lines_iterator() do
n = n + 1
local s = line:find('[ \t]+$')
if s then trimmed[n] = line:sub(1, s - 1) end
end
for i, line in pairs(trimmed) do file.lines[i] = line end
-- blank lines at the end: keep exactly one final newline
local size = file.size
local tail = file:content(math.max(0, size - 256), math.min(size, 256))
local extra = tail:match('\n(\n+)$')
if extra then file:delete(size - #extra, #extra) end
return true
end)
-119
View File
@@ -1,119 +0,0 @@
[app]
overall = { bg = "#131313" }
[icon]
dirs = []
prepend_conds = [ { if = "dir", text = ">", fg = "#7a96b0" } ]
[mgr]
cwd = { fg = "#7a96b0", bold = true }
find_keyword = { fg = "#f2d1af", bold = true }
find_position = { fg = "#87d7d7" }
symlink_target = { fg = "#87afaf", italic = true }
marker_copied = { fg = "#6c836c", bg = "#6c836c" }
marker_cut = { fg = "#cdadad", bg = "#cdadad" }
marker_marked = { fg = "#f2d1af", bg = "#f2d1af" }
marker_selected = { fg = "#7a96b0", bg = "#7a96b0" }
count_copied = { fg = "#131313", bg = "#6c836c" }
count_cut = { fg = "#131313", bg = "#cdadad" }
count_selected = { fg = "#131313", bg = "#7a96b0" }
border_style = { fg = "#585858" }
# code preview uses the same theme file as bat
syntect_theme = "/home/jason/.config/bat/themes/custom_zen.tmTheme"
[indicator]
parent = { bg = "#303030" }
current = { bg = "#444444" }
preview = { bg = "#303030" }
[tabs]
active = { fg = "#131313", bg = "#7a96b0", bold = true }
inactive = { fg = "#d7d7d7", bg = "#303030" }
[mode]
normal_main = { fg = "#131313", bg = "#7a96b0", bold = true }
normal_alt = { fg = "#7a96b0", bg = "#303030" }
select_main = { fg = "#131313", bg = "#6c836c", bold = true }
select_alt = { fg = "#6c836c", bg = "#303030" }
unset_main = { fg = "#131313", bg = "#cdadad", bold = true }
unset_alt = { fg = "#cdadad", bg = "#303030" }
[status]
overall = { fg = "#d7d7d7", bg = "#262626" }
perm_sep = { fg = "#585858" }
perm_type = { fg = "#7a96b0" }
perm_read = { fg = "#a0a0a0" }
perm_write = { fg = "#cdadad" }
perm_exec = { fg = "#6c836c" }
progress_label = { fg = "#d7d7d7", bold = true }
progress_normal = { fg = "#7a96b0", bg = "#303030" }
progress_error = { fg = "#cdadad", bg = "#303030" }
[which]
border = { fg = "#585858" }
mask = { bg = "#262626" }
cand = { fg = "#87d7d7" }
rest = { fg = "#585858" }
desc = { fg = "#a0a0a0" }
separator_style = { fg = "#585858" }
[confirm]
border = { fg = "#7a96b0" }
title = { fg = "#7a96b0" }
btn_yes = { fg = "#131313", bg = "#7a96b0" }
btn_no = { fg = "#d7d7d7", bg = "#303030" }
[spot]
border = { fg = "#7a96b0" }
title = { fg = "#7a96b0" }
tbl_col = { fg = "#7a96b0" }
tbl_cell = { fg = "#d7d7d7", bg = "#444444" }
[notify]
title_info = { fg = "#6c836c" }
title_warn = { fg = "#f2d1af" }
title_error = { fg = "#cdadad" }
[pick]
border = { fg = "#7a96b0" }
active = { fg = "#cdadad", bold = true }
[input]
border = { fg = "#7a96b0" }
selected = { bg = "#4a604a" }
[cmp]
border = { fg = "#7a96b0" }
active = { bg = "#444444" }
[tasks]
border = { fg = "#7a96b0" }
hovered = { fg = "#cdadad", underline = true }
[help]
border = { fg = "#585858" }
chord = { fg = "#87d7d7" }
action = { fg = "#6c836c" }
hovered = { bg = "#444444" }
[filetype]
rules = [
# images
{ mime = "image/*", fg = "#87d7d7" },
# audio / video
{ mime = "{audio,video}/*", fg = "#f2d1af" },
# archives
{ mime = "application/{zip,gzip,x-tar,x-bzip*,x-xz,x-7z-compressed,x-rar}", fg = "#cdadad" },
# documents
{ mime = "application/{pdf,doc,rtf}", fg = "#a0a0a0" },
# special files
{ url = "*", is = "orphan", fg = "#131313", bg = "#cdadad" },
{ url = "*", is = "exec", fg = "#6c836c" },
# directories
{ url = "*/", fg = "#7a96b0" },
]
-8
View File
@@ -1,8 +0,0 @@
{
"folders":
[
{
"path": "."
}
]
}
-516
View File
@@ -1,516 +0,0 @@
{
"auto_complete":
{
"selected_items":
[
]
},
"buffers":
[
{
"file": "config/fish/config.fish",
"file_size": 4388,
"file_write_time": 134353912965388191,
"settings":
{
"buffer_size": 4386,
"encoding": "UTF-8",
"line_ending": "Unix"
},
"undo_stack":
[
[
12,
1,
"nv_vi_o",
{
"count": 1,
"mode": "mode_internal_normal",
"register": "\""
},
"AQAAAOgCAAAAAAAA6QIAAAAAAAAAAAAA",
"CgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAA0wIAAAAAAADTAgAAAAAAAAAAAAAAAPC/"
],
[
14,
1,
"nv_vi_paste",
{
"before_cursor": false,
"count": 1,
"mode": "mode_internal_normal",
"register": "\""
},
"AQAAAOoCAAAAAAAAIAMAAAAAAAAAAAAA",
"CgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAA6QIAAAAAAADpAgAAAAAAAAAAAAAAAPC/"
],
[
17,
1,
"nv_vi_d",
{
"count": 1,
"mode": "mode_visual_line",
"register": "\""
},
"AQAAAOkCAAAAAAAA6QIAAAAAAAABAAAACg",
"CgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAA6QIAAAAAAADqAgAAAAAAAAAAAAAAAPC/"
],
[
18,
1,
"nv_vi_o",
{
"count": 1,
"mode": "mode_internal_normal",
"register": "\""
},
"AQAAAB8DAAAAAAAAIAMAAAAAAAAAAAAA",
"CgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAA6QIAAAAAAADpAgAAAAAAAAAAAAAAAPC/"
],
[
30,
1,
"sequence",
{
"commands":
[
[
"nv_vi_c",
{
"count": 1,
"mode": "mode_visual",
"register": "\""
}
],
[
"insert",
{
"characters": "home/jason/"
}
],
[
"insert",
{
"characters": "ThirdPart"
}
],
[
"insert",
{
"characters": "y/ols"
}
]
]
},
"GgAAAAYDAAAAAAAABgMAAAAAAAAQAAAAcGF0aC90by9vbHMvcmVwbwYDAAAAAAAABwMAAAAAAAAAAAAABwMAAAAAAAAIAwAAAAAAAAAAAAAIAwAAAAAAAAkDAAAAAAAAAAAAAAkDAAAAAAAACgMAAAAAAAAAAAAACgMAAAAAAAALAwAAAAAAAAAAAAALAwAAAAAAAAwDAAAAAAAAAAAAAAwDAAAAAAAADQMAAAAAAAAAAAAADQMAAAAAAAAOAwAAAAAAAAAAAAAOAwAAAAAAAA8DAAAAAAAAAAAAAA8DAAAAAAAAEAMAAAAAAAAAAAAAEAMAAAAAAAARAwAAAAAAAAAAAAARAwAAAAAAABIDAAAAAAAAAAAAABIDAAAAAAAAEwMAAAAAAAAAAAAAEwMAAAAAAAAUAwAAAAAAAAAAAAAUAwAAAAAAABUDAAAAAAAAAAAAABUDAAAAAAAAFgMAAAAAAAAAAAAAFgMAAAAAAAAXAwAAAAAAAAAAAAAXAwAAAAAAABgDAAAAAAAAAAAAABgDAAAAAAAAGQMAAAAAAAAAAAAAGQMAAAAAAAAaAwAAAAAAAAAAAAAaAwAAAAAAABsDAAAAAAAAAAAAABsDAAAAAAAAHAMAAAAAAAAAAAAAHAMAAAAAAAAdAwAAAAAAAAAAAAAdAwAAAAAAAB4DAAAAAAAAAAAAAB4DAAAAAAAAHwMAAAAAAAAAAAAA",
"CgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPC/AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8L8AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwvwAAAAABAAAABgMAAAAAAAAWAwAAAAAAAAAAAAAAAPC/"
],
[
17,
1,
"nv_vi_d",
{
"count": 1,
"mode": "mode_visual",
"register": "\""
},
"AQAAAGYFAAAAAAAAZgUAAAAAAAAEAAAAZmluZA",
"AQAAAAAAAAABAAAAZgUAAAAAAABqBQAAAAAAAAAAAAAAAPC/"
]
]
},
{
"file": "config/vim/vimrc",
"file_size": 2854,
"file_write_time": 134345438284510269,
"settings":
{
"buffer_size": 2854,
"line_ending": "Unix"
},
"undo_stack":
[
]
}
],
"build_system": "",
"build_system_choices":
[
],
"build_varint": "",
"command_palette":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
[
"lsp res",
"LSP: Restart Server"
],
[
"lsp",
"Preferences: LSP Server Configurations"
],
[
"setting",
"Preferences: Settings"
],
[
"set",
"Selection: Expand to Block"
],
[
"lsp se",
"Preferences: LSP Server Configurations"
],
[
"lsp server",
"Preferences: LSP Server Configurations"
],
[
"inst",
"Package Control: Install Package"
],
[
"key",
"Preferences: Key Bindings"
],
[
"remo",
"Package Control: Remove Package"
],
[
"color",
"UI: Select Color Scheme"
],
[
"insta",
"Package Control: Install Package"
],
[
"remove",
"Package Control: Remove Package"
],
[
"theme",
"UI: Customize Theme"
],
[
"instal",
"Package Control: Install Package"
],
[
"color scheme",
"UI: Select Color Scheme"
],
[
"cust",
"UI: Customize Color Scheme"
],
[
"settings",
"Preferences: Settings"
],
[
"pack",
"Package Control: Install Package"
],
[
"list pac",
"Package Control: List Packages"
],
[
"package inst",
"Package Control: Install Package"
]
],
"width": 0.0
},
"console":
{
"height": 124.0,
"history":
[
]
},
"distraction_free":
{
"menu_visible": true,
"show_minimap": false,
"show_open_files": false,
"show_tabs": false,
"side_bar_visible": false,
"status_bar_visible": false
},
"expanded_folders":
[
"/home/jason/Projects/dotfiles",
"/home/jason/Projects/dotfiles/config"
],
"file_history":
[
"/home/jason/Projects/Games/pong_raylib/src/audio_manager.odin",
"/home/jason/Projects/Games/pong_raylib/src/main.odin",
"/home/jason/Projects/Games/pong_raylib/src/entity_player.odin",
"/home/jason/.config/sublime-text/Packages/User/LanguageServers.sublime-settings",
"/home/jason/.config/sublime-text/Packages/LSP/LanguageServers.sublime-settings",
"/home/jason/.config/sublime-text/Packages/User/Mariana.sublime-color-scheme",
"/home/jason/.config/sublime-text/Packages/Color Scheme - Default/Mariana.sublime-color-scheme"
],
"find":
{
"height": 42.0
},
"find_in_files":
{
"height": 158.0,
"where_history":
[
]
},
"find_state":
{
"case_sensitive": false,
"find_history":
[
],
"highlight": true,
"in_selection": false,
"preserve_case": false,
"regex": false,
"replace_history":
[
],
"reverse": false,
"scrollbar_highlights": true,
"show_context": true,
"use_buffer2": true,
"use_gitignore": true,
"whole_word": false,
"wrap": true
},
"groups":
[
{
"sheets":
[
{
"buffer": 0,
"file": "config/fish/config.fish",
"selected": true,
"semi_transient": false,
"settings":
{
"buffer_size": 4386,
"regions":
{
},
"selection":
[
[
1382,
1382
]
],
"settings":
{
"_nv_visual_sel_mode": "mode_visual",
"lsp_uri": "file:///home/jason/Projects/dotfiles/config/fish/config.fish",
"syntax": "Packages/Text/Plain text.tmLanguage",
"tab_size": 4,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 792.0,
"zoom_level": 1.0
},
"stack_index": 0,
"stack_multiselect": false,
"type": "text"
},
{
"buffer": 1,
"file": "config/vim/vimrc",
"semi_transient": false,
"settings":
{
"buffer_size": 2854,
"regions":
{
},
"selection":
[
[
0,
0
]
],
"settings":
{
"highlight_line": false,
"lsp_uri": "file:///home/jason/Projects/dotfiles/config/vim/vimrc",
"syntax": "Packages/Text/Plain text.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 1,
"stack_multiselect": false,
"type": "text"
}
]
}
],
"incremental_find":
{
"height": 42.0
},
"input":
{
"height": 59.0
},
"layout":
{
"cells":
[
[
0,
0,
1,
1
]
],
"cols":
[
0.0,
1.0
],
"rows":
[
0.0,
1.0
]
},
"menu_visible": true,
"output.LSP Log Panel":
{
"height": 0.0,
"history":
[
]
},
"output.diagnostics":
{
"height": 0.0,
"history":
[
]
},
"output.exec":
{
"height": 1123.0,
"history":
[
]
},
"output.find_results":
{
"height": 0.0,
"history":
[
]
},
"output.mdpopups":
{
"height": 0.0,
"history":
[
]
},
"pinned_build_system": "",
"project": "dotfiles.sublime-project",
"replace":
{
"height": 80.0
},
"save_all_on_build": true,
"select_file":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
[
"fish",
"config/fish/config.fish"
],
[
"main",
"src/main.odin"
],
[
"ene",
"src/entity_player.odin"
]
],
"width": 0.0
},
"select_project":
{
"height": 500.0,
"last_filter": "peb",
"selected_items":
[
[
"peb",
"~/Projects/pebble/pebble.sublime-project"
],
[
"min",
"~/Projects/min_editor/min_editor.sublime-project"
],
[
"",
"~/Projects/dotfiles/dotfiles.sublime-project"
],
[
"pong",
"~/Projects/pong_raylib/pong_odin.sublime-project"
],
[
"dot",
"~/Projects/dotfiles/dotfiles.sublime-project"
]
],
"width": 380.0
},
"select_symbol":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"selected_group": 0,
"settings":
{
"_vintageous_reset_during_init": true,
"lsp_show_inlay_hints": false
},
"show_minimap": true,
"show_open_files": false,
"show_tabs": false,
"side_bar_visible": true,
"side_bar_width": 328.0,
"status_bar_visible": true,
"template_settings":
{
}
}
+5 -8
View File
@@ -84,12 +84,9 @@ if [ "$DO_LINKS" = true ]; then
SKIPPED=0
# Modern shell & editor setup
link_file "$DOTFILES_DIR/config/niri/config.kdl" "$HOME/.config/niri/config.kdl"
link_file "$DOTFILES_DIR/config/niri/dms/binds.kdl" "$HOME/.config/niri/dms/binds.kdl"
link_file "$DOTFILES_DIR/config/fish/config.fish" "$HOME/.config/fish/config.fish"
link_file "$DOTFILES_DIR/config/kanata" "$HOME/.config/kanata"
link_file "$DOTFILES_DIR/config/vis" "$HOME/.config/vis"
link_file "$DOTFILES_DIR/config/yazi" "$HOME/.config/yazi"
link_file "$DOTFILES_DIR/config/emacs" "$HOME/.config/emacs"
link_file "$DOTFILES_DIR/scripts/bin" "$HOME/.local/bin"
echo ""
@@ -152,11 +149,11 @@ if [ "$DO_INSTALL" = true ]; then
# network & download
wget curl ca-certificates gnupg rsync
# core utilities & CLI tools
git vis yazi fd jq fzf ripgrep tree direnv make
bat ark unzip p7zip tar gzip bzip2 xz kanata
git fd jq fzf ripgrep tree direnv make
bat unzip 7zip tar gzip bzip2 xz ark
# build & dev tools
alacritty base-devel valgrind tree-sitter-cli go nodejs
# cli text editing
emacs-x11 alacritty base-devel valgrind
xfce4-screenshooter xkill xdotool wmctrl
)
MISSING_PACKAGES=()