Merge branch 'master' into arch-laptop
This commit is contained in:
Michael Chalupiak
@@ -1631,7 +1631,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=168
|
||||
@@ -1976,8 +1976,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 []
|
||||
@@ -2497,3 +2497,7 @@ window-width=1000
|
||||
window-fullscreen=false
|
||||
window-height=700
|
||||
window-maximized=false
|
||||
|
||||
[ar/xjuan/Cambalache/state/window]
|
||||
state=uint32 0
|
||||
size=(1071, 645)
|
||||
|
||||
39
config/.config/helix/config.toml
Normal file
39
config/.config/helix/config.toml
Normal file
@@ -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"
|
||||
6
config/.config/helix/languages.toml
Executable file
6
config/.config/helix/languages.toml
Executable file
@@ -0,0 +1,6 @@
|
||||
[[languages]]
|
||||
indent = { tab-width = 2, unit = " " }
|
||||
|
||||
[language-server.harper-ls]
|
||||
command = "harper-ls"
|
||||
args = ["--stdio"]
|
||||
@@ -150,61 +150,75 @@ hook global BufCreate .* %{
|
||||
editorconfig-load
|
||||
autoconfigtab
|
||||
}
|
||||
#
|
||||
# define-command sleuth -docstring 'Heuristically set buffer options' %{
|
||||
# try %{
|
||||
# evaluate-commands -draft %{
|
||||
# # Search the first indent level
|
||||
# execute-keys 'gg' '/' '^\h+' '<ret>'
|
||||
#
|
||||
# # Tab vs. Space
|
||||
# # https://youtu.be/V7PLxL8jIl8
|
||||
# try %{
|
||||
# execute-keys '<a-k>' '\t' '<ret>'
|
||||
# #set-option buffer indentwidth 0
|
||||
# noexpandtab
|
||||
# } catch %{
|
||||
# set-option buffer indentwidth %val{selection_length}
|
||||
# expandtab
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
#
|
||||
# define-command git-status -docstring 'Show git diff' %{
|
||||
# hook -group git-status global BufOpenFile .* %{
|
||||
# git show-diff
|
||||
# }
|
||||
#
|
||||
# hook -group git-status global BufWritePost .* %{
|
||||
# git show-diff
|
||||
# }
|
||||
# }
|
||||
#
|
||||
# define-command disable-git-status -docstring 'Disable git diff gutter' %{
|
||||
# remove-hooks global git-status
|
||||
# }
|
||||
#
|
||||
# define-command sleuth-enable -docstring 'Enable sleuth' %{
|
||||
# # Run sleuth when opening and saving files.
|
||||
# hook -group sleuth global BufOpenFile .* %{
|
||||
# sleuth
|
||||
# }
|
||||
#
|
||||
# hook -group sleuth global BufWritePost .* %{
|
||||
# sleuth
|
||||
# }
|
||||
# }
|
||||
#
|
||||
# define-command sleuth-disable -docstring 'Disable sleuth' %{
|
||||
# remove-hooks global sleuth
|
||||
# }
|
||||
#
|
||||
# ## LSP ##
|
||||
lsp-enable
|
||||
lsp-auto-hover-enable
|
||||
|
||||
lsp-inlay-diagnostics-enable global
|
||||
define-command sleuth -docstring 'Heuristically set buffer options' %{
|
||||
try %{
|
||||
evaluate-commands -draft %{
|
||||
# Search the first indent level
|
||||
execute-keys 'gg' '/' '^\h+' '<ret>'
|
||||
|
||||
# Tab vs. Space
|
||||
# https://youtu.be/V7PLxL8jIl8
|
||||
try %{
|
||||
execute-keys '<a-k>' '\t' '<ret>'
|
||||
#set-option buffer indentwidth 0
|
||||
noexpandtab
|
||||
} catch %{
|
||||
set-option buffer indentwidth %val{selection_length}
|
||||
expandtab
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
define-command git-status -docstring 'Show git diff' %{
|
||||
hook -group git-status global BufOpenFile .* %{
|
||||
git show-diff
|
||||
}
|
||||
|
||||
hook -group git-status global BufWritePost .* %{
|
||||
git show-diff
|
||||
}
|
||||
}
|
||||
|
||||
define-command disable-git-status -docstring 'Disable git diff gutter' %{
|
||||
remove-hooks global git-status
|
||||
}
|
||||
|
||||
define-command sleuth-enable -docstring 'Enable sleuth' %{
|
||||
# Run sleuth when opening and saving files.
|
||||
hook -group sleuth global BufOpenFile .* %{
|
||||
sleuth
|
||||
}
|
||||
|
||||
hook -group sleuth global BufWritePost .* %{
|
||||
sleuth
|
||||
}
|
||||
}
|
||||
|
||||
define-command sleuth-disable -docstring 'Disable sleuth' %{
|
||||
remove-hooks global sleuth
|
||||
}
|
||||
|
||||
## LSP ##
|
||||
# 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
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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' },
|
||||
|
||||
Reference in New Issue
Block a user