Compare commits

..

No commits in common. "086b482cead049c47103874c46fa34b74716b6f7" and "ae6b469c682dbec8aa271ee2d3a706d3d0740841" have entirely different histories.

4 changed files with 14 additions and 13 deletions

View file

@ -17,7 +17,7 @@ return {
"smjonas/inc-rename.nvim", "smjonas/inc-rename.nvim",
opts = { opts = {
input_buffer_type = "dressing", input_buffer_type = "dressing",
save_in_cmdline_history = false, save_in_cmdline_history = true,
} }
}, },
{ {
@ -165,7 +165,6 @@ return {
config = function() config = function()
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
-- Use an on_attach function to only map the following keys -- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer -- after the language server attaches to the current buffer
vim.api.nvim_create_autocmd("LspAttach", { vim.api.nvim_create_autocmd("LspAttach", {
@ -188,7 +187,6 @@ return {
-- Mappings. -- Mappings.
local bufopts = { noremap = true, silent = true, buffer = ev.buf } local bufopts = { noremap = true, silent = true, buffer = ev.buf }
local bufopts_expr = { expr = true }
vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, bufopts) vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, bufopts)
vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, bufopts) vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, bufopts)
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts) vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts)
@ -198,7 +196,7 @@ return {
vim.keymap.set("n", "gi", fzflua.lsp_implementations, bufopts) vim.keymap.set("n", "gi", fzflua.lsp_implementations, bufopts)
vim.keymap.set("n", "<space>k", vim.lsp.buf.signature_help, bufopts) vim.keymap.set("n", "<space>k", vim.lsp.buf.signature_help, bufopts)
vim.keymap.set("n", "<space>D", vim.lsp.buf.type_definition, bufopts) vim.keymap.set("n", "<space>D", vim.lsp.buf.type_definition, bufopts)
vim.keymap.set("n", "<space>rn", rename_func, bufopts_expr) vim.keymap.set("n", "<space>rn", rename_func(), bufopts)
vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, bufopts) vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, bufopts)
vim.keymap.set("n", "<space>ge", vim.diagnostic.goto_next, bufopts) vim.keymap.set("n", "<space>ge", vim.diagnostic.goto_next, bufopts)
vim.keymap.set("n", "<space>gE", vim.diagnostic.goto_prev, bufopts) vim.keymap.set("n", "<space>gE", vim.diagnostic.goto_prev, bufopts)
@ -215,11 +213,15 @@ return {
capabilities = capabilities, capabilities = capabilities,
filetypes = { 'haskell', 'lhaskell', 'cabal' }, filetypes = { 'haskell', 'lhaskell', 'cabal' },
}) })
lspconfig["sourcekit"].setup({
capabilities = capabilities,
})
end, end,
}, },
{ {
'mrcjkb/rustaceanvim', 'mrcjkb/rustaceanvim',
version = '^5', -- Recommended version = '^4', -- Recommended
lazy = false, -- This plugin is already lazy lazy = false, -- This plugin is already lazy
}, },
{ {

View file

@ -117,7 +117,6 @@ myManageHook = composeAll
, resource =? "desktop_window" --> doIgnore , resource =? "desktop_window" --> doIgnore
, className =? "QjackCtl" --> doFloat , className =? "QjackCtl" --> doFloat
, resource =? "kdesktop" --> doIgnore , resource =? "kdesktop" --> doIgnore
, title =? "Picture-in-Picture" --> doFloat
, className =? "firefox" --> doShift (myWorkspaces !! 1) , className =? "firefox" --> doShift (myWorkspaces !! 1)
, className =? "Code" --> doShift (myWorkspaces !! 3) , className =? "Code" --> doShift (myWorkspaces !! 3)
, className =? "discord" --> doShift (myWorkspaces !! 4) , className =? "discord" --> doShift (myWorkspaces !! 4)
@ -133,14 +132,14 @@ myManageHook = composeAll
myEventHook = ewmhDesktopsEventHook myEventHook = ewmhDesktopsEventHook
myStartupHook = do myStartupHook = do
spawnOnce "keepassxc"
spawnOnce "dunst &" spawnOnce "dunst &"
spawnOnce "lxpolkit" spawnOnce "lxpolkit"
spawnOnce "thunar --daemon" spawnOnce "thunar --daemon"
spawnOnce "kwalletd6"
spawnOnce "pasystray" spawnOnce "pasystray"
spawnOnce "nitrogen --restore &" spawnOnce "nitrogen --restore &"
spawnOnce "playerctld" spawnOnce "playerctld"
spawnOnce "qpwgraph -m" spawnOnce "qpwgraph"
spawnOnce "killall picom;sleep1;picom &" spawnOnce "killall picom;sleep1;picom &"
setWMName "LG3D" setWMName "LG3D"
spawnOnce "nm-applet" spawnOnce "nm-applet"

View file

@ -21,10 +21,14 @@ export READER=mupdf
#THEME #THEME
source $ZDOTDIR/themes/gruvbox_dark.zsh source $ZDOTDIR/themes/gruvbox_dark.zsh
#Completions
autoload -U compinit && compinit
fpath+=$ZDOTDIR/plugins/zsh-completions/src
#Prompt #Prompt
fpath+=$ZDOTDIR/prompts/pure fpath+=$ZDOTDIR/prompts/pure
autoload -U promptinit; promptinit autoload -U promptinit; promptinit
export PURE_GIT_PULL=0 PURE_GIT_PULL=0
prompt pure prompt pure
source $ZDOTDIR/functions.zsh source $ZDOTDIR/functions.zsh

View file

@ -1,8 +1,4 @@
#Completions
ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd history completion) 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-autosuggestions/zsh-autosuggestions.plugin.zsh
source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh