diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index f01dc80..d9e7423 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -17,7 +17,7 @@ return { "smjonas/inc-rename.nvim", opts = { input_buffer_type = "dressing", - save_in_cmdline_history = true, + save_in_cmdline_history = false, } }, { @@ -165,6 +165,7 @@ return { config = function() local lspconfig = require("lspconfig") + -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer vim.api.nvim_create_autocmd("LspAttach", { @@ -187,6 +188,7 @@ return { -- Mappings. local bufopts = { noremap = true, silent = true, buffer = ev.buf } + local bufopts_expr = { expr = true } vim.keymap.set("n", "e", vim.diagnostic.open_float, bufopts) vim.keymap.set("n", "q", vim.diagnostic.setloclist, bufopts) vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts) @@ -196,7 +198,7 @@ return { vim.keymap.set("n", "gi", fzflua.lsp_implementations, bufopts) vim.keymap.set("n", "k", vim.lsp.buf.signature_help, bufopts) vim.keymap.set("n", "D", vim.lsp.buf.type_definition, bufopts) - vim.keymap.set("n", "rn", rename_func(), bufopts) + vim.keymap.set("n", "rn", rename_func, bufopts_expr) vim.keymap.set("n", "ca", vim.lsp.buf.code_action, bufopts) vim.keymap.set("n", "ge", vim.diagnostic.goto_next, bufopts) vim.keymap.set("n", "gE", vim.diagnostic.goto_prev, bufopts) @@ -213,15 +215,11 @@ return { capabilities = capabilities, filetypes = { 'haskell', 'lhaskell', 'cabal' }, }) - - lspconfig["sourcekit"].setup({ - capabilities = capabilities, - }) end, }, { 'mrcjkb/rustaceanvim', - version = '^4', -- Recommended + version = '^5', -- Recommended lazy = false, -- This plugin is already lazy }, { diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index c9c3ca1..66462b0 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -117,6 +117,7 @@ myManageHook = composeAll , resource =? "desktop_window" --> doIgnore , className =? "QjackCtl" --> doFloat , resource =? "kdesktop" --> doIgnore + , title =? "Picture-in-Picture" --> doFloat , className =? "firefox" --> doShift (myWorkspaces !! 1) , className =? "Code" --> doShift (myWorkspaces !! 3) , className =? "discord" --> doShift (myWorkspaces !! 4) @@ -132,14 +133,14 @@ myManageHook = composeAll myEventHook = ewmhDesktopsEventHook myStartupHook = do + spawnOnce "keepassxc" spawnOnce "dunst &" spawnOnce "lxpolkit" spawnOnce "thunar --daemon" - spawnOnce "kwalletd6" spawnOnce "pasystray" spawnOnce "nitrogen --restore &" spawnOnce "playerctld" - spawnOnce "qpwgraph" + spawnOnce "qpwgraph -m" spawnOnce "killall picom;sleep1;picom &" setWMName "LG3D" spawnOnce "nm-applet" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 7957890..2dc272f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -21,14 +21,10 @@ export READER=mupdf #THEME source $ZDOTDIR/themes/gruvbox_dark.zsh -#Completions -autoload -U compinit && compinit -fpath+=$ZDOTDIR/plugins/zsh-completions/src - #Prompt fpath+=$ZDOTDIR/prompts/pure autoload -U promptinit; promptinit -PURE_GIT_PULL=0 +export PURE_GIT_PULL=0 prompt pure source $ZDOTDIR/functions.zsh diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh index b1dd9b2..309d541 100644 --- a/.config/zsh/plugins.zsh +++ b/.config/zsh/plugins.zsh @@ -1,4 +1,8 @@ +#Completions ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd history completion) +zstyle ':completion:*' rehash true +fpath+=$ZDOTDIR/plugins/zsh-completions/src +autoload -U compinit && compinit source $ZDOTDIR/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh