From 72a49d5e1c758e9b9e1114a9ae21345f6cc6e8c5 Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Tue, 3 Jun 2025 17:43:31 -0400 Subject: [PATCH] helix config --- config/.bashrc | 7 ++-- config/.config/dconf/user.txt | 14 +++++--- config/.config/helix/config.toml | 39 +++++++++++++++++++++++ config/.config/helix/languages.toml | 6 ++++ config/.config/kak/kakrc | 22 ++++++++++--- config/.config/nvim/after/plugin/lsp.lua | 8 ++--- config/.config/nvim/lua/config/packer.lua | 11 +++++-- config/.config/river/init | 2 +- config/.doom.d/custom.el | 11 +++++-- 9 files changed, 98 insertions(+), 22 deletions(-) create mode 100644 config/.config/helix/config.toml create mode 100755 config/.config/helix/languages.toml diff --git a/config/.bashrc b/config/.bashrc index 03be2a1..27c6818 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -17,6 +17,8 @@ PATH=$PATH:~/.nimble/bin/ PATH=$PATH:~/Documents/suckless/dylan/opendylan-2024.1/bin PATH=$PATH:~/.config/emacs/bin/ PATH=$PATH:~/.mint/bin/ +PATH=$PATH:~/glamoroustoolkit/bin/ +PATH=$PATH:~/Documents/Projects/Cuis-Smalltalk-Dev/ # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options HISTCONTROL=ignoreboth @@ -150,6 +152,7 @@ eval "$(fzf --bash)" export TMUX_TMPDIR=/tmp export TINTED_SHELL_ENABLE_BASE16_VARS=1 +export PKG_CONFIG_PATH=/usr/local/share/pkgconfig/:$PKG_CONFIG_PATH tinty_source_shell_theme() { tinty $@ @@ -184,8 +187,8 @@ elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then SESH="$(tmux display-message -p '#S')" # alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH' alias kak=run_kak - alias vidir='EDITOR="/usr/bin/kak -c $SESH 2/dev/null || /usr/bin/kak -s $SESH" vidir' - alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null|| /usr/bin/kak -s $SESH" vipe' + alias vidir='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vidir' + alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vipe' fi # if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then diff --git a/config/.config/dconf/user.txt b/config/.config/dconf/user.txt index 90d6fd7..54451bf 100644 --- a/config/.config/dconf/user.txt +++ b/config/.config/dconf/user.txt @@ -1625,7 +1625,7 @@ selected-color=(true, 0.64666666666666672, 0.23711111111111116, 0.23711111111111 clock-format='12h' date-format='regular' location-mode='path-bar' -show-hidden=true +show-hidden=false show-size-column=true show-type-column=true sidebar-width=202 @@ -1633,8 +1633,8 @@ sort-column='name' sort-directories-first=false sort-order='ascending' type-format='category' -window-position=(26, 23) -window-size=(1512, 1339) +window-position=(20, 20) +window-size=(2040, 1335) [org/virt-manager/virt-manager] manager-window-height=1388 @@ -1970,8 +1970,8 @@ midi-backend='jack' [org/zrythm/Zrythm/ui] jack-transport-type='none' main-window-is-maximized=true -main-window-height=480 -main-window-width=640 +main-window-height=576 +main-window-width=945 [org/zrythm/Zrythm/ui/plugin-browser] plugin-browser-collections=@as [] @@ -2617,3 +2617,7 @@ window-width=1000 window-fullscreen=false window-height=700 window-maximized=false + +[ar/xjuan/Cambalache/state/window] +state=uint32 0 +size=(1071, 645) diff --git a/config/.config/helix/config.toml b/config/.config/helix/config.toml new file mode 100644 index 0000000..cc755cb --- /dev/null +++ b/config/.config/helix/config.toml @@ -0,0 +1,39 @@ +theme = "rose_pine" + +[editor] +line-number = "relative" +rulers = [80] +color-modes = true +completion-trigger-len = 1 +idle-timeout = 50 + +[editor.statusline] +left = [] +center = [] +right = ["spinner", "diagnostics", "version-control", "file-modification-indicator", "file-name", "file-encoding", "read-only-indicator", "position", "mode", "selections", "spacer"] +mode.normal = "normal" +mode.insert = "insert" +mode.select = "select" + +[editor.lsp] +display-inlay-hints = true +display-messages = true +display-progress-messages = true + +[editor.cursor-shape] +normal = "block" +insert = "bar" +select = "underline" + +[editor.indent-guides] +render = true + +[keys.normal."space".e] # config mode +c = ":config-open" +l = ":e ~/.config/helix/languages.toml" +r = ":config-reload" + +[keys.normal.g] +j = "goto_last_line" +k = "goto_file_start" +e = "goto_file_end" diff --git a/config/.config/helix/languages.toml b/config/.config/helix/languages.toml new file mode 100755 index 0000000..34e758f --- /dev/null +++ b/config/.config/helix/languages.toml @@ -0,0 +1,6 @@ +[[languages]] +indent = { tab-width = 2, unit = " " } + +[language-server.harper-ls] +command = "harper-ls" +args = ["--stdio"] diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc index c6f9a35..496b89a 100644 --- a/config/.config/kak/kakrc +++ b/config/.config/kak/kakrc @@ -53,7 +53,7 @@ set-option global luar_interpreter luajit # eval %sh{ kak-tree-sitter -dksvvv --with-highlighting --with-text-objects --init $kak_session } #eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session } #eval %sh{ kak-tree-sitter -dks --with-highlighting --session $kak_session } -eval %sh{ kak-tree-sitter -dksvvvv --init $kak_session } +#eval %sh{ kak-tree-sitter -dksvvvv --init $kak_session } # evaluate-commands %sh{ # echo "colorscheme base16-$BASE16_THEME" # } @@ -201,10 +201,24 @@ define-command sleuth-disable -docstring 'Disable sleuth' %{ } ## LSP ## -lsp-enable -lsp-auto-hover-enable +# lsp-enable +# lsp-inlay-diagnostics-enable global +hook global WinSetOption filetype=(c|zig|python|ruby|lua|java|html|css|swift) %{ + # set-option window lsp_auto_highlight_references true + set-option window lsp_hover_anchor true + lsp-auto-hover-enable + lsp-auto-hover-insert-mode-enable + lsp-enable-window +} + +hook global WinSetOption filetype=(rust) %{ + # set-option window lsp_auto_highlight_references true + set-option window lsp_hover_anchor true + lsp-auto-hover-enable + # lsp-auto-hover-insert-mode-enable + lsp-enable-window +} -lsp-inlay-diagnostics-enable global hook global WinSetOption filetype=(c|zig|rust|python|ruby|lua|java|html|css) %{ hook window -group semantic-tokens BufReload .* lsp-semantic-tokens hook window -group semantic-tokens NormalIdle .* lsp-semantic-tokens diff --git a/config/.config/nvim/after/plugin/lsp.lua b/config/.config/nvim/after/plugin/lsp.lua index c39922b..850e374 100755 --- a/config/.config/nvim/after/plugin/lsp.lua +++ b/config/.config/nvim/after/plugin/lsp.lua @@ -1,12 +1,6 @@ local lsp = require('lsp-zero') local lsp_config = require("lspconfig") -lsp.preset('recommended') - -lsp.ensure_installed({ - 'lua_ls', -}) - --Enable (broadcasting) snippet capability for completion local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true @@ -31,6 +25,8 @@ lsp_config.hls.setup{} lsp_config.clojure_lsp.setup{} +lsp_config.clangd.setup{} + lsp_config.sourcekit.setup{} local cmp = require("cmp") diff --git a/config/.config/nvim/lua/config/packer.lua b/config/.config/nvim/lua/config/packer.lua index a41a7c6..e4bfa81 100755 --- a/config/.config/nvim/lua/config/packer.lua +++ b/config/.config/nvim/lua/config/packer.lua @@ -103,13 +103,20 @@ return require('packer').startup(function(use) -- use 'mbbill/undotree' + use { + 'mason-org/mason.nvim', + config = function() + require('mason').setup() + end, + } + use { 'VonHeikemen/lsp-zero.nvim', requires = { -- LSP Support { 'neovim/nvim-lspconfig' }, - { 'williamboman/mason.nvim' }, - { 'williamboman/mason-lspconfig.nvim' }, + { 'mason-org/mason.nvim' }, + { 'mason-org/mason-lspconfig.nvim' }, -- Autocompletion { 'hrsh7th/nvim-cmp' }, diff --git a/config/.config/river/init b/config/.config/river/init index 60f3c16..03e0013 100755 --- a/config/.config/river/init +++ b/config/.config/river/init @@ -174,5 +174,5 @@ swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper & # pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'Ubuntu:size=14' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2 pipewire-launch & waybar & -wlr-randr --output DP-1 --adaptive-sync enabled --mode 2560x1440@165Hz +wlr-randr --output DP-2 --adaptive-sync enabled --mode 2560x1440@165Hz dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP='river' diff --git a/config/.doom.d/custom.el b/config/.doom.d/custom.el index 687e9de..03b01ec 100644 --- a/config/.doom.d/custom.el +++ b/config/.doom.d/custom.el @@ -10,9 +10,16 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("56044c5a9cc45b6ec45c0eb28df100d3f0a576f18eef33ff8ff5d32bac2d9700" "48042425e84cd92184837e01d0b4fe9f912d875c43021c3bcb7eeb51f1be5710" "09e98c608045c7778c67d5671161cfbb741cc25350abe61e3eb2ce798bb88209" "691d671429fa6c6d73098fc6ff05d4a14a323ea0a18787daeb93fde0e48ab18b" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "8c7e832be864674c220f9a9361c851917a93f921fedb7717b1b5ece47690c098" "e4a702e262c3e3501dfe25091621fe12cd63c7845221687e36a79e17cf3a67e0" "f5f80dd6588e59cfc3ce2f11568ff8296717a938edd448a947f9823a4e282b66" default)) + '("56044c5a9cc45b6ec45c0eb28df100d3f0a576f18eef33ff8ff5d32bac2d9700" + "48042425e84cd92184837e01d0b4fe9f912d875c43021c3bcb7eeb51f1be5710" + "09e98c608045c7778c67d5671161cfbb741cc25350abe61e3eb2ce798bb88209" + "691d671429fa6c6d73098fc6ff05d4a14a323ea0a18787daeb93fde0e48ab18b" + "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" + "8c7e832be864674c220f9a9361c851917a93f921fedb7717b1b5ece47690c098" + "e4a702e262c3e3501dfe25091621fe12cd63c7845221687e36a79e17cf3a67e0" + "f5f80dd6588e59cfc3ce2f11568ff8296717a938edd448a947f9823a4e282b66" default)) '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'") - '(package-selected-packages '(lsp-ui))) + '(package-selected-packages '(lsp-ui vlf))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.