diff options
| -rw-r--r-- | modules/neovim/nvim/lua/config/lsp.lua | 8 | ||||
| -rw-r--r-- | modules/tmux/default.nix | 13 | ||||
| -rw-r--r-- | void/home.nix | 11 |
3 files changed, 23 insertions, 9 deletions
diff --git a/modules/neovim/nvim/lua/config/lsp.lua b/modules/neovim/nvim/lua/config/lsp.lua index 3313fff..be50537 100644 --- a/modules/neovim/nvim/lua/config/lsp.lua +++ b/modules/neovim/nvim/lua/config/lsp.lua @@ -18,7 +18,7 @@ require('blink.cmp').setup({ }, menu = { border = "rounded", - auto_show = true, + auto_show = false, }, documentation = { window = { border = 'rounded' } }, }, @@ -47,9 +47,9 @@ vim.api.nvim_create_autocmd("LspAttach", { callback = function(args) end, { desc = "Goto definition (LSP)" }) vim.keymap.set('n', 'E', '<cmd>lua vim.lsp.buf.hover()<CR>', { silent = true }) - if client:supports_method(methods.textDocument_inlayHint) then - vim.lsp.inlay_hint.enable() - end + -- if client:supports_method(methods.textDocument_inlayHint) then + -- vim.lsp.inlay_hint.enable() + -- end if client:supports_method(methods.textDocument_formatting) then vim.api.nvim_create_autocmd("BufWritePre", { diff --git a/modules/tmux/default.nix b/modules/tmux/default.nix index a74d447..17a03eb 100644 --- a/modules/tmux/default.nix +++ b/modules/tmux/default.nix @@ -22,14 +22,19 @@ in plugin = resurrect; extraConfig = '' set -g @resurrect-strategy-nvim 'session' + set -g @resurrect-processes '"~ssh" lazygit' + ''; + } + { + plugin = continuum; + extraConfig = '' + set -g @continuum-restore 'on' ''; } ]; extraConfig = '' set -g default-terminal "screen-256color" - set -g default-command zsh -# screen-256 ls colors broken, zsh fixed -# screen ls colors fixed, zsh autosuggestions broken + set -g default-command zsh # this fixes colors for some reason set -g renumber-windows on bind R source-file ~/.config/tmux/tmux.conf @@ -91,7 +96,7 @@ in bind \[ swap-pane -U bind \] swap-pane -D - bind v copy-mode-vi + bind v copy-mode bind F resize-pane -Z bind h select-pane -m diff --git a/void/home.nix b/void/home.nix index 20f9d30..8bfbaaa 100644 --- a/void/home.nix +++ b/void/home.nix @@ -31,12 +31,21 @@ sway = { enable = true; - terminal = "foot"; + terminal = "footclient"; startup = [ { + command = "foot -s"; + always = false; + } + { command = "avizo-service"; always = false; } + { + # TODO: move to turnstile + command = "tmux start-server"; + always = false; + } ]; }; |