From c809a380bdf21b302138c1ce5d27f7bb4749cd69 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:21:51 +0200 Subject: changed keybindings --- config/essentials/nvim/ftplugin/telekasten.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua index 622972f..9454cc1 100644 --- a/config/essentials/nvim/ftplugin/telekasten.lua +++ b/config/essentials/nvim/ftplugin/telekasten.lua @@ -10,17 +10,17 @@ vim.cmd("hi link CalNavi CalRuler") vim.cmd("hi tkTagSep ctermfg=gray guifg=gray") vim.cmd("hi tkTag ctermfg=175 guifg=#d3869B") -vim.keymap.set("n", "a", "Telekasten show_tags") -vim.keymap.set("n", "b", "Telekasten show_backlinks") -vim.keymap.set("n", "c", "Telekasten show_calendar") +vim.keymap.set("n", "a", require("telekasten").show_tags) +vim.keymap.set("n", "b", require("telekasten").show_backlinks) +vim.keymap.set("n", "c", require("telekasten").show_calendar) vim.keymap.set("n", "C", "CalendarT") vim.keymap.set({"n", "i"}, "i", "Telekasten insert_link") -vim.keymap.set({"n", "i"}, "I", "Telekasten insert_img_link") -vim.keymap.set("n", "F", "Telekasten find_friends") -vim.keymap.set("n", "r", "Telekasten rename_note") -vim.keymap.set("n", "t", "Telekasten toggle_todo") +vim.keymap.set({"n", "i"}, "I", require("telekasten").insert_img_link) +vim.keymap.set("n", "F", require("telekasten").find_friends) +vim.keymap.set("n", "r", require("telekasten").rename_note) +vim.keymap.set("n", "t", require("telekasten").toggle_todo) vim.keymap.set("i", "t", "Telekasten toggle_todoA") -vim.keymap.set("n", "y", "Telekasten yank_notelink") -vim.keymap.set("n", "z", "Telekasten follow_link") +vim.keymap.set("n", "y", require("telekasten").yank_notelink) +vim.keymap.set("n", "z", require("telekasten").follow_link) vim.keymap.set("i", "l", "I[A]()+A") -- cgit v1.2.3 From 3f6dec1abc715c921c2ab272e48d48c52d660a32 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:22:22 +0200 Subject: disable aucmd for gitgutter (removed) --- config/essentials/nvim/lua/user/aucommands.vim | 1 - 1 file changed, 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/aucommands.vim b/config/essentials/nvim/lua/user/aucommands.vim index 873f9c9..cdd0ae7 100644 --- a/config/essentials/nvim/lua/user/aucommands.vim +++ b/config/essentials/nvim/lua/user/aucommands.vim @@ -8,7 +8,6 @@ augroup END " terminal specific layout augroup neovim_terminal autocmd! autocmd TermOpen * startinsert - autocmd TermOpen * :GitGutterBufferDisable autocmd TermOpen * :set nonumber norelativenumber signcolumn=no autocmd TermOpen * nnoremap i augroup END -- cgit v1.2.3 From f0b21500e36cf3aef97668ac4e5977618938f4c6 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:22:38 +0200 Subject: added dap-ui plugin --- config/essentials/nvim/lua/user/packer.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index 605c0e2..3eda78f 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -65,7 +65,9 @@ return require('packer').startup(function(use) use('hrsh7th/cmp-nvim-lsp-signature-help') use('alvan/vim-closetag') + -- debugging use('mfussenegger/nvim-dap') + use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"} } -- java use('mfussenegger/nvim-jdtls') -- cgit v1.2.3 From 072fe724915d2f8cb095958bf355a5ef103daab4 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:22:50 +0200 Subject: removed copilot plugin --- config/essentials/nvim/lua/user/packer.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index 3eda78f..94d4dff 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -49,7 +49,7 @@ return require('packer').startup(function(use) use('ojroques/vim-oscyank', {branch = "main"}) use("potamides/pantran.nvim") use('alx741/vinfo') - use('github/copilot.vim') + -- use('github/copilot.vim') -- objects use('michaeljsmith/vim-indent-object') -- cgit v1.2.3 From bf2f07bc007f523f66de1b6e76e3c63cd9ffce41 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:23:09 +0200 Subject: refactor on telekasten config --- config/essentials/nvim/lua/user/zk.lua | 43 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index ee055d6..db022cb 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -1,5 +1,6 @@ local home = vim.fn.expand("~/docs/zk") -require('telekasten').setup({ + +require("telekasten").setup({ home = home, take_over_my_home = true, auto_set_filetype = true, @@ -65,8 +66,8 @@ require('telekasten').setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, - dotNetEssentials = { - home = home .. "/" .. "dotNetEssentials", + NETEssentials = { + home = home .. "/" .. "NETEssentials", template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, @@ -88,21 +89,21 @@ require('telekasten').setup({ } }) -vim.keymap.set("n", "z", "Telekasten panel") -vim.keymap.set("n", "zb", "Telekasten show_backlinks") -vim.keymap.set("n", "zz", "Telekasten follow_link") -vim.keymap.set("n", "zN", "Telekasten new_templated_note") -vim.keymap.set("n", "zT", "Telekasten goto_today") -vim.keymap.set("n", "zW", "Telekasten goto_thisweek") -vim.keymap.set("n", "zd", "Telekasten find_daily_notes") -vim.keymap.set("n", "zf", "Telekasten find_notes") -vim.keymap.set("n", "zg", "Telekasten search_notes") -vim.keymap.set("n", "zm", "Telekasten browse_media") -vim.keymap.set("n", "zn", "Telekasten new_note") -vim.keymap.set("n", "zp", "Telekasten preview_img") -vim.keymap.set("n", "zr", "Telekasten rename_note") -vim.keymap.set("n", "zs", "Telekasten switch_vault") -vim.keymap.set("n", "zS", "Telekasten search_notes") -vim.keymap.set("n", "zt", "Telekasten panel") -vim.keymap.set("n", "zw", "Telekasten find_weekly_notes") -vim.keymap.set("n", "z#", "Telekasten show_tags") +vim.keymap.set("n", "z", require("telekasten").panel) +vim.keymap.set("n", "zb", require("telekasten").show_backlinks) +vim.keymap.set("n", "zz", require("telekasten").follow_link) +vim.keymap.set("n", "zN", require("telekasten").new_templated_note) +vim.keymap.set("n", "zT", require("telekasten").goto_today) +vim.keymap.set("n", "zW", require("telekasten").goto_thisweek) +vim.keymap.set("n", "zd", require("telekasten").find_daily_notes) +vim.keymap.set("n", "zf", require("telekasten").find_notes) +vim.keymap.set("n", "zg", require("telekasten").search_notes) +vim.keymap.set("n", "zm", require("telekasten").browse_media) +vim.keymap.set("n", "zn", require("telekasten").new_note) +vim.keymap.set("n", "zp", require("telekasten").preview_img) +vim.keymap.set("n", "zr", require("telekasten").rename_note) +vim.keymap.set("n", "zs", require("telekasten").switch_vault) +vim.keymap.set("n", "zS", require("telekasten").search_notes) +vim.keymap.set("n", "zt", require("telekasten").panel) +vim.keymap.set("n", "zw", require("telekasten").find_weekly_notes) +vim.keymap.set("n", "z#", require("telekasten").show_backlinks) -- cgit v1.2.3 From 1ddd9d746234a1cfae92bc296a499a09751291dc Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:23:20 +0200 Subject: don't use plugins anymore --- config/essentials/zsh/.zshrc | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 1260bb0..50d1bfa 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -25,24 +25,9 @@ zle -N add-surround surround zle -N change-surround surround compinit -if grep -qi "debian\|ubuntu" /usr/lib/os-release /etc/os-release 2>/dev/null -then - sfiles=( - /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh - /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - ) -else - sfiles=( - /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh) -fi -sfiles+=( - ~/.config/zsh/functions.zsh - ~/.config/zsh/aliases.sh -) -for f in "${sfiles[@]}"; do - test -f "$f" && source "$f" -done +# Source files +. $ZDOTDIR/functions.zsh +. $ZDOTDIR/aliases.sh bindkey -v bindkey -a cs change-surround -- cgit v1.2.3 From 25c1f50842cb643b95c8ac38eb1f4aa4cac4d0da Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:23:34 +0200 Subject: added dotnet completion --- config/essentials/zsh/.zshrc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 50d1bfa..9b6fa48 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -122,6 +122,23 @@ parse_git_status() { git status --short 2> /dev/null | head -n1 | awk '{print $1 " "}' } +# Completion +_dotnet_zsh_complete() +{ + local completions=("$(dotnet complete "$words")") + + # If the completion list is empty, just continue with filename selection + if [ -z "$completions" ] + then + _arguments '*::arguments: _normal' + return + fi + + # This is not a variable assignment, don't remove spaces! + _values = "${(ps:\n:)completions}" +} +compdef _dotnet_zsh_complete dotnet + export REPORTTIME=2 export TIMEFMT="-> %*E" # override built-in time command -- cgit v1.2.3 From 32d8745d0dfe3b22e33e2103c6ff5ef01263c60a Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:23:49 +0200 Subject: added aliases --- config/essentials/zsh/aliases.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index ea1c719..a1a6723 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -206,6 +206,7 @@ alias est='$EDITOR ~/proj/suckless/st/config.def.h' alias esl='$EDITOR ~/proj/suckless/slock/config.def.h' alias esls='$EDITOR ~/proj/suckless/slstatus/config.def.h' alias ehy='$EDITOR ~/.config/hypr/hyprland.conf' +alias ehyb='$EDITOR ~/.config/hypr/binds.conf' alias ewbj='$EDITOR ~/src/dotfiles/config/hyprland/waybar/config.jsonc' alias ewbs='$EDITOR ~/src/dotfiles/config/hyprland/waybar/style.css' alias cfd='$EDITOR config.def.h' @@ -213,6 +214,7 @@ alias cfd='$EDITOR config.def.h' alias cdl='cd ~/dl' alias cdoc='cd ~/docs' alias cda='cd ~/docs/android/projects' +alias csv='cd ~/docs/school/Vakken' alias cdm='cd ~/music' alias cdp='cd ~/pics' alias cdpa='cd ~/pics/ai-outputs/' @@ -241,7 +243,8 @@ alias cdng='cd /etc/nginx' alias cdrs='cd /srv/' # fzf aliases -alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n"| fzf)"' +alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' +alias ppjs='cd ~/proj/personal/scripts/"$(find ~/proj/personal/scripts -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' alias fil='$EDITOR ~/docs/filios/"$(find ~/docs/filios -type f -printf "%f\n" | fzf)"' alias cfg='find -L ~/src/dotfiles -type f 2> /dev/null | fzf | xargs -r $EDITOR' alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | clipp' -- cgit v1.2.3 From b9f24fc2b9bea23daa9990004195bc6ccac7773f Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:25:07 +0200 Subject: added completion for php --- config/essentials/nvim/lua/user/cmp/init.lua | 1 + config/essentials/nvim/lua/user/cmp/php.lua | 1 + 2 files changed, 2 insertions(+) create mode 100644 config/essentials/nvim/lua/user/cmp/php.lua (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/cmp/init.lua b/config/essentials/nvim/lua/user/cmp/init.lua index d40a67c..1306e98 100644 --- a/config/essentials/nvim/lua/user/cmp/init.lua +++ b/config/essentials/nvim/lua/user/cmp/init.lua @@ -10,5 +10,6 @@ require("user.cmp.java") require("user.cmp.js") require("user.cmp.emmet") require("user.cmp.lua") +require("user.cmp.php") require("user.cmp.python") require("user.cmp.cs") diff --git a/config/essentials/nvim/lua/user/cmp/php.lua b/config/essentials/nvim/lua/user/cmp/php.lua new file mode 100644 index 0000000..9b2fa18 --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/php.lua @@ -0,0 +1 @@ +require'lspconfig'.phpactor.setup{} -- cgit v1.2.3 From a20229a39ebea62fa40ced9762162554c79b06fd Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:28:22 +0200 Subject: added dap en dap-ui configuration --- config/essentials/nvim/after/plugin/dap.lua | 39 +++++++++++ config/essentials/nvim/after/plugin/dapui.lua | 94 +++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 config/essentials/nvim/after/plugin/dap.lua create mode 100644 config/essentials/nvim/after/plugin/dapui.lua (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/dap.lua b/config/essentials/nvim/after/plugin/dap.lua new file mode 100644 index 0000000..8c0a739 --- /dev/null +++ b/config/essentials/nvim/after/plugin/dap.lua @@ -0,0 +1,39 @@ +local dap = require('dap') + +dap.adapters.coreclr = { + type = 'executable', + command = 'netcoredbg', + args = {'--interpreter=vscode'} +} + +dap.configurations.cs = { + { + type = "coreclr", + name = "launch - netcoredbg", + request = "launch", + program = function() + return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file') + end, + }, +} + +local function nnoremap(rhs, lhs, bufopts, desc) + bufopts.desc = desc + vim.keymap.set("n", rhs, lhs, bufopts) +end +local bufopts = { noremap=true, silent=true } + + +nnoremap('' , dap.continue, bufopts, "Continue") +nnoremap('' , dap.step_over, bufopts, "Step over") +nnoremap('' , dap.step_into, bufopts, "Step into") +nnoremap('' , dap.step_out, bufopts, "Step out") +nnoremap('b' , dap.toggle_breakpoint, bufopts, "Toggle breakpoint") + +nnoremap('B' , function() dap.set_breakpoint(vim.fn.input('Breakpoint condition: ')) + end, bufopts, "Set breakpoint") +nnoremap('lp' , function() dap.set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) + end, bufopts, "set breakpoint with log point message") + +nnoremap('dr' , dap.repl.open, bufopts, "Reply open") +nnoremap('dl' , dap.run_last, bufopts, "Run las") diff --git a/config/essentials/nvim/after/plugin/dapui.lua b/config/essentials/nvim/after/plugin/dapui.lua new file mode 100644 index 0000000..faec590 --- /dev/null +++ b/config/essentials/nvim/after/plugin/dapui.lua @@ -0,0 +1,94 @@ +local dap, dapui = require("dap"), require("dapui") + +dapui.setup({ + icons = { expanded = "▾", collapsed = "▸", current_frame = "▸" }, + mappings = { + -- Use a table to apply multiple mappings + expand = { "", "<2-LeftMouse>" }, + open = "o", + remove = "d", + edit = "e", + repl = "r", + toggle = "t", + }, + -- Use this to override mappings for specific elements + element_mappings = { + -- Example: + -- stacks = { + -- open = "", + -- expand = "o", + -- } + }, + -- Expand lines larger than the window + -- Requires >= 0.7 + expand_lines = vim.fn.has("nvim-0.7") == 1, + -- Layouts define sections of the screen to place windows. + -- The position can be "left", "right", "top" or "bottom". + -- The size specifies the height/width depending on position. It can be an Int + -- or a Float. Integer specifies height/width directly (i.e. 20 lines/columns) while + -- Float value specifies percentage (i.e. 0.3 - 30% of available lines/columns) + -- Elements are the elements shown in the layout (in order). + -- Layouts are opened in order so that earlier layouts take priority in window sizing. + layouts = { + { + elements = { + -- Elements can be strings or table with id and size keys. + { id = "scopes", size = 0.25 }, + "breakpoints", + "stacks", + "watches", + }, + size = 40, -- 40 columns + position = "left", + }, + { + elements = { + "repl", + "console", + }, + size = 0.25, -- 25% of total lines + position = "bottom", + }, + }, + controls = { + -- Requires Neovim nightly (or 0.8 when released) + enabled = true, + -- Display controls in this element + element = "repl", + icons = { + pause = "", + play = "", + step_into = "", + step_over = "", + step_out = "", + step_back = "", + run_last = "↻", + terminate = "□", + }, + }, + floating = { + max_height = nil, -- These can be integers or a float between 0 and 1. + max_width = nil, -- Floats will be treated as percentage of your screen. + border = "single", -- Border style. Can be "single", "double" or "rounded" + mappings = { + close = { "q", "" }, + }, + }, + windows = { indent = 1 }, + render = { + max_type_length = nil, -- Can be integer or nil. + max_value_lines = 100, -- Can be integer or nil. + } +}) + + +dap.listeners.after.event_initialized["dapui_config"] = function() + dapui.open() +end +dap.listeners.before.event_terminated["dapui_config"] = function() + dapui.close() +end +dap.listeners.before.event_exited["dapui_config"] = function() + dapui.close() +end + -- cgit v1.2.3 From faf335a0e20bd111785e60fe2307c976c97bb9dd Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:29:30 +0200 Subject: imply '.desktop' suffix --- config/essentials/zsh/functions.zsh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 35aaf58..c527521 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -243,10 +243,9 @@ pacsize() mime-default () { logn "Setting '$1' as default for its mimetypes" - grep "MimeType=" /usr/share/applications/"$1" | - cut -d '=' -f 2- | - tr ';' '\n' | - xargs -I {} xdg-mime default "$1" "{}" + grep "MimeType=" /usr/share/applications/"$1".desktop | + cut -d '=' -f 2- | tr ';' '\0' | + xargs -0I{} xdg-mime default "$1".desktop "{}" logn "Done." } -- cgit v1.2.3 From 376d8127ec219499aa8a2279eab45648be070885 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:30:28 +0200 Subject: small fixes --- config/essentials/zsh/functions.zsh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index c527521..fda80fb 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -32,6 +32,7 @@ ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit } # googoo aliases _googoo_fzf_opt() { + unset dest opt if [ "$1" ] then [ -d "$1" ] && dest="$1" || opt="-q $1" @@ -99,9 +100,7 @@ clip() { } unzipp() { - file=$1 - shift - unzip $file $@ || exit 1 + unzip -- "$(readlink -f -- "$1")" || return 1 rm $file } -- cgit v1.2.3 From f235c957d69bee3b4942ec6ecf4650cc6a9a08ae Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 28 Sep 2023 15:31:41 +0200 Subject: added rust completino --- config/essentials/nvim/lua/user/cmp/init.lua | 6 +- config/essentials/nvim/lua/user/cmp/rust.lua | 173 +++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 config/essentials/nvim/lua/user/cmp/rust.lua (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/cmp/init.lua b/config/essentials/nvim/lua/user/cmp/init.lua index 1306e98..1ca0a10 100644 --- a/config/essentials/nvim/lua/user/cmp/init.lua +++ b/config/essentials/nvim/lua/user/cmp/init.lua @@ -4,12 +4,12 @@ require("user.cmp.arduino") require("user.cmp.bash") require("user.cmp.clangd") require("user.cmp.cs") -require("user.cmp.html") require("user.cmp.css") +require("user.cmp.emmet") +require("user.cmp.html") require("user.cmp.java") require("user.cmp.js") -require("user.cmp.emmet") require("user.cmp.lua") require("user.cmp.php") require("user.cmp.python") -require("user.cmp.cs") +require("user.cmp.rust") diff --git a/config/essentials/nvim/lua/user/cmp/rust.lua b/config/essentials/nvim/lua/user/cmp/rust.lua new file mode 100644 index 0000000..46a97eb --- /dev/null +++ b/config/essentials/nvim/lua/user/cmp/rust.lua @@ -0,0 +1,173 @@ +require'lspconfig'.rust_analyzer.setup{ + settings = { + ['rust-analyzer'] = { + diagnostics = { + enable = false; + } + } + }, + capabilities = + { + experimental = { + serverStatusNotification = true + }, + general = { + positionEncodings = { "utf-16" } + }, + textDocument = { + callHierarchy = { + dynamicRegistration = false + }, + codeAction = { + codeActionLiteralSupport = { + codeActionKind = { + valueSet = { "", "quickfix", "refactor", "refactor.extract", "refactor.inline", "refactor.rewrite", "source", "source.organizeImports" } + } + }, + dataSupport = true, + dynamicRegistration = true, + isPreferredSupport = true, + resolveSupport = { + properties = { "edit" } + } + }, + completion = { + completionItem = { + commitCharactersSupport = false, + deprecatedSupport = false, + documentationFormat = { "markdown", "plaintext" }, + preselectSupport = false, + snippetSupport = false + }, + completionItemKind = { + valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 } + }, + contextSupport = false, + dynamicRegistration = false + }, + declaration = { + linkSupport = true + }, + definition = { + dynamicRegistration = true, + linkSupport = true + }, + diagnostic = { + dynamicRegistration = false + }, + documentHighlight = { + dynamicRegistration = false + }, + documentSymbol = { + dynamicRegistration = false, + hierarchicalDocumentSymbolSupport = true, + symbolKind = { + valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 } + } + }, + formatting = { + dynamicRegistration = true + }, + hover = { + contentFormat = { "markdown", "plaintext" }, + dynamicRegistration = true + }, + implementation = { + linkSupport = true + }, + inlayHint = { + dynamicRegistration = true, + resolveSupport = { + properties = {} + } + }, + publishDiagnostics = { + dataSupport = true, + relatedInformation = true, + tagSupport = { + valueSet = { 1, 2 } + } + }, + rangeFormatting = { + dynamicRegistration = true + }, + references = { + dynamicRegistration = false + }, + rename = { + dynamicRegistration = true, + prepareSupport = true + }, + semanticTokens = { + augmentsSyntaxTokens = true, + dynamicRegistration = false, + formats = { "relative" }, + multilineTokenSupport = false, + overlappingTokenSupport = true, + requests = { + full = { + delta = true + }, + range = false + }, + serverCancelSupport = false, + tokenModifiers = { "declaration", "definition", "readonly", "static", "deprecated", "abstract", "async", "modification", "documentation", "defaultLibrary" }, + tokenTypes = { "namespace", "type", "class", "enum", "interface", "struct", "typeParameter", "parameter", "variable", "property", "enumMember", "event", "function", "method", "macro", "keyword", "modifier", "comment", "string", "number", "regexp", "operator", "decorator" } + }, + signatureHelp = { + dynamicRegistration = false, + signatureInformation = { + activeParameterSupport = true, + documentationFormat = { "markdown", "plaintext" }, + parameterInformation = { + labelOffsetSupport = true + } + } + }, + synchronization = { + didSave = true, + dynamicRegistration = false, + willSave = true, + willSaveWaitUntil = true + }, + typeDefinition = { + linkSupport = true + } + }, + window = { + showDocument = { + support = true + }, + showMessage = { + messageActionItem = { + additionalPropertiesSupport = false + } + }, + workDoneProgress = true + }, + workspace = { + applyEdit = true, + configuration = true, + didChangeWatchedFiles = { + dynamicRegistration = true, + relativePatternSupport = true + }, + inlayHint = { + refreshSupport = true + }, + semanticTokens = { + refreshSupport = true + }, + symbol = { + dynamicRegistration = false, + symbolKind = { + valueSet = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 } + } + }, + workspaceEdit = { + resourceOperations = { "rename", "create", "delete" } + }, + workspaceFolders = true + } + } +} -- cgit v1.2.3 From 2e5633ecfa2287c890e3a5873626fc0d28fc19eb Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 1 Oct 2023 21:12:50 +0200 Subject: added getgit --- config/essentials/zsh/functions.zsh | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index fda80fb..ed5f677 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -66,6 +66,7 @@ oclip() { printf "\033]52;c;$(echo -n "$@" | base64)\a"; } sms() { ssh -t phone sendmsg "$1" "'$2'"; } trcp() { scp "$1" db:/media/basilisk/downloads/transmission/torrents/; } rln() { ln -s "$(readlink -f "$1")" "$2"; } +getgit() { git clone git@db:"$1"; } ipc() { -- cgit v1.2.3 From c0a637ef3cd31fbef003a85f5a0bcce1bc867807 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 2 Oct 2023 15:53:37 +0200 Subject: changed ping to quadnine dns --- config/essentials/zsh/aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index a1a6723..1282f24 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -173,7 +173,7 @@ alias pipreq='pip install -r requirements.txt' alias ch='chown ${USER}:${USER} -R' alias kll='killall' -alias pi='ping archlinux.org -c4' +alias pi='ping 9.9.9.9 -c4' alias sba='source env/bin/activate || source bin/activate' alias smc='systemctl' alias dsmc='doas systemctl' -- cgit v1.2.3 From d5fd87d1b0e9a1c9fb6328b5ce8a0af0497eefab Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 2 Oct 2023 15:54:05 +0200 Subject: fix tab completion not working with workaround --- config/essentials/nvim/lua/user/cmp/setup.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua index 36d55e3..d43439a 100644 --- a/config/essentials/nvim/lua/user/cmp/setup.lua +++ b/config/essentials/nvim/lua/user/cmp/setup.lua @@ -48,6 +48,7 @@ local function nnoremap(rhs, lhs, bufopts, desc) vim.keymap.set("n", rhs, lhs, bufopts) end +vim.keymap.set('c', '', '', { silent = false }) -- to fix cmp -- Regular Neovim LSP client keymappings local bufopts = { noremap=true, silent=true } nnoremap('gD', vim.lsp.buf.declaration, bufopts, "Go to declaration") -- cgit v1.2.3 From efbc3b1db349655a3c075ab5da22b1877c97fbb3 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 2 Oct 2023 15:54:27 +0200 Subject: reformat --- config/essentials/nvim/lua/user/cmp/setup.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua index d43439a..bb91e31 100644 --- a/config/essentials/nvim/lua/user/cmp/setup.lua +++ b/config/essentials/nvim/lua/user/cmp/setup.lua @@ -1,4 +1,4 @@ -local cmp = require'cmp' +local cmp = require 'cmp' cmp.setup({ snippet = { expand = function(args) @@ -14,11 +14,11 @@ cmp.setup({ [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete(), [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), + [''] = cmp.mapping.confirm({ select = true }), }), sources = cmp.config.sources({ { name = 'nvim_lua' }, - { name = 'nvim_lsp'}, + { name = 'nvim_lsp' }, { name = 'path' }, { name = 'luasnip' }, { name = 'nvim_lsp_signature_help' }, @@ -44,22 +44,22 @@ cmp.setup.cmdline(':', { }) local function nnoremap(rhs, lhs, bufopts, desc) - bufopts.desc = desc - vim.keymap.set("n", rhs, lhs, bufopts) + bufopts.desc = desc + vim.keymap.set("n", rhs, lhs, bufopts) end vim.keymap.set('c', '', '', { silent = false }) -- to fix cmp -- Regular Neovim LSP client keymappings -local bufopts = { noremap=true, silent=true } +local bufopts = { noremap = true, silent = true } nnoremap('gD', vim.lsp.buf.declaration, bufopts, "Go to declaration") nnoremap('gd', vim.lsp.buf.definition, bufopts, "Go to definition") nnoremap('gi', vim.lsp.buf.implementation, bufopts, "Go to implementation") nnoremap('K', vim.lsp.buf.hover, bufopts, "Hover text") -nnoremap('', vim.lsp.buf.signature_help, bufopts, "Show signature") +nnoremap('k', vim.lsp.buf.signature_help, bufopts, "Show signature") nnoremap('wa', vim.lsp.buf.add_workspace_folder, bufopts, "Add workspace folder") nnoremap('wr', vim.lsp.buf.remove_workspace_folder, bufopts, "Remove workspace folder") nnoremap('wl', function() -print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, bufopts, "List workspace folders") nnoremap('D', vim.lsp.buf.type_definition, bufopts, "Go to type definition") nnoremap('rn', vim.lsp.buf.rename, bufopts, "Rename") -- cgit v1.2.3 From dc0a65023ce338e5b9e403d0e51858c4917fb354 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 4 Oct 2023 02:54:26 +0200 Subject: added gmod alias --- config/essentials/zsh/aliases.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 1282f24..dcee027 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -268,6 +268,7 @@ alias sshdb='ssh -t db "tmux a || tmux"' alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music' # oh-my-zsh git aliases +alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs $EDITOR' alias g='git' alias ga='git add' alias gaa='git add --all' -- cgit v1.2.3 From 2c603076ebaa4d00f95614052c5868c99aca738d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 4 Oct 2023 02:54:37 +0200 Subject: added fdie snippet --- config/essentials/nvim/after/plugin/luasnip.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 5657560..a98fe82 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -155,6 +155,10 @@ ls.add_snippets("sh", { stty \$old_stty_cfg } ]], {}), + parse("fdie", + [[ + die () { >&2 printf '%s\n' "\$@"; exit 1; } + ]], {}), parse("flogn", [[ logn () { >&2 printf '%s\n' "\$@"; } -- cgit v1.2.3 From 847159314a25afc118b5cefbecc93da82a5473f1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 4 Oct 2023 02:54:50 +0200 Subject: added ytdl alias (ytclipo) --- config/essentials/zsh/aliases.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index dcee027..d901740 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -253,6 +253,7 @@ alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp" alias ffwin='hyprctl clients -j | jq '\''.[].pid'\'' | fzf --preview "hyprctl clients -j | jq '\''.[] | select(.pid == {}) | {class, title, workspace, xwayland}'\''"' alias pff='find ${PASSWORD_STORE_DIR:=~/src/password-store/} -name "*.gpg" | sed -e "s@$PASSWORD_STORE_DIR/@@" -e '\''s/\.gpg$//'\'' | fzf | xargs pass show -c' alias fzps='fzf --print0 | xargs -0I{}' +alias ytdl='yt-dlp --restrict-filenames --embed-chapters -f "b" -S "res:1080" -P "$HOME/vids/youtube/" -o "%(channel)s - %(title)s.%(ext)s"' alias dcb='docker build' alias dcbt='docker build -t' -- cgit v1.2.3 From bdfb02015178aabdb80320e9355fb33517c7f240 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 4 Oct 2023 02:55:09 +0200 Subject: added dap disconnect remap --- config/essentials/nvim/after/plugin/dap.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/dap.lua b/config/essentials/nvim/after/plugin/dap.lua index 8c0a739..e32b5ee 100644 --- a/config/essentials/nvim/after/plugin/dap.lua +++ b/config/essentials/nvim/after/plugin/dap.lua @@ -25,6 +25,7 @@ local bufopts = { noremap=true, silent=true } nnoremap('' , dap.continue, bufopts, "Continue") +nnoremap('' , dap.disconnect, bufopts, "Continue") nnoremap('' , dap.step_over, bufopts, "Step over") nnoremap('' , dap.step_into, bufopts, "Step into") nnoremap('' , dap.step_out, bufopts, "Step out") -- cgit v1.2.3 From 344892a740937cea65521d986a474531a00dc1de Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 4 Oct 2023 14:27:38 +0200 Subject: added aliases --- config/essentials/zsh/aliases.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index d901740..c7ee5b7 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -241,6 +241,7 @@ alias czo='cd ~/zot/' alias cdpw='cd ${PASSWORD_STORE_DIR:-~/.password-store}' alias cdng='cd /etc/nginx' alias cdrs='cd /srv/' +alias god='cd "$(find . -mindepth 1 -maxdepth 1 -type d | fzf)"' # fzf aliases alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' @@ -269,6 +270,7 @@ alias sshdb='ssh -t db "tmux a || tmux"' alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music' # oh-my-zsh git aliases +alias gitdotf='GIT_WORK_TREE=~/src/dotfiles/ GIT_DIR=~/src/dotfiles/.git' alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs $EDITOR' alias g='git' alias ga='git add' -- cgit v1.2.3 From d9b55a1b4ce254afce95ec836d819d19da5b0d6e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 5 Oct 2023 16:23:54 +0200 Subject: changed parse_branch and added it to supd --- bin/extra/supd | 7 +++++-- config/essentials/zsh/.zshrc | 11 +++-------- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'config/essentials') diff --git a/bin/extra/supd b/bin/extra/supd index 83a606b..4975b94 100755 --- a/bin/extra/supd +++ b/bin/extra/supd @@ -19,8 +19,11 @@ check () printf 'Up to date.' || printf 'Couldn'\''t update.' printf ' ' - printf '%s\n' "$(git status --short 2> /dev/null | - awk 'NR==1 {print $1}')" + printf '%s %s\n' "$(git status --short 2> /dev/null | + awk 'NR==1 {print $1}')" "$(git branch -v 2>/dev/null | + grep '^\*' | cut -f2 -d'[' | cut -f1 -d' ' | + sed 's/ahead/↑/;s/behind/↓/;s/\*//')" + done } diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 9b6fa48..2499c45 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -106,14 +106,9 @@ RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(par setopt prompt_subst parse_git_remote() { - b="$(git branch -v 2>/dev/null | grep "^*" | cut -f2 -d'[' | cut -f1 -d' ')" - if [ "$b" = "behind" ] - then - printf "↓ " - elif [ "$b" = "ahead" ] - then - printf "↑ " - fi + git branch -v 2>/dev/null | + grep '^\*' | cut -f2 -d'[' | cut -f1 -d' ' | + sed 's/ahead/↑/;s/behind/↓/;s/\*//' } parse_git_branch() { git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null -- cgit v1.2.3 From cf5e7428f58c95a97156a852bc67213de81c6cf8 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 8 Oct 2023 13:09:54 +0200 Subject: added vaults --- config/essentials/nvim/lua/user/zk.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index db022cb..989560a 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -76,6 +76,16 @@ require("telekasten").setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, + ScalingNetworks = { + home = home .. "/" .. "ScalingNetworks", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, + RoutingSwitchingEssentials = { + home = home .. "/" .. "RoutingSwitchingEssentials", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, SoftwareDesign2 = { home = home .. "/" .. "SoftwareDesign2", template_new_note = home .. "/" .. "templates/new_note.md", -- cgit v1.2.3 From 7082e91ec427726f8da60c990b4ca0edf541c3de Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 8 Oct 2023 13:10:03 +0200 Subject: added 'cw' snippet for cs --- config/essentials/nvim/after/plugin/luasnip.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index a98fe82..3f607ab 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -206,6 +206,10 @@ ls.add_snippets("javascript", { { i(1), rep(1), i(0) })), }) +ls.add_snippets("cs", { + parse("cw", "Console.WriteLine($1);$0"), +}) + ls.add_snippets("telekasten", { --link s("ln", fmt( -- cgit v1.2.3 From 171ea6ca8655a7e1831e6b89af70147246c376cf Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 8 Oct 2023 17:07:20 +0200 Subject: added space after sign --- config/essentials/zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 2499c45..d324e19 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -108,7 +108,7 @@ setopt prompt_subst parse_git_remote() { git branch -v 2>/dev/null | grep '^\*' | cut -f2 -d'[' | cut -f1 -d' ' | - sed 's/ahead/↑/;s/behind/↓/;s/\*//' + sed 's/ahead/↑ /;s/behind/↓ /;s/\*//' } parse_git_branch() { git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null -- cgit v1.2.3 From 6434a2b0c1a0fc6bd9d63d437243d8c5fd45ac34 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 9 Oct 2023 21:20:44 +0200 Subject: readded plugins and removed slow line --- config/essentials/zsh/.zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index d324e19..5e1e838 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -18,7 +18,6 @@ zle -N edit-command-line zstyle ':compinstall' filename '/home/aluc/.zshrc' zstyle ':completion:*' menu select autoload -Uz compinit -compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION autoload -Uz surround zle -N delete-surround surround zle -N add-surround surround @@ -28,6 +27,8 @@ compinit # Source files . $ZDOTDIR/functions.zsh . $ZDOTDIR/aliases.sh +. /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +. /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh bindkey -v bindkey -a cs change-surround -- cgit v1.2.3 From e819980da0b92c3981ecb697e999d7cec633ab76 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 10 Oct 2023 18:32:07 +0200 Subject: fixed: plugins not working on debian --- config/essentials/zsh/.zshrc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 5e1e838..4212db7 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -27,8 +27,18 @@ compinit # Source files . $ZDOTDIR/functions.zsh . $ZDOTDIR/aliases.sh -. /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -. /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh + +local PLUGPATH +for file in /etc/os-release /usr/lib/os-release +do [ -f "$file" ] && . "$file" && break +done +case "${ID:=unknown}" in + debian|ubuntu) PLUGPATH=/usr/share/ ;; + *) PLUGPATH=/usr/share/zsh/plugins ;; +esac +echo $PLUGPATH +. $PLUGPATH/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +. $PLUGPATH/zsh-autosuggestions/zsh-autosuggestions.zsh bindkey -v bindkey -a cs change-surround -- cgit v1.2.3 From 34bb4516d35f0d9c65f028f8e2ea0cda079fdf02 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 10 Oct 2023 18:32:34 +0200 Subject: fix: useless echo --- config/essentials/zsh/.zshrc | 1 - 1 file changed, 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 4212db7..414a7d7 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -36,7 +36,6 @@ case "${ID:=unknown}" in debian|ubuntu) PLUGPATH=/usr/share/ ;; *) PLUGPATH=/usr/share/zsh/plugins ;; esac -echo $PLUGPATH . $PLUGPATH/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh . $PLUGPATH/zsh-autosuggestions/zsh-autosuggestions.zsh -- cgit v1.2.3 From 46d9892287488d8cf3887c436f37c66ebaf20ebc Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 10 Oct 2023 22:57:20 +0200 Subject: added edit_dir function --- config/essentials/zsh/aliases.sh | 6 ++++-- config/essentials/zsh/functions.zsh | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index c7ee5b7..cc175e5 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -213,6 +213,7 @@ alias cfd='$EDITOR config.def.h' # /# quick cd jV}k:!sort -t "'" -k 2 alias cdl='cd ~/dl' alias cdoc='cd ~/docs' +alias czk='cd ~/docs/zk' alias cda='cd ~/docs/android/projects' alias csv='cd ~/docs/school/Vakken' alias cdm='cd ~/music' @@ -246,8 +247,9 @@ alias god='cd "$(find . -mindepth 1 -maxdepth 1 -type d | fzf)"' # fzf aliases alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' alias ppjs='cd ~/proj/personal/scripts/"$(find ~/proj/personal/scripts -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' -alias fil='$EDITOR ~/docs/filios/"$(find ~/docs/filios -type f -printf "%f\n" | fzf)"' -alias cfg='find -L ~/src/dotfiles -type f 2> /dev/null | fzf | xargs -r $EDITOR' +alias escr='edit_in_dir ~/proj/personal/scripts/' +alias fil='edit_in_dir ~/docs/filios/' +alias cfg='edit_in_dir ~/src/dotfiles' alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | clipp' alias asf='alias | fzf' alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp" diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index ed5f677..85efda4 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -286,3 +286,9 @@ resize() return 1 convert -resize $1^ -gravity center -crop $1+0+0 -- "$2" "${3:-$1}" } + +edit_in_dir() { + file="$1/$(goo f "$1" | sed "s@^$1@@" | fzf)" + [ -f "$file" ] || return 1 + $EDITOR "$file" +} -- cgit v1.2.3 From a915b5ade1a47b9678e2f9963b13b49dbd406031 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 10 Oct 2023 22:59:02 +0200 Subject: replaced scr alias --- config/essentials/zsh/aliases.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index cc175e5..4aff77e 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -121,7 +121,6 @@ alias trclipo='transmission-remote debuc.com -a "$(clipo)"' alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg' # vim -alias scr='nvim +"setlocal buftype=nofile bufhidden=hide noswapfile filetype=txt" scratch' alias vimp="vim '+PlugInstall'" alias nvimp="nvim '+PackerSync'" alias nvg='git status > /dev/null 2>&1 && nvim "+Git"' @@ -247,7 +246,7 @@ alias god='cd "$(find . -mindepth 1 -maxdepth 1 -type d | fzf)"' # fzf aliases alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' alias ppjs='cd ~/proj/personal/scripts/"$(find ~/proj/personal/scripts -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' -alias escr='edit_in_dir ~/proj/personal/scripts/' +alias scr='edit_in_dir ~/proj/personal/scripts/' alias fil='edit_in_dir ~/docs/filios/' alias cfg='edit_in_dir ~/src/dotfiles' alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | clipp' -- cgit v1.2.3