Compare commits
1 Commits
master
...
b9a956932e
| Author | SHA1 | Date | |
|---|---|---|---|
| b9a956932e |
57
.aliases
57
.aliases
@@ -1,31 +1,3 @@
|
|||||||
# Complex aliasses
|
|
||||||
## Open notes folder in nvim then return
|
|
||||||
function notes() { cd $HOME/Notes; nvim; cd -; };
|
|
||||||
function sb() { cd $HOME/second-brain/; git pull; nvim; git add .; git commit; git push; cd -; };
|
|
||||||
|
|
||||||
## Open work folder with fuzzy finder
|
|
||||||
function work() {
|
|
||||||
work_dirs=( "$HOME/clones" "$HOME/sandbox" "$HOME/TA/" )
|
|
||||||
work_dirs=( $(find $work_dirs -maxdepth 0 -type d 2> /dev/null) )
|
|
||||||
goto=""
|
|
||||||
if [ ! -z $1 ]; then
|
|
||||||
goto=$(find $work_dirs -maxdepth 1 -mindepth 1 -type d | fzf -f $1)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$goto" -o $(wc -l <<< "$goto") -ne 1 ]; then
|
|
||||||
goto=$(find $work_dirs -maxdepth 1 -mindepth 1 -type d | fzf --query=$1 --preview "tree -C -L 2 {}")
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ -z $goto ] && return
|
|
||||||
if [ -z $TMUX ]; then
|
|
||||||
tmux new -A -s "$(basename -- $goto)" -c "$goto"
|
|
||||||
else
|
|
||||||
tmux new -d -s "$(basename -- $goto)" -c "$goto"
|
|
||||||
tmux switch-client -t "$(basename -- $goto | tr . _)"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# simple
|
|
||||||
alias clj='rlwrap java -cp ~/Clojure/clojure-1.8.0.jar clojure.main'
|
alias clj='rlwrap java -cp ~/Clojure/clojure-1.8.0.jar clojure.main'
|
||||||
alias ll='ls -l'
|
alias ll='ls -l'
|
||||||
alias la='ls -A'
|
alias la='ls -A'
|
||||||
@@ -35,13 +7,34 @@ alias cdclip="cd \$(xclip -o -selection clipboard)"
|
|||||||
alias clipi='xclip -i -selection clipboard'
|
alias clipi='xclip -i -selection clipboard'
|
||||||
alias clipo='xclip -o -selection clipboard'
|
alias clipo='xclip -o -selection clipboard'
|
||||||
alias ssh-agent='ssh-agent -t 1h'
|
alias ssh-agent='ssh-agent -t 1h'
|
||||||
alias saa='eval $(ssh-agent) && ssh-add'
|
alias ssh-home='ssh home-server'
|
||||||
alias tm='tmux new -A'
|
alias tmh='ssh home-server -t "tmux new -A -s sys"'
|
||||||
|
alias tm='tmux new -A -s '
|
||||||
|
alias tms='tmux new -A -s sys'
|
||||||
|
alias hsfs='sshfs andrei@home-server:/utility /hsfs'
|
||||||
|
alias uhsfs='sudo umount /hsfs'
|
||||||
alias exfs='sudo zpool import external'
|
alias exfs='sudo zpool import external'
|
||||||
alias uexfs='sudo zpool export external'
|
alias uexfs='sudo zpool export external'
|
||||||
|
alias ta-media='rsync -avr /home/andrei/CSCI_4160/ home-server:/home/andrei/backups/school/TA/CSCI_4160_w19;'
|
||||||
|
alias ta-web='rsync -avr /home/andrei/CSCI_3230/ home-server:/home/andrei/backups/school/TA/CSCI_3230_w19;'
|
||||||
|
alias photo='rsync -avr /home/andrei/Pictures/* home-server:/utility/Photos/XPS_2018_VACATION/ --exclude="*_CR2_embedded.jpg"'
|
||||||
|
alias photo-local='rsync -avr ~/Pictures/* /media/andrei/External/Photos --exclude="*_CR2_embedded.jpg"'
|
||||||
alias socks='ssh -D 8081 -C -q -N home-server'
|
alias socks='ssh -D 8081 -C -q -N home-server'
|
||||||
alias gmonitor='while [ true ] ; do nvidia-smi; nvidia-settings -q gpucoretemp | grep gpu; sensors| grep CPU; sleep 1; clear; done'
|
alias gmonitor='while [ true ] ; do nvidia-smi; nvidia-settings -q gpucoretemp | grep gpu; sensors| grep CPU; sleep 1; clear; done'
|
||||||
|
alias saa='ssh-agent && ssh-add'
|
||||||
|
alias gssh='gcloud compute ssh'
|
||||||
|
alias gc='gcloud compute'
|
||||||
|
alias gci='gcloud compute instances'
|
||||||
|
alias gcls='gcloud compute instances list'
|
||||||
|
alias gcstart='gcloud compute instances start'
|
||||||
|
alias gcstop='gcloud compute instances stop'
|
||||||
|
alias gcstopall="gcls | grep RUNNING | awk '{print \$1}' | xargs -I{} gcloud compute instances stop {}"
|
||||||
|
alias gct='gcloud compute tpus'
|
||||||
|
alias gctls='gcloud compute tpus list'
|
||||||
|
alias gctstart='gcloud compute tpus start'
|
||||||
|
alias gctstop='gcloud compute tpus stop'
|
||||||
alias code='code-oss'
|
alias code='code-oss'
|
||||||
|
alias tf-docker='docker run --runtime=nvidia -it --rm -p 8888:8888 -v $PWD:/tf/local andrei/dev'
|
||||||
alias conda-activate='source /opt/anaconda/bin/activate'
|
alias conda-activate='source /opt/anaconda/bin/activate'
|
||||||
alias conda-deactivete='source /opt/anaconda/bin/deactivate'
|
alias conda-deactivete='source /opt/anaconda/bin/deactivate'
|
||||||
alias venv='python -m venv'
|
alias venv='python -m venv'
|
||||||
@@ -49,6 +42,4 @@ alias venv2='python2 -m venv'
|
|||||||
alias venv3='python3 -m venv'
|
alias venv3='python3 -m venv'
|
||||||
alias dotvenv='source .venv/bin/activate'
|
alias dotvenv='source .venv/bin/activate'
|
||||||
alias todo='rusty-tasks'
|
alias todo='rusty-tasks'
|
||||||
alias ccat='bat'
|
alias ccat='highlight -O ansi --force'
|
||||||
alias we='watchexec'
|
|
||||||
alias netcheck='ping 8.8.8.8'
|
|
||||||
|
|||||||
Submodule .config/nvim deleted from a54d69c808
12
.gitconfig
12
.gitconfig
@@ -13,18 +13,10 @@
|
|||||||
d = diff
|
d = diff
|
||||||
dc = diff -cached
|
dc = diff -cached
|
||||||
lol = log --decorate --pretty=oneline --abbrev-commit
|
lol = log --decorate --pretty=oneline --abbrev-commit
|
||||||
lg = "log --pretty=format:'%C(auto) %h,%C(green) \"%s\"%Creset, %aN,%C(blue) %cD'"
|
lg = log --pretty=format:'%C(auto) %h,%C(green) \"%s\"%Creset, %aN,%C(blue) %cD'
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = vim
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[merge]
|
|
||||||
tool = nvim
|
|
||||||
[mergetool]
|
|
||||||
keepBackup = false
|
|
||||||
[mergetool "nvim"]
|
|
||||||
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
|
||||||
[fetch]
|
|
||||||
all = true
|
|
||||||
|
|||||||
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -1,4 +0,0 @@
|
|||||||
[submodule ".config/nvim"]
|
|
||||||
path = .config/nvim
|
|
||||||
url = git@github.com:andrei-stoica/kickstart.nvim.git
|
|
||||||
branch = custom
|
|
||||||
@@ -73,8 +73,8 @@
|
|||||||
"KC_F",
|
"KC_F",
|
||||||
"KC_G",
|
"KC_G",
|
||||||
"KC_LEFT",
|
"KC_LEFT",
|
||||||
"KC_DOWN",
|
|
||||||
"KC_UP",
|
"KC_UP",
|
||||||
|
"KC_DOWN",
|
||||||
"KC_RGHT",
|
"KC_RGHT",
|
||||||
"KC_QUOT",
|
"KC_QUOT",
|
||||||
"KC_EQL",
|
"KC_EQL",
|
||||||
@@ -123,8 +123,8 @@
|
|||||||
"KC_F",
|
"KC_F",
|
||||||
"KC_G",
|
"KC_G",
|
||||||
"KC_HOME",
|
"KC_HOME",
|
||||||
"KC_PGDN",
|
|
||||||
"KC_PGUP",
|
"KC_PGUP",
|
||||||
|
"KC_PGDN",
|
||||||
"KC_END",
|
"KC_END",
|
||||||
"KC_F12",
|
"KC_F12",
|
||||||
"KC_ENT",
|
"KC_ENT",
|
||||||
@@ -173,8 +173,8 @@
|
|||||||
"KC_F",
|
"KC_F",
|
||||||
"KC_G",
|
"KC_G",
|
||||||
"KC_MPRV",
|
"KC_MPRV",
|
||||||
"KC_VOLD",
|
|
||||||
"KC_VOLU",
|
"KC_VOLU",
|
||||||
|
"KC_VOLD",
|
||||||
"KC_MNXT",
|
"KC_MNXT",
|
||||||
"KC_MUTE",
|
"KC_MUTE",
|
||||||
"KC_MPLY",
|
"KC_MPLY",
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ local servers = {
|
|||||||
"rust_analyzer",
|
"rust_analyzer",
|
||||||
"pyright",
|
"pyright",
|
||||||
"grammarly",
|
"grammarly",
|
||||||
"marksman",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
@@ -24,9 +23,5 @@ for _, lsp in ipairs(servers) do
|
|||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
lspconfig["clangd"].setup({
|
--
|
||||||
on_attach = on_attach,
|
-- lspconfig.pyright.setup { blabla}
|
||||||
capabilities = {
|
|
||||||
offsetEncoding = { "utf-16" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|||||||
@@ -1,72 +0,0 @@
|
|||||||
local desc = require('utils').plugin_keymap_desc('ufo')
|
|
||||||
|
|
||||||
-- Custom fold text handler for ufo showing line count folded
|
|
||||||
local handler = function(virtText, lnum, endLnum, width, truncate)
|
|
||||||
local newVirtText = {}
|
|
||||||
local suffix = (' %d '):format(endLnum - lnum)
|
|
||||||
local sufWidth = vim.fn.strdisplaywidth(suffix)
|
|
||||||
local targetWidth = width - sufWidth
|
|
||||||
local curWidth = 0
|
|
||||||
|
|
||||||
for _, chunk in ipairs(virtText) do
|
|
||||||
local chunkText = chunk[1]
|
|
||||||
local chunkWidth = vim.fn.strdisplaywidth(chunkText)
|
|
||||||
if targetWidth > curWidth + chunkWidth then
|
|
||||||
table.insert(newVirtText, chunk)
|
|
||||||
else
|
|
||||||
chunkText = truncate(chunkText, targetWidth - curWidth)
|
|
||||||
local hlGroup = chunk[2]
|
|
||||||
table.insert(newVirtText, {chunkText, hlGroup})
|
|
||||||
chunkWidth = vim.fn.strdisplaywidth(chunkText)
|
|
||||||
-- str width returned from truncate() may less than 2nd argument, need padding
|
|
||||||
if curWidth + chunkWidth < targetWidth then
|
|
||||||
suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
|
|
||||||
end
|
|
||||||
break
|
|
||||||
end
|
|
||||||
curWidth = curWidth + chunkWidth
|
|
||||||
end
|
|
||||||
|
|
||||||
table.insert(newVirtText, {suffix, 'MoreMsg'})
|
|
||||||
return newVirtText
|
|
||||||
end
|
|
||||||
|
|
||||||
return {
|
|
||||||
{
|
|
||||||
'luukvbaal/statuscol.nvim',
|
|
||||||
config = function()
|
|
||||||
local builtin = require('statuscol.builtin')
|
|
||||||
require('statuscol').setup({
|
|
||||||
segments = {
|
|
||||||
{text = {builtin.foldfunc}, click = 'v:lua.ScFa'},
|
|
||||||
{text = {' %s'}, click = 'v:lua.ScSa'},
|
|
||||||
{text = {builtin.lnumfunc, ' '}, condition = {true, builtin.not_empty}, click = 'v:lua.ScLa'},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
'kevinhwang91/nvim-ufo',
|
|
||||||
dependencies = {'kevinhwang91/promise-async'},
|
|
||||||
opts = {
|
|
||||||
fold_virt_text_handler = handler,
|
|
||||||
provider_selector = function(bufnr, filetype, buftype)
|
|
||||||
return {'treesitter', 'indent'}
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
|
||||||
local ufo = require('ufo')
|
|
||||||
ufo.setup(opts)
|
|
||||||
|
|
||||||
vim.keymap.set('n', 'zR', ufo.openAllFolds, {desc = desc('Open all folds')})
|
|
||||||
vim.keymap.set('n', 'zM', ufo.closeAllFolds, {desc = desc('Close all folds')})
|
|
||||||
vim.keymap.set('n', 'K', function()
|
|
||||||
local winid = ufo.peekFoldedLinesUnderCursor(true)
|
|
||||||
if not winid then
|
|
||||||
vim.lsp.buf.hover()
|
|
||||||
end
|
|
||||||
end, {desc = 'LSP: Show hover documentation and folded code'})
|
|
||||||
end
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -2,28 +2,17 @@ local M = {}
|
|||||||
|
|
||||||
M.treesitter = {
|
M.treesitter = {
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
|
"vim",
|
||||||
|
"lua",
|
||||||
|
"html",
|
||||||
|
"css",
|
||||||
|
"javascript",
|
||||||
"typescript",
|
"typescript",
|
||||||
"python",
|
"python",
|
||||||
"tsx",
|
"tsx",
|
||||||
"c",
|
"c",
|
||||||
"javascript",
|
|
||||||
"json",
|
|
||||||
"lua",
|
|
||||||
"luadoc",
|
|
||||||
"luap",
|
|
||||||
"markdown",
|
"markdown",
|
||||||
"markdown_inline",
|
"markdown_inline",
|
||||||
"query",
|
|
||||||
"regex",
|
|
||||||
"vim",
|
|
||||||
"vimdoc",
|
|
||||||
"bash",
|
|
||||||
"html",
|
|
||||||
"css",
|
|
||||||
"javascript",
|
|
||||||
"yaml",
|
|
||||||
"julia",
|
|
||||||
"r",
|
|
||||||
},
|
},
|
||||||
indent = {
|
indent = {
|
||||||
enable = true,
|
enable = true,
|
||||||
@@ -52,6 +41,7 @@ M.mason = {
|
|||||||
|
|
||||||
"jedi_language_server",
|
"jedi_language_server",
|
||||||
|
|
||||||
|
|
||||||
"docker_compose_language_service",
|
"docker_compose_language_service",
|
||||||
"dockerls",
|
"dockerls",
|
||||||
},
|
},
|
||||||
@@ -74,7 +64,7 @@ M.nvimtree = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
M.cmp = function (_, opts)
|
M.cmp = function (_, opts)
|
||||||
local cmp = require("cmp")
|
local cmp = require "cmp"
|
||||||
opts.experimental = {
|
opts.experimental = {
|
||||||
ghost_text = true,
|
ghost_text = true,
|
||||||
}
|
}
|
||||||
@@ -86,17 +76,17 @@ M.cmp = function(_, opts)
|
|||||||
{ name = "buffer", keyword_length = 5},
|
{ name = "buffer", keyword_length = 5},
|
||||||
})
|
})
|
||||||
|
|
||||||
opts.mapping = cmp.config.mapping({
|
opts.mapping = cmp.config.mapping {
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item(),
|
["<C-p>"] = cmp.mapping.select_prev_item(),
|
||||||
["<C-n>"] = cmp.mapping.select_next_item(),
|
["<C-n>"] = cmp.mapping.select_next_item(),
|
||||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
["<C-e>"] = cmp.mapping.close(),
|
["<C-e>"] = cmp.mapping.close(),
|
||||||
["<C-y>"] = cmp.mapping.confirm({
|
["<C-y>"] = cmp.mapping.confirm {
|
||||||
behavior = cmp.ConfirmBehavior.Insert,
|
behavior = cmp.ConfirmBehavior.Insert,
|
||||||
select = true,
|
select = true,
|
||||||
}),
|
},
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
@@ -121,8 +111,10 @@ M.cmp = function(_, opts)
|
|||||||
"i",
|
"i",
|
||||||
"s",
|
"s",
|
||||||
}),
|
}),
|
||||||
})
|
}
|
||||||
return opts
|
return opts
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ vim.opt.expandtab = true
|
|||||||
vim.opt.number = true
|
vim.opt.number = true
|
||||||
vim.opt.linebreak = true
|
vim.opt.linebreak = true
|
||||||
vim.opt.showbreak = "+++"
|
vim.opt.showbreak = "+++"
|
||||||
|
vim.opt.textwidth = 100
|
||||||
vim.opt.showmatch = true
|
vim.opt.showmatch = true
|
||||||
vim.opt.visualbell = true
|
vim.opt.visualbell = true
|
||||||
vim.opt.hlsearch = true
|
vim.opt.hlsearch = true
|
||||||
@@ -27,4 +28,4 @@ vim.opt.tabstop = 2
|
|||||||
vim.opt.undolevels = 1000
|
vim.opt.undolevels = 1000
|
||||||
vim.opt.backspace = "indent,eol,start"
|
vim.opt.backspace = "indent,eol,start"
|
||||||
vim.opt.colorcolumn = "80"
|
vim.opt.colorcolumn = "80"
|
||||||
vim.opt.conceallevel = 2
|
|
||||||
|
|||||||
@@ -1,76 +1,15 @@
|
|||||||
---@type MappingsTable
|
---@type MappingsTable
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
local function toggle_telescope(harpoon_files)
|
|
||||||
local conf = require("telescope.config").values
|
|
||||||
local file_paths = {}
|
|
||||||
for _, item in ipairs(harpoon_files.items) do
|
|
||||||
table.insert(file_paths, item.value)
|
|
||||||
end
|
|
||||||
|
|
||||||
require("telescope.pickers").new({}, {
|
|
||||||
prompt_title = "Harpoon",
|
|
||||||
finder = require("telescope.finders").new_table({
|
|
||||||
results = file_paths,
|
|
||||||
}),
|
|
||||||
previewer = conf.file_previewer({}),
|
|
||||||
sorter = conf.generic_sorter({}),
|
|
||||||
}):find()
|
|
||||||
end
|
|
||||||
|
|
||||||
M.general = {
|
M.general = {
|
||||||
n = {
|
n = {
|
||||||
-- harpoon
|
-- harpoon
|
||||||
["H"] = {
|
["H"] = {function() require("harpoon.ui").toggle_quick_menu() end, "Open Harpoon" },
|
||||||
function()
|
["<leader>ha"] = {function() require("harpoon.mark").add_file() end, "Add file to Harpoon"},
|
||||||
local harpoon = require("harpoon")
|
["<leader>hs"] = {function() require("harpoon.ui").nav_file(1) end, "Switch to file 1"},
|
||||||
toggle_telescope(harpoon:list())
|
["<leader>hd"] = {function() require("harpoon.ui").nav_file(2) end, "Switch to file 2"},
|
||||||
--harpoon.ui:toggle_quick_menu(harpoon:list())
|
["<leader>hf"] = {function() require("harpoon.ui").nav_file(3) end, "Switch to file 3"},
|
||||||
end,
|
["<leader>hg"] = {function() require("harpoon.ui").nav_file(4) end, "Switch to file 4"},
|
||||||
"Open Harpoon in telescope",
|
|
||||||
},
|
|
||||||
["<leader>hh"] = {
|
|
||||||
function()
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
harpoon.ui:toggle_quick_menu(harpoon:list())
|
|
||||||
end,
|
|
||||||
"Open Harpoon",
|
|
||||||
},
|
|
||||||
["<leader>ha"] = {
|
|
||||||
function()
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
harpoon:list():append()
|
|
||||||
end,
|
|
||||||
"Add file to Harpoon",
|
|
||||||
},
|
|
||||||
["<leader>hs"] = {
|
|
||||||
function()
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
harpoon:list():select(1)
|
|
||||||
end,
|
|
||||||
"Switch to file 1",
|
|
||||||
},
|
|
||||||
["<leader>hd"] = {
|
|
||||||
function()
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
harpoon:list():select(2)
|
|
||||||
end,
|
|
||||||
"Switch to file 2",
|
|
||||||
},
|
|
||||||
["<leader>hf"] = {
|
|
||||||
function()
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
harpoon:list():select(3)
|
|
||||||
end,
|
|
||||||
"Switch to file 3",
|
|
||||||
},
|
|
||||||
["<leader>hg"] = {
|
|
||||||
function()
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
harpoon:list():select(4)
|
|
||||||
end,
|
|
||||||
"Switch to file 4",
|
|
||||||
},
|
|
||||||
|
|
||||||
-- navigation
|
-- navigation
|
||||||
["<C-d>"] = {"<C-d>zz", "1/2 page down"},
|
["<C-d>"] = {"<C-d>zz", "1/2 page down"},
|
||||||
@@ -78,7 +17,13 @@ M.general = {
|
|||||||
["n"] = {"nzz", "find next"},
|
["n"] = {"nzz", "find next"},
|
||||||
["N"] = {"Nzz", "find prev"},
|
["N"] = {"Nzz", "find prev"},
|
||||||
|
|
||||||
["Zm"] = { ":ZenMode<CR>", "Enter ZenMode" },
|
-- navigation
|
||||||
|
["<c-h>"] = {"<cmd> TmuxNavigateLeft<cr>", "window left" },
|
||||||
|
["<c-j>"] = {"<cmd> TmuxNavigateDown<cr>", "window down" },
|
||||||
|
["<c-k>"] = {"<cmd> TmuxNavigateUp<cr>", "window up" },
|
||||||
|
["<c-l>"] = {"<cmd> TmuxNavigateRight<cr>", "window right" },
|
||||||
|
["<c-\\>"] = {"<cmd> TmuxNavigatePrevious<cr>", "window previous" },
|
||||||
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,35 +1,25 @@
|
|||||||
local overrides = require("custom.configs.overrides")
|
local overrides = require "custom.configs.overrides"
|
||||||
|
|
||||||
|
|
||||||
---@type NvPluginSpec[]
|
---@type NvPluginSpec[]
|
||||||
local plugins = {
|
local plugins = {
|
||||||
|
|
||||||
{
|
{
|
||||||
"folke/twilight.nvim",
|
"christoomey/vim-tmux-navigator",
|
||||||
opts = {
|
cmd = {
|
||||||
context = 20,
|
"TmuxNavigateLeft",
|
||||||
expand = {
|
"TmuxNavigateDown",
|
||||||
"function",
|
"TmuxNavigateUp",
|
||||||
|
"TmuxNavigateRight",
|
||||||
|
"TmuxNavigatePrevious",
|
||||||
},
|
},
|
||||||
},
|
|
||||||
lazy = false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folke/zen-mode.nvim",
|
|
||||||
opts = {
|
|
||||||
tmux = {
|
|
||||||
enable = false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
lazy = false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"alexghergh/nvim-tmux-navigation",
|
|
||||||
lazy = false,
|
lazy = false,
|
||||||
},
|
},
|
||||||
-- Override plugin definition options
|
-- Override plugin definition options
|
||||||
|
|
||||||
{
|
{
|
||||||
"hrsh7th/nvim-cmp",
|
"hrsh7th/nvim-cmp",
|
||||||
opts = overrides.cmp,
|
opts = overrides.cmp
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -39,31 +29,16 @@ local plugins = {
|
|||||||
{
|
{
|
||||||
"jose-elias-alvarez/null-ls.nvim",
|
"jose-elias-alvarez/null-ls.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("custom.configs.null-ls")
|
require "custom.configs.null-ls"
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require("plugins.configs.lspconfig")
|
require "plugins.configs.lspconfig"
|
||||||
require("custom.configs.lspconfig")
|
require "custom.configs.lspconfig"
|
||||||
end, -- Override to setup mason-lspconfig
|
end, -- Override to setup mason-lspconfig
|
||||||
opts = {
|
|
||||||
---@type lspconfig.options
|
|
||||||
servers = {
|
|
||||||
pyright = {},
|
|
||||||
r_language_server = {},
|
|
||||||
julials = {},
|
|
||||||
marksman = {
|
|
||||||
-- also needs:
|
|
||||||
-- $home/.config/marksman/config.toml :
|
|
||||||
-- [core]
|
|
||||||
-- markdown.file_extensions = ["md", "markdown", "qmd"]
|
|
||||||
filetypes = { "markdown", "quarto" },
|
|
||||||
root_dir = require("lspconfig.util").root_pattern(".git", ".marksman.toml", "_quarto.yml"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
-- override plugin configs
|
-- override plugin configs
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
@@ -96,106 +71,25 @@ local plugins = {
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "nvim-treesitter/nvim-treesitter-context", lazy = false },
|
{ "nvim-treesitter/nvim-treesitter-context",
|
||||||
|
lazy = false,
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"theprimeagen/harpoon",
|
"theprimeagen/harpoon",
|
||||||
branch = "harpoon2",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
config = function(_, opts)
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
harpoon:setup({
|
|
||||||
settings = {
|
|
||||||
save_on_toggle = true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"simrat39/rust-tools.nvim",
|
'simrat39/rust-tools.nvim'
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"ellisonleao/glow.nvim",
|
"ellisonleao/glow.nvim",
|
||||||
config = true,
|
config = true,
|
||||||
cmd = "Glow",
|
cmd = "Glow",
|
||||||
event = "BufEnter *.md",
|
event = 'BufEnter *.md',
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
"kevinhwang91/nvim-ufo",
|
|
||||||
requires = "kevinhwang91/promise-async",
|
|
||||||
lazy = false,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"epwalsh/obsidian.nvim",
|
|
||||||
version = "*", -- recommended, use latest release instead of latest commit
|
|
||||||
lazy = true,
|
|
||||||
ft = "markdown",
|
|
||||||
-- ft = {
|
|
||||||
-- "BufReadPre ~/Notes/**.md",
|
|
||||||
-- "BufNewFile ~/Notes/**.md",
|
|
||||||
-- },
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
opts = {
|
|
||||||
workspaces = {
|
|
||||||
{ name = "second-brain", path = "~/second-brain" },
|
|
||||||
},
|
|
||||||
new_notes_location = "notes_subdir",
|
|
||||||
daily_notes = { folder = "notes/dailies" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Disable nvchad plugins
|
|
||||||
{
|
|
||||||
"folke/todo-comments.nvim",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
lazy = false,
|
|
||||||
opts = {
|
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"quarto-dev/quarto-nvim",
|
|
||||||
opts = {
|
|
||||||
lspFeatures = {
|
|
||||||
languages = { "r", "python", "julia", "bash", "html", "lua" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
ft = "quarto",
|
|
||||||
keys = {
|
|
||||||
{ "<leader>qa", ":QuartoActivate<cr>", desc = "quarto activate" },
|
|
||||||
{ "<leader>qp", ":lua require'quarto'.quartoPreview()<cr>", desc = "quarto preview" },
|
|
||||||
{ "<leader>qq", ":lua require'quarto'.quartoClosePreview()<cr>", desc = "quarto close" },
|
|
||||||
{ "<leader>qh", ":QuartoHelp ", desc = "quarto help" },
|
|
||||||
{ "<leader>qe", ":lua require'otter'.export()<cr>", desc = "quarto export" },
|
|
||||||
{ "<leader>qE", ":lua require'otter'.export(true)<cr>", desc = "quarto export overwrite" },
|
|
||||||
{ "<leader>qrr", ":QuartoSendAbove<cr>", desc = "quarto run to cursor" },
|
|
||||||
{ "<leader>qra", ":QuartoSendAll<cr>", desc = "quarto run all" },
|
|
||||||
{ "<leader><cr>", ":SlimeSend<cr>", desc = "send code chunk" },
|
|
||||||
{ "<c-cr>", ":SlimeSend<cr>", desc = "send code chunk" },
|
|
||||||
{ "<c-cr>", "<esc>:SlimeSend<cr>i", mode = "i", desc = "send code chunk" },
|
|
||||||
{ "<c-cr>", "<Plug>SlimeRegionSend<cr>", mode = "v", desc = "send code chunk" },
|
|
||||||
{ "<cr>", "<Plug>SlimeRegionSend<cr>", mode = "v", desc = "send code chunk" },
|
|
||||||
{ "<leader>ctr", ":split term://R<cr>", desc = "terminal: R" },
|
|
||||||
{ "<leader>cti", ":split term://ipython<cr>", desc = "terminal: ipython" },
|
|
||||||
{ "<leader>ctp", ":split term://python<cr>", desc = "terminal: python" },
|
|
||||||
{ "<leader>ctj", ":split term://julia<cr>", desc = "terminal: julia" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"jmbuhr/otter.nvim",
|
|
||||||
opts = {
|
|
||||||
buffers = {
|
|
||||||
set_filetype = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- Disable nvchad plugins
|
-- Disable nvchad plugins
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -203,48 +97,7 @@ local plugins = {
|
|||||||
lazy = false,
|
lazy = false,
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{ "NvChad/nvterm", enabled = false },
|
||||||
"debugloop/telescope-undo.nvim",
|
|
||||||
dependencies = { -- note how they're inverted to above example
|
|
||||||
{
|
|
||||||
"nvim-telescope/telescope.nvim",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
keys = {
|
|
||||||
{ -- lazy style key map
|
|
||||||
"<leader>u",
|
|
||||||
"<cmd>Telescope undo<cr>",
|
|
||||||
desc = "undo history",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
opts = {
|
|
||||||
-- don't use `defaults = { }` here, do this in the main telescope spec
|
|
||||||
extensions = {
|
|
||||||
undo = {
|
|
||||||
-- telescope-undo.nvim config, see below
|
|
||||||
},
|
|
||||||
-- no other extensions here, they can have their own spec too
|
|
||||||
},
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
|
||||||
-- Calling telescope's setup from multiple specs does not hurt, it will happily merge the
|
|
||||||
-- configs for us. We won't use data, as everything is in it's own namespace (telescope
|
|
||||||
-- defaults, as well as each extension).
|
|
||||||
require("telescope").setup(opts)
|
|
||||||
require("telescope").load_extension("undo")
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"sindrets/diffview.nvim",
|
|
||||||
lazy = false,
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"NvChad/nvterm",
|
|
||||||
enabled = false,
|
|
||||||
},
|
|
||||||
|
|
||||||
-- To make a plugin not be loaded
|
-- To make a plugin not be loaded
|
||||||
-- {
|
-- {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ set -g @plugin 'alexghergh/nvim-tmux-navigation'
|
|||||||
|
|
||||||
run '~/.tmux/plugins/tpm/tpm'
|
run '~/.tmux/plugins/tpm/tpm'
|
||||||
|
|
||||||
|
|
||||||
# remap prefix from 'C-b' to 'C-a'
|
# remap prefix from 'C-b' to 'C-a'
|
||||||
unbind C-b
|
unbind C-b
|
||||||
set-option -g prefix C-a
|
set-option -g prefix C-a
|
||||||
@@ -32,9 +33,9 @@ unbind h
|
|||||||
bind h attach-session -t . -c "#{pane_current_path}"
|
bind h attach-session -t . -c "#{pane_current_path}"
|
||||||
|
|
||||||
# status bar
|
# status bar
|
||||||
set -g status-right '#[fg=black]◢#[bg=black fg=colour135] %H:%M #[fg=default]%b %d %Y '
|
set -g status-right '%H:%m %d-%b-%y '
|
||||||
if-shell 'test "$(acpi -t)"' {
|
if-shell '[[ $(acpi -t) ]]' {
|
||||||
set -g status-right '#[fg=black]◢#[bg=black fg=colour135] %H:%M #[fg=default]%b %d %Y #[fg=pink] ♥#(acpi | cut -d ',' -f 2) '
|
set -g status-right '♥#(acpi | cut -d ',' -f 2) | %H:%m %d-%b-%y '
|
||||||
}
|
}
|
||||||
|
|
||||||
# Start windows and panes at 1, not 0
|
# Start windows and panes at 1, not 0
|
||||||
@@ -43,18 +44,11 @@ set -g pane-base-index 1
|
|||||||
set-window-option -g pane-base-index 1
|
set-window-option -g pane-base-index 1
|
||||||
set-option -g renumber-windows on
|
set-option -g renumber-windows on
|
||||||
|
|
||||||
# Smart pane switching with awareness of Vim splits.
|
# navigation
|
||||||
# See: https://github.com/christoomey/vim-tmux-navigator
|
bind-key -r j select-pane -D
|
||||||
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
|
bind-key -r k select-pane -U
|
||||||
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?|fzf)(diff)?$'"
|
bind-key -r l select-pane -R
|
||||||
bind-key -n -T prefix k if-shell "${is_vim}" 'send-keys C-h' 'select-pane -L'
|
bind-key -r h select-pane -L
|
||||||
bind-key -n -T prefix j if-shell "${is_vim}" 'send-keys C-j' 'select-pane -D'
|
|
||||||
bind-key -n -T prefix h if-shell "${is_vim}" 'send-keys C-k' 'select-pane -U'
|
|
||||||
bind-key -n -T prefix l if-shell "${is_vim}" 'send-keys C-l' 'select-pane -R'
|
|
||||||
if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
|
|
||||||
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
|
|
||||||
if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
|
|
||||||
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
|
|
||||||
|
|
||||||
# resize
|
# resize
|
||||||
bind-key -r -T prefix M-k resize-pane -U
|
bind-key -r -T prefix M-k resize-pane -U
|
||||||
@@ -62,24 +56,3 @@ bind-key -r -T prefix M-j resize-pane -D
|
|||||||
bind-key -r -T prefix M-h resize-pane -L
|
bind-key -r -T prefix M-h resize-pane -L
|
||||||
bind-key -r -T prefix M-l resize-pane -R
|
bind-key -r -T prefix M-l resize-pane -R
|
||||||
|
|
||||||
bind-key -r -T prefix k select-pane -U
|
|
||||||
bind-key -r -T prefix j select-pane -D
|
|
||||||
bind-key -r -T prefix h select-pane -L
|
|
||||||
bind-key -r -T prefix l select-pane -R
|
|
||||||
|
|
||||||
bind C-l send-keys 'C-l'
|
|
||||||
|
|
||||||
set-option -g allow-passthrough on
|
|
||||||
|
|
||||||
set -g default-terminal "screen-256color"
|
|
||||||
|
|
||||||
# status and culors
|
|
||||||
set -g status-left-length 85
|
|
||||||
set -g status-left "#[bg=black]#[fg=#(pomodoro tmux-color)]#(pomodoro status -f ' %!r') #[fg=default]working on#[fg=colour135] #S#[bg=default fg=black]◣"
|
|
||||||
set -g window-status-current-format "#[fg=colour135]#W"
|
|
||||||
set -g status-style bg=default
|
|
||||||
set -g pane-active-border-style fg=colour135
|
|
||||||
set -g status-justify centre
|
|
||||||
set-option -g status-interval 1
|
|
||||||
set-option -g clock-mode-color colour135
|
|
||||||
set-option -g message-style fg=colour135,bg=black
|
|
||||||
|
|||||||
73
.zshrc
73
.zshrc
@@ -1,9 +1,8 @@
|
|||||||
zmodload zsh/zprof
|
|
||||||
# If you come from bash you might have to change your $PATH.
|
# If you come from bash you might have to change your $PATH.
|
||||||
export PATH=$HOME/bin:/usr/local/bin:/usr/lib65/openjdk-17/bin:$PATH
|
export PATH=$HOME/bin:/usr/local/bin:/usr/lib64/openjdk-17/bin:$PATH
|
||||||
|
|
||||||
# Path to your oh-my-zsh installation.
|
# Path to your oh-my-zsh installation.
|
||||||
export ZSH=$HOME/.oh-my-zsh
|
export ZSH=/home/andrei/.oh-my-zsh
|
||||||
|
|
||||||
# Set name of the theme to load. Optionally, if you set this to "random"
|
# Set name of the theme to load. Optionally, if you set this to "random"
|
||||||
# it'll load a random theme each time that oh-my-zsh is loaded.
|
# it'll load a random theme each time that oh-my-zsh is loaded.
|
||||||
@@ -60,6 +59,7 @@ ZSH_THEME="blokkzh"
|
|||||||
# Add wisely, as too many plugins slow down shell startup.
|
# Add wisely, as too many plugins slow down shell startup.
|
||||||
plugins=(
|
plugins=(
|
||||||
git
|
git
|
||||||
|
zsh-fzf-history-search
|
||||||
)
|
)
|
||||||
|
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
@@ -73,11 +73,7 @@ source $ZSH/oh-my-zsh.sh
|
|||||||
|
|
||||||
# Preferred editor for local and remote sessions
|
# Preferred editor for local and remote sessions
|
||||||
# if [[ -n $SSH_CONNECTION ]]; then
|
# if [[ -n $SSH_CONNECTION ]]; then
|
||||||
if [[ -e /usr/bin/nvim ]]; then
|
|
||||||
export EDITOR='nvim'
|
|
||||||
else
|
|
||||||
export EDITOR='vim'
|
export EDITOR='vim'
|
||||||
fi
|
|
||||||
# else
|
# else
|
||||||
# export EDITOR='mvim'
|
# export EDITOR='mvim'
|
||||||
# fi
|
# fi
|
||||||
@@ -102,23 +98,62 @@ autoload -z edit-command-line
|
|||||||
zle -N edit-command-line
|
zle -N edit-command-line
|
||||||
bindkey "^v" edit-command-line
|
bindkey "^v" edit-command-line
|
||||||
|
|
||||||
bindkey -s "^w" "work^M"
|
|
||||||
|
|
||||||
# adding cargo to path
|
# adding cargo to path
|
||||||
export PATH=$HOME/.cargo/bin:$PATH
|
export PATH=$HOME/.cargo/bin:$PATH
|
||||||
|
|
||||||
# adding local to path
|
|
||||||
export PATH=$HOME/.local/bin:$PATH
|
|
||||||
|
|
||||||
|
# Open work folder with fuzzy finder
|
||||||
|
function work() {
|
||||||
|
work_dirs=( "$HOME/clones" "$HOME/sandbox" )
|
||||||
|
|
||||||
|
goto=$(find $work_dirs -maxdepth 1 -mindepth 1 -type d | fzf --query=$1 --preview "tree -C -L 2 {}")
|
||||||
|
[ -z $goto ] && return
|
||||||
|
|
||||||
|
if [ -z $TMUX ]
|
||||||
|
then
|
||||||
|
tmux new -A -s "$(basename -- $goto)" -c "$goto"
|
||||||
|
else
|
||||||
|
tmux new -d -s "$(basename -- $goto)" -c "$goto"
|
||||||
|
tmux switch-client -t "$(basename -- $goto)"
|
||||||
|
fi
|
||||||
|
|
||||||
export NVM_DIR="$HOME/.nvm"
|
|
||||||
#[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
|
||||||
nvm() {
|
|
||||||
unset -f nvm
|
|
||||||
export NVM_DIR=~/.nvm
|
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
|
|
||||||
nvm "$@"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# new fzf command integration
|
|
||||||
source <(fzf --zsh)
|
|
||||||
|
# JINA_CLI_BEGIN
|
||||||
|
|
||||||
|
## autocomplete
|
||||||
|
if [[ ! -o interactive ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
compctl -K _jina jina
|
||||||
|
|
||||||
|
_jina() {
|
||||||
|
local words completions
|
||||||
|
read -cA words
|
||||||
|
|
||||||
|
if [ "${#words}" -eq 2 ]; then
|
||||||
|
completions="$(jina commands)"
|
||||||
|
else
|
||||||
|
completions="$(jina completions ${words[2,-2]})"
|
||||||
|
fi
|
||||||
|
|
||||||
|
reply=(${(ps:
|
||||||
|
:)completions})
|
||||||
|
}
|
||||||
|
|
||||||
|
# session-wise fix
|
||||||
|
ulimit -n 4096
|
||||||
|
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
|
||||||
|
|
||||||
|
# JINA_CLI_END
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user