Compare commits
No commits in common. "1f180f6618b8d23fcb99cc4fc169b44271863372" and "5e81732a7ca363c4696139cc7193c00f6158dd0f" have entirely different histories.
1f180f6618
...
5e81732a7c
|
|
@ -10,10 +10,6 @@ M.ui = {
|
||||||
|
|
||||||
hl_override = highlights.override,
|
hl_override = highlights.override,
|
||||||
hl_add = highlights.add,
|
hl_add = highlights.add,
|
||||||
tabufline = {
|
|
||||||
enabled = false,
|
|
||||||
},
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
M.plugins = "custom.plugins"
|
M.plugins = "custom.plugins"
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
local on_attach = require("plugins.configs.lspconfig").on_attach
|
local on_attach = require("plugins.configs.lspconfig").on_attach
|
||||||
local capabilities = require("plugins.configs.lspconfig").capabilities
|
local capabilities = require("plugins.configs.lspconfig").capabilities
|
||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require "lspconfig"
|
||||||
|
|
||||||
-- if you just want default config for the servers then put them in a table
|
-- if you just want default config for the servers then put them in a table
|
||||||
local servers =
|
local servers =
|
||||||
{ "html", "cssls", "tsserver", "clangd", "docker_compose_language_service", "dockerls", "rust_analyzer", "pyright" }
|
{ "html", "cssls", "tsserver", "clangd", "docker_compose_language_service", "dockerls", "rust_analyzer", "pyright" }
|
||||||
|
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
lspconfig[lsp].setup({
|
lspconfig[lsp].setup {
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
|
|
|
||||||
|
|
@ -20,14 +20,12 @@ local sources = {
|
||||||
|
|
||||||
b.formatting.black.with({
|
b.formatting.black.with({
|
||||||
extra_args = {"--line-length=82"}
|
extra_args = {"--line-length=82"}
|
||||||
}),
|
})
|
||||||
|
|
||||||
-- b.diagnostics.pylint.with({
|
-- b.diagnostics.pylint.with({
|
||||||
-- diagnostic_config = { underline = false, virtual_text = false, signs = false },
|
-- diagnostic_config = { underline = false, virtual_text = false, signs = false },
|
||||||
-- method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
|
-- method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
|
||||||
-- }),
|
-- }),
|
||||||
|
|
||||||
b.formatting.rustfmt,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@ local M = {}
|
||||||
|
|
||||||
M.general = {
|
M.general = {
|
||||||
n = {
|
n = {
|
||||||
|
[";"] = { ":", "enter command mode", opts = { nowait = true } },
|
||||||
|
|
||||||
-- harpoon
|
-- harpoon
|
||||||
["H"] = {function() require("harpoon.ui").toggle_quick_menu() end, "Open Harpoon" },
|
["H"] = {function() require("harpoon.ui").toggle_quick_menu() end, "Open Harpoon" },
|
||||||
["<leader>a"] = {function() require("harpoon.mark").add_file() end, "Add file to Harpoon"},
|
["<leader>a"] = {function() require("harpoon.mark").add_file() end, "Add file to Harpoon"},
|
||||||
|
|
|
||||||
|
|
@ -58,12 +58,6 @@ local plugins = {
|
||||||
"theprimeagen/harpoon",
|
"theprimeagen/harpoon",
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
'simrat39/rust-tools.nvim'
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Disable nvchad plugins
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"tpope/vim-sleuth",
|
"tpope/vim-sleuth",
|
||||||
lazy = false,
|
lazy = false,
|
||||||
|
|
|
||||||
|
|
@ -18,12 +18,6 @@ unbind '"'
|
||||||
bind | split-window -h
|
bind | split-window -h
|
||||||
bind - split-window -v
|
bind - split-window -v
|
||||||
|
|
||||||
# broadcast to panes
|
|
||||||
unbind b
|
|
||||||
unbind B
|
|
||||||
bind b setw synchronize-panes on
|
|
||||||
bind B setw synchronize-panes off
|
|
||||||
|
|
||||||
|
|
||||||
# status bar
|
# status bar
|
||||||
set -g status-right '%H:%m %d-%b-%y '
|
set -g status-right '%H:%m %d-%b-%y '
|
||||||
|
|
|
||||||
25
.zshrc
25
.zshrc
|
|
@ -99,8 +99,21 @@ zle -N edit-command-line
|
||||||
bindkey "^v" edit-command-line
|
bindkey "^v" edit-command-line
|
||||||
|
|
||||||
|
|
||||||
# adding cargo to path
|
|
||||||
export PATH=$HOME/.cargo/bin:$PATH
|
# >>> conda initialize >>>
|
||||||
|
# !! Contents within this block are managed by 'conda init' !!
|
||||||
|
__conda_setup="$('/home/andrei/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
eval "$__conda_setup"
|
||||||
|
else
|
||||||
|
if [ -f "/home/andrei/miniconda3/etc/profile.d/conda.sh" ]; then
|
||||||
|
. "/home/andrei/miniconda3/etc/profile.d/conda.sh"
|
||||||
|
else
|
||||||
|
export PATH="/home/andrei/miniconda3/bin:$PATH"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
unset __conda_setup
|
||||||
|
# <<< conda initialize <<<
|
||||||
|
|
||||||
|
|
||||||
# Open work folder with fuzzy finder
|
# Open work folder with fuzzy finder
|
||||||
|
|
@ -114,12 +127,6 @@ function work() {
|
||||||
projects=( "${projects[@]}" "${p[@]}" )
|
projects=( "${projects[@]}" "${p[@]}" )
|
||||||
done
|
done
|
||||||
|
|
||||||
goto=$(echo "$projects" | fzf --query=$1 --preview "tree -C -L 2 {}")
|
goto=$(echo "$projects" | fzf --preview "tree -C -L 2 {}")
|
||||||
if [ -z $TMUX ]
|
|
||||||
then
|
|
||||||
tmux new -A -s "$(basename -- $goto)" -c "$goto"
|
tmux new -A -s "$(basename -- $goto)" -c "$goto"
|
||||||
else
|
|
||||||
tmux new -d -s "$(basename -- $goto)" -c "$goto"
|
|
||||||
tmux switch-client -t "$(basename -- $goto)"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue