From a98ae6bd5a1c7e2d278c5df2b927c0a5427141d0 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 31 Oct 2023 14:31:32 +0100 Subject: turn aliases into scripts This allows for better integration, and makes it possible to call these from other programs, such as window managers, ... --- config/essentials/zsh/aliases.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index e9c7e2f..575502c 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -17,18 +17,13 @@ then alias calc='bc <<<' - if [ "$WAYLAND_DISPLAY" ] - then - alias -g clipp='wl-copy -n' - alias -g clipo='wl-paste -n' - else + if [ -z "$WAYLAND_DISPLAY" ] + then if which devour > /dev/null 2>&1 then alias mpv='devour mpv' alias zathura='devour zathura' fi - alias -g clipp='xclip -selection clipboard -r' - alias -g clipo='xclip -o -selection clipboard -r' fi alias clipic='clipo > /tmp/pic.png' -- cgit v1.2.3 From c3e98662e367049d32a9a27805c620c178be603d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 31 Oct 2023 17:32:29 +0100 Subject: added plantuml support with plugin --- config/essentials/nvim/after/plugin/plantuml.lua | 10 ++++++++++ config/essentials/nvim/lua/user/packer.lua | 21 ++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 config/essentials/nvim/after/plugin/plantuml.lua (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/plantuml.lua b/config/essentials/nvim/after/plugin/plantuml.lua new file mode 100644 index 0000000..da14862 --- /dev/null +++ b/config/essentials/nvim/after/plugin/plantuml.lua @@ -0,0 +1,10 @@ +require('plantuml').setup +{ + renderer = { + type = 'text', + options = { + split_cmd = 'split', -- Allowed values: `split`, `vsplit`. + } + }, + render_on_write = true, -- Set to false to disable auto-rendering. +} diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index 36f9ec0..ed2bbf1 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -45,13 +45,20 @@ return require('packer').startup(function(use) use('christoomey/vim-tmux-navigator') - -- utils - use('godlygeek/tabular') - use('renerocksai/calendar-vim') - use('ojroques/vim-oscyank', {branch = "main"}) - use("potamides/pantran.nvim") - use('alx741/vinfo') - -- use('github/copilot.vim') + -- utils + use('godlygeek/tabular') + use('renerocksai/calendar-vim') + use('ojroques/vim-oscyank', {branch = "main"}) + use("potamides/pantran.nvim") + use('alx741/vinfo') + use('sheerun/vim-polyglot') + -- use('github/copilot.vim') + -- + use { + 'https://gitlab.com/itaranto/plantuml.nvim', + tag = '*', + config = function() require('plantuml').setup() end + } -- objects use('michaeljsmith/vim-indent-object') -- cgit v1.2.3 From ed0bc4340570c8ecf5da244b69027c97750ee726 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 14:07:03 +0100 Subject: cleanup --- config/essentials/zsh/functions.zsh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 9783794..c64c474 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -270,13 +270,15 @@ fpass() { muttmail() { - log "email set: " - ls $HOME/.config/mutt/configs | + local config + config="$HOME/.config/mutt" + + find "$config"/configs -type f -printf '%f\n' | fzf | tee /dev/stderr | - xargs -I {} ln -sf "$HOME/.config/mutt/configs/{}" $HOME/.config/mutt/muttrc - log 'Press [Enter to login]' - read && mutt + xargs -I {} ln -sf "$config/configs/{}" "$config"/muttrc + log 'Press [Enter] to login.' + head -n 1 && mutt } resize() -- cgit v1.2.3 From 411cc94a9724d9fe96c3410f2e153ebcc8a0fc5a Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 14:07:31 +0100 Subject: changed 'nextdeadline' to a function --- config/essentials/zsh/aliases.sh | 1 - config/essentials/zsh/functions.zsh | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 575502c..1ca0cf7 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -183,7 +183,6 @@ alias tpid='tail -f /dev/null --pid' alias pwdcp='pwd | clipp' alias gw="grep -ri" alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} | supd' -alias nextdeadline='sed -n "/$(grep '\''^#'\'' ~/docs/filios/deadlines | sort -t '\''/'\'' -k 3 -k 2 -k 1 -n | head -n 1 | sed '\''s@/@.@g'\'')/,/^#\|^$/p" ~/docs/filios/deadlines | head -n -1' alias vbm='vboxmanage' alias vbls='vbm list vms' diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index c64c474..41d57d1 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -294,3 +294,15 @@ edit_in_dir() { [ -f "$file" ] || return 1 $EDITOR "$file" } + +nextddl() +{ + local date + deadlines="$HOME/docs/filios/deadlines" + date="$(grep '^#' "$deadlines" | + sort -t '/' -k 3 -k 2 -k 1 -n | + sed -n "${1:-1}p" | + sed 's@/@.@g')" + sed -n "/$date/,/^#\|^$/p" "$deadlines" | + head -n -1 +} -- cgit v1.2.3 From 638a635034bb653949dd44d26d17f074c9c17764 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 14:16:26 +0100 Subject: exit on no mail --- config/essentials/zsh/functions.zsh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 41d57d1..dccede1 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -271,12 +271,13 @@ fpass() { muttmail() { local config + local mail config="$HOME/.config/mutt" - find "$config"/configs -type f -printf '%f\n' | - fzf | - tee /dev/stderr | - xargs -I {} ln -sf "$config/configs/{}" "$config"/muttrc + mail="$(find "$config"/configs -type f -printf '%f\n' | fzf)" + [ "$mail" ] || return 1 + logn "$mail" + ln -sf "$config/configs/$mail" "$config"/muttrc log 'Press [Enter] to login.' head -n 1 && mutt } -- cgit v1.2.3 From cb92f16cd26cbf111b8c5271ac8b5146a3ced00d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 18:33:18 +0100 Subject: added 'html' lsp support in php files --- config/essentials/nvim/after/plugin/luasnip.lua | 324 ++++++++++++------------ config/essentials/nvim/lua/user/cmp/html.lua | 5 +- 2 files changed, 165 insertions(+), 164 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 319a68c..5cf54d5 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -29,33 +29,33 @@ vim.keymap.set({"i", "s"}, "", "luasnip-expand-or-jump", { noremap = vim.keymap.set({"i", "s"}, "", "luasnip-jump-prev", { noremap = true }) vim.keymap.set({"i", "s"}, "", "luasnip-next-choice", { noremap = true }) vim.keymap.set("n", "s", function() - ls.cleanup() - vim.cmd("source ~/.config/nvim/after/plugin/luasnip.lua") - print("snippets reloaded.") + ls.cleanup() + vim.cmd("source ~/.config/nvim/after/plugin/luasnip.lua") + print("snippets reloaded.") end, { noremap = true }) ls.add_snippets("lua", { - -- print - s("pt", fmt("print({}){}", { i(1, "\"Hello World!\"") , i(0) })), - -- local function - parse("lf", "local $1 = function($2)\n\t$3\nend$0", {}), - -- require - s("lrq", fmt("local {} = require('{}')", { i(1), rep(1) })), - parse("rq", "require('$1')$0", {}), - parse("rqs", "require('$1').setup {\n\t$2\n}$0", {}), - parse("use", "use('$1')$0", {}), - -- function - s("fn", fmt( - [[ - function {}({}) - {} - end{} - ]], - { i(1), i(2), i(3), i(0) })), - parse("sn", "s(\"$1\", fmt(\n[[\n$2\n]],\n{ $3 })),$0", {}), + -- print + s("pt", fmt("print({}){}", { i(1, "\"Hello World!\"") , i(0) })), + -- local function + parse("lf", "local $1 = function($2)\n\t$3\nend$0", {}), + -- require + s("lrq", fmt("local {} = require('{}')", { i(1), rep(1) })), + parse("rq", "require('$1')$0", {}), + parse("rqs", "require('$1').setup {\n\t$2\n}$0", {}), + parse("use", "use('$1')$0", {}), + -- function + parse("fn", + [[ + function $1($2) + end$0 + ]], {}), + parse("sn", "s(\"$1\", fmt(\n[[\n$2\n]],\n{ $3 })),$0", {}), }) -ls.add_snippets("html", { +local languages = {'php', 'html'} +for language = 1,#languages do +ls.add_snippets(languages[language], { s("", fmt( [[ @@ -64,166 +64,166 @@ ls.add_snippets("html", { - {}{} + {}

{}

{} ]], - {i(1, "title"), i(2), i(3, "Header"), i(0)})), - s("sty", fmt( + {i(1, "title"), rep(2), i(0)})), + parse("sty", [[ - {} - ]], - { i(1), i(0) })), + $0 + ]], {}), }) +end ls.add_snippets("java", { - -- function - s("fn", fmt( - [[ - {}{} {}({}) - {{ - {} - }} - ]], - { - c(1, {t "public ", t "private ", t ""}), - i(2, "type"), - i(3, "f"), - i(4), i(0) - })), - -- setter function - s("psv", fmt( - [[ - public class Main - {{ - public static void main (String[] args) - {{ - {} - }} - }} - ]], - { i(0) })), - -- constructor - s("class", fmt( - [[ - {}class {} - {{ - {} - }}{} - ]], - { c(1, {t "public ", t "private ", t ""}), i(2), i(3), i(0)})), - -- StringBuilder - s("sb", fmt( - [[ - public void print() - {{ - StringBuilder sb = new StringBuilder(30); - sb.append({}); - sb.append(", ").append({});{} - System.out.print(sb.toString()); - }}{} - ]], - { i(1), i(2), i(3), i(0)})), - -- print - parse("pt", "System.out.println($1);$0", {}), - parse("pti", "System.out.println(\"$1: \" + $1);$0", {}), - -- quickies - s("pr", t "private "), - s("ob", fmt( - [[ - {} {} = new {}({}); - {} - ]], - { i(1), i(2), rep(1), i(3), i(0) })), - parse("abs", "Math.abs($1);$0", {}), + -- function + s("fn", fmt( + [[ + {}{} {}({}) + {{ + {} + }} + ]], + { + c(1, {t "public ", t "private ", t ""}), + i(2, "type"), + i(3, "f"), + i(4), i(0) + })), + -- setter function + s("psv", fmt( + [[ + public class Main + {{ + public static void main (String[] args) + {{ + {} + }} + }} + ]], + { i(0) })), + -- constructor + s("class", fmt( + [[ + {}class {} + {{ + {} + }}{} + ]], + { c(1, {t "public ", t "private ", t ""}), i(2), i(3), i(0)})), + -- StringBuilder + s("sb", fmt( + [[ + public void print() + {{ + StringBuilder sb = new StringBuilder(30); + sb.append({}); + sb.append(", ").append({});{} + System.out.print(sb.toString()); + }}{} + ]], + { i(1), i(2), i(3), i(0)})), + -- print + parse("pt", "System.out.println($1);$0", {}), + parse("pti", "System.out.println(\"$1: \" + $1);$0", {}), + -- quickies + s("pr", t "private "), + s("ob", fmt( + [[ + {} {} = new {}({}); + {} + ]], + { i(1), i(2), rep(1), i(3), i(0) })), + parse("abs", "Math.abs($1);$0", {}), }) ls.add_snippets("sh", { - s("TD", t "THISDIR=\"$(dirname \"$(readlink -f \"$0\")\")\""), - parse("pf", ">&2 printf '$1\\n'$0", {}), - parse("fn", "$1 ()\n{\n\t$2\n}$0", {}), - -- Functions - parse("rchar", - [[ - read_char () - { - old_stty_cfg=$(stty -g) - stty raw -echo - dd ibs=1 count=1 2> /dev/null - stty \$old_stty_cfg - } - ]], {}), - parse("fdie", - [[ - die () { >&2 printf '%s\n' "\$@"; exit 1; } - ]], {}), - parse("flogn", - [[ - logn () { >&2 printf '%s\n' "\$@"; } - ]], {}), - parse("flog", - [[ - log () { >&2 printf '%s' "\$@"; } - ]], {}), - s("inp", fmt( - [[ - test -z "${{{}:=$1}}" && - {}="$(cat /dev/stdin)" - echo "{}: ${}" 1>&2{} - ]], - { i(1), rep(1), rep(1), rep(1), i(0) })), + s("TD", t "THISDIR=\"$(dirname \"$(readlink -f \"$0\")\")\""), + parse("pf", ">&2 printf '$1\\n'$0", {}), + parse("fn", "$1 ()\n{\n\t$2\n}$0", {}), + -- Functions + parse("rchar", + [[ + read_char () + { + old_stty_cfg=$(stty -g) + stty raw -echo + dd ibs=1 count=1 2> /dev/null + stty \$old_stty_cfg + } + ]], {}), + parse("fdie", + [[ + die () { >&2 printf '%s\n' "\$@"; exit 1; } + ]], {}), + parse("flogn", + [[ + logn () { >&2 printf '%s\n' "\$@"; } + ]], {}), + parse("flog", + [[ + log () { >&2 printf '%s' "\$@"; } + ]], {}), + s("inp", fmt( + [[ + test -z "${{{}:=$1}}" && + {}="$(cat /dev/stdin)" + echo "{}: ${}" 1>&2{} + ]], + { i(1), rep(1), rep(1), rep(1), i(0) })), }) ls.add_snippets("javascript", { - -- print - s("pt", fmt("console.log({});{}", { i(1, "\"Hello World!\"") , i(0) })), - s("rq", fmt("const {} = require('{}');", { i(1), rep(1) })), - s("dbconn", fmt( - [[ - let conn = null; - try {{ - conn = await dbConnect();{} - conn.end() - }} catch(err) {{ - console.error('Error:', err); - }} - ]], - { i(0) })), - s("apr", fmt( - [[ - app.get('{}', (req, res) => {{ - {} - }});{} - ]], - { i(1), i(2, "res.send(\"Hello world!\")"), i(0) })), - s("cerr", t "console.error('Error:', err);"), - s("gel", fmt( - [[ - let {} = document.getElementById('{}');{} - ]], - { i(1), rep(1), i(0) })), + -- print + s("pt", fmt("console.log({});{}", { i(1, "\"Hello World!\"") , i(0) })), + s("rq", fmt("const {} = require('{}');", { i(1), rep(1) })), + s("dbconn", fmt( + [[ + let conn = null; + try {{ + conn = await dbConnect();{} + conn.end() + }} catch(err) {{ + console.error('Error:', err); + }} + ]], + { i(0) })), + s("apr", fmt( + [[ + app.get('{}', (req, res) => {{ + {} + }});{} + ]], + { i(1), i(2, "res.send(\"Hello world!\")"), i(0) })), + s("cerr", t "console.error('Error:', err);"), + s("gel", fmt( + [[ + let {} = document.getElementById('{}');{} + ]], + { i(1), rep(1), i(0) })), }) ls.add_snippets("cs", { - parse("cw", "Console.WriteLine($1);$0"), + parse("cw", "Console.WriteLine($1);$0"), }) ls.add_snippets("telekasten", { - --link - parse("ln", "[[$0]]", {}), - s("cln", fmt( - [[ - [{}]({}){} - ]], - { - i(1), - f(function () - return vim.fn.getreg('+') - end), - i(0) - } - )), + --link + parse("ln", "[[$0]]", {}), + s("cln", fmt( + [[ + [{}]({}){} + ]], + { + i(1), + f(function () + return vim.fn.getreg('+') + end), + i(0) + } + )), }) diff --git a/config/essentials/nvim/lua/user/cmp/html.lua b/config/essentials/nvim/lua/user/cmp/html.lua index 69ed29d..d3c99df 100644 --- a/config/essentials/nvim/lua/user/cmp/html.lua +++ b/config/essentials/nvim/lua/user/cmp/html.lua @@ -2,6 +2,7 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true -require'lspconfig'.html.setup { - capabilities = capabilities, +require 'lspconfig'.html.setup { + capabilities = capabilities, + filetypes = { "html", "php" }, } -- cgit v1.2.3 From 60a8a2470106fe683df1366f29ceb53d02f9d582 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 22:31:28 +0100 Subject: fixed wrong index --- config/essentials/nvim/after/plugin/luasnip.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 5cf54d5..9119264 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -71,7 +71,7 @@ ls.add_snippets(languages[language], { ]], - {i(1, "title"), rep(2), i(0)})), + {i(1, "title"), rep(1), i(0)})), parse("sty", [[ $0 -- cgit v1.2.3 From 17be849d66dbc03520c9b5dbc8d6bcadb4e85bb3 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 1 Nov 2023 22:36:27 +0100 Subject: removed nextddl --- config/essentials/zsh/functions.zsh | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index dccede1..f498f9e 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -295,15 +295,3 @@ edit_in_dir() { [ -f "$file" ] || return 1 $EDITOR "$file" } - -nextddl() -{ - local date - deadlines="$HOME/docs/filios/deadlines" - date="$(grep '^#' "$deadlines" | - sort -t '/' -k 3 -k 2 -k 1 -n | - sed -n "${1:-1}p" | - sed 's@/@.@g')" - sed -n "/$date/,/^#\|^$/p" "$deadlines" | - head -n -1 -} -- cgit v1.2.3 From faf6d4b320451f154a3538fc38c9a3157fd0f351 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 2 Nov 2023 11:42:04 +0100 Subject: added systemctl aliases --- config/essentials/zsh/aliases.sh | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 1ca0cf7..3250021 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -169,9 +169,7 @@ alias ch='chown ${USER}:${USER} -R' alias kll='killall' alias pi='ping 9.9.9.9 -c4' alias sba='source env/bin/activate || source bin/activate' -alias smc='systemctl' -alias dsmc='doas systemctl' -alias smcu='smc --user' + alias zsr='source ${ZDOTDIR:-~}/.zshrc && rehash' alias rh='rehash' alias wf='doas wipefs -a' @@ -184,6 +182,35 @@ alias pwdcp='pwd | clipp' alias gw="grep -ri" alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} | supd' +# systemctl aliases +alias smc='systemctl' +alias smcs='systemctl status' +alias smcst='systemctl start' +alias smcS='systemctl stop' +alias smcr='systemctl restart' +alias smcrl='systemctl reload' +alias smcd='systemctl daemon-reload' +alias smce='systemctl edit' +#user +alias smcu='systemctl --user' +alias smcus='systemctl status --user' +alias smcust='systemctl start --user' +alias smcuS='systemctl stop --user' +alias smcur='systemctl restart --user' +alias smcurl='systemctl reload --user' +alias smcud='systemctl daemon-reload --user' +alias smcue='systemctl edit --user' +#doas +alias dsmc='doas systemctl' +alias dsmcs='doas systemctl status' +alias dsmcst='doas systemctl start' +alias dsmcS='doas systemctl stop' +alias dsmcr='doas systemctl restart' +alias dsmcrl='doas systemctl reload' +alias dsmcd='doas systemctl daemon-reload' +alias dsmce='doas systemctl edit' + +# virtualbox aliases alias vbm='vboxmanage' alias vbls='vbm list vms' alias vblsr='vbm list runningvms' -- cgit v1.2.3 From 8a4d4db609f2ab37ae7e54b4210535c09eeb0e6c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 3 Nov 2023 13:39:12 +0100 Subject: cleanup --- config/essentials/nvim/lua/user/packer.lua | 49 ++++++++++++------------------ 1 file changed, 20 insertions(+), 29 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index ed2bbf1..8091d85 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -4,11 +4,11 @@ return require('packer').startup(function(use) -- files use { 'nvim-telescope/telescope.nvim', tag = '0.1.2', - requires = { {'nvim-lua/plenary.nvim'} } + requires = { { 'nvim-lua/plenary.nvim' } } } - use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } - use {'nvim-telescope/telescope-ui-select.nvim' } - use {'nvim-telescope/telescope-media-files.nvim'} + use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } + use { 'nvim-telescope/telescope-ui-select.nvim' } + use { 'nvim-telescope/telescope-media-files.nvim' } use('nvim-telescope/telescope-symbols.nvim') use('theprimeagen/harpoon') @@ -18,20 +18,11 @@ return require('packer').startup(function(use) use { 'uZer/pywal16.nvim', as = 'pywal16' } use('norcalli/nvim-colorizer.lua') - use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) + use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) use('nvim-treesitter/playground') use('theRealCarneiro/hyprland-vim-syntax') use('mbbill/undotree') - use { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - requires = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - } - } use('tpope/vim-capslock') use('tpope/vim-commentary') @@ -45,20 +36,20 @@ return require('packer').startup(function(use) use('christoomey/vim-tmux-navigator') - -- utils - use('godlygeek/tabular') - use('renerocksai/calendar-vim') - use('ojroques/vim-oscyank', {branch = "main"}) - use("potamides/pantran.nvim") - use('alx741/vinfo') - use('sheerun/vim-polyglot') - -- use('github/copilot.vim') - -- - use { - 'https://gitlab.com/itaranto/plantuml.nvim', - tag = '*', - config = function() require('plantuml').setup() end - } + -- utils + use('godlygeek/tabular') + use('renerocksai/calendar-vim') + use('ojroques/vim-oscyank', { branch = "main" }) + use("potamides/pantran.nvim") + use('alx741/vinfo') + use('sheerun/vim-polyglot') + -- use('github/copilot.vim') + -- + use { + 'https://gitlab.com/itaranto/plantuml.nvim', + tag = '*', + config = function() require('plantuml').setup() end + } -- objects use('michaeljsmith/vim-indent-object') @@ -76,7 +67,7 @@ return require('packer').startup(function(use) -- debugging use('mfussenegger/nvim-dap') - use { "rcarriga/nvim-dap-ui", requires = {"mfussenegger/nvim-dap"} } + use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } } -- java use('mfussenegger/nvim-jdtls') -- cgit v1.2.3 From 470eece95798fa687086aa18d33c1892e205117b Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 3 Nov 2023 14:58:43 +0100 Subject: removed fzf native --- config/essentials/nvim/after/plugin/telescope.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/telescope.lua b/config/essentials/nvim/after/plugin/telescope.lua index 06c5a03..7a2ef34 100644 --- a/config/essentials/nvim/after/plugin/telescope.lua +++ b/config/essentials/nvim/after/plugin/telescope.lua @@ -1,4 +1,3 @@ -require('telescope').load_extension('fzf') require('telescope').load_extension('media_files') require('telescope').setup({ -- cgit v1.2.3 From 78a876bdb838ae43f21525bd0f24441706bdd5b7 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 3 Nov 2023 15:00:36 +0100 Subject: migrated from packer to lazy --- config/essentials/nvim/after/plugin/colorizer.lua | 6 -- .../nvim/after/plugin/colorizer.lua.disabled | 6 ++ config/essentials/nvim/after/plugin/treesitter.lua | 11 --- config/essentials/nvim/lua/user/init.lua | 3 +- config/essentials/nvim/lua/user/lazy.lua | 98 ++++++++++++++++++++++ config/essentials/nvim/lua/user/remap.lua | 4 +- config/essentials/nvim/lua/user/treesitter.lua | 44 ++++++++++ 7 files changed, 152 insertions(+), 20 deletions(-) delete mode 100644 config/essentials/nvim/after/plugin/colorizer.lua create mode 100644 config/essentials/nvim/after/plugin/colorizer.lua.disabled delete mode 100644 config/essentials/nvim/after/plugin/treesitter.lua create mode 100644 config/essentials/nvim/lua/user/lazy.lua create mode 100644 config/essentials/nvim/lua/user/treesitter.lua (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/colorizer.lua b/config/essentials/nvim/after/plugin/colorizer.lua deleted file mode 100644 index 6ca374f..0000000 --- a/config/essentials/nvim/after/plugin/colorizer.lua +++ /dev/null @@ -1,6 +0,0 @@ -require 'colorizer'.setup { - '*'; - html = { - mode = 'foreground'; - } -} diff --git a/config/essentials/nvim/after/plugin/colorizer.lua.disabled b/config/essentials/nvim/after/plugin/colorizer.lua.disabled new file mode 100644 index 0000000..6ca374f --- /dev/null +++ b/config/essentials/nvim/after/plugin/colorizer.lua.disabled @@ -0,0 +1,6 @@ +require 'colorizer'.setup { + '*'; + html = { + mode = 'foreground'; + } +} diff --git a/config/essentials/nvim/after/plugin/treesitter.lua b/config/essentials/nvim/after/plugin/treesitter.lua deleted file mode 100644 index e18368e..0000000 --- a/config/essentials/nvim/after/plugin/treesitter.lua +++ /dev/null @@ -1,11 +0,0 @@ -require'nvim-treesitter.configs'.setup { - ensure_installed = { "c", "lua", "vim", "diff"}, - - sync_install = false, - auto_install = true, - - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - } -} diff --git a/config/essentials/nvim/lua/user/init.lua b/config/essentials/nvim/lua/user/init.lua index 2f29b87..f195e4f 100644 --- a/config/essentials/nvim/lua/user/init.lua +++ b/config/essentials/nvim/lua/user/init.lua @@ -1,5 +1,6 @@ -require("user.packer") +require("user.lazy") require("user.remap") +require("user.treesitter") require("user.set") require("user.cmp") require("user.zk") diff --git a/config/essentials/nvim/lua/user/lazy.lua b/config/essentials/nvim/lua/user/lazy.lua new file mode 100644 index 0000000..5c3148c --- /dev/null +++ b/config/essentials/nvim/lua/user/lazy.lua @@ -0,0 +1,98 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + -- Example using a list of specs with the default options + "folke/which-key.nvim", + + -- telescope + { + 'nvim-telescope/telescope.nvim', + tag = '0.1.4', + dependencies = { 'nvim-lua/plenary.nvim' } + }, + "nvim-telescope/telescope-ui-select.nvim", + "nvim-telescope/telescope-media-files.nvim", + + "nvim-telescope/telescope-symbols.nvim", + "theprimeagen/harpoon", + + -- colors + "shaunsingh/nord.nvim", + { 'uZer/pywal16.nvim', name = 'pywal16' }, + "norcalli/nvim-colorizer.lua", + + { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' }, + "nvim-treesitter/playground", + + -- syntax + "sheerun/vim-polyglot", + "theRealCarneiro/hyprland-vim-syntax", + + "mbbill/undotree", + + "tpope/vim-capslock", + "tpope/vim-commentary", + -- "tpope/vim-endwise", + "tpope/vim-fugitive", + "lewis6991/gitsigns.nvim", + "tpope/vim-repeat", + "tpope/vim-surround", + "tpope/vim-vinegar", + "m4xshen/autoclose.nvim", + + "christoomey/vim-tmux-navigator", + + -- utils + "godlygeek/tabular", + "renerocksai/calendar-vim", + "ojroques/vim-oscyank", + "potamides/pantran.nvim", + "alx741/vinfo", + + -- "github/copilot.vim", + -- + { + 'https://gitlab.com/itaranto/plantuml.nvim', + config = function() require('plantuml').setup() end + }, + + -- objects + "michaeljsmith/vim-indent-object", + + -- completion + "neovim/nvim-lspconfig", + "hrsh7th/nvim-cmp", + "hrsh7th/cmp-nvim-lua", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-nvim-lsp-signature-help", + "alvan/vim-closetag", + + -- debugging + "mfussenegger/nvim-dap", + { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap" } }, + + -- java + "mfussenegger/nvim-jdtls", + + -- snippets + "L3MON4D3/LuaSnip", + "saadparwaiz1/cmp_luasnip", + + -- notes + "renerocksai/telekasten.nvim", + +}) diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua index fadca21..8a8ad5c 100644 --- a/config/essentials/nvim/lua/user/remap.lua +++ b/config/essentials/nvim/lua/user/remap.lua @@ -73,8 +73,8 @@ vim.keymap.set("n", "s", function () print("sourced.") end, { noremap = true }) --- Packer -vim.keymap.set("n", "P", "PackerSync", { noremap = true }) +-- Lazy +vim.keymap.set("n", "P", "Lazy", { noremap = true }) -- spelling vim.keymap.set("n", "s", "setlocal spell!", { noremap = true }) diff --git a/config/essentials/nvim/lua/user/treesitter.lua b/config/essentials/nvim/lua/user/treesitter.lua new file mode 100644 index 0000000..5b1fc5e --- /dev/null +++ b/config/essentials/nvim/lua/user/treesitter.lua @@ -0,0 +1,44 @@ +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" (the five listed parsers should always be installed) + ensure_installed = { "c", "lua", "vim", "vimdoc", "query" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + -- List of parsers to ignore installing (or "all") + ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + indent = { + enable = on + }, + + highlight = { + enable = true, + + -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to + -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is + -- the name of the parser) + -- list of language that will be disabled + disable = { "c", "rust" }, + -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files + disable = function(lang, buf) + local max_filesize = 100 * 1024 -- 100 KB + local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + if ok and stats and stats.size > max_filesize then + return true + end + end, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +} -- cgit v1.2.3 From 7e681c9311c858b9c2e0cc87005a4aa2596cf788 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 3 Nov 2023 15:01:11 +0100 Subject: added formatting keybind for tables --- config/essentials/nvim/lua/user/remap.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua index 8a8ad5c..0c3d9a6 100644 --- a/config/essentials/nvim/lua/user/remap.lua +++ b/config/essentials/nvim/lua/user/remap.lua @@ -54,9 +54,14 @@ end, { noremap = true }) -- utils vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA", { noremap = true }) + +-- FORMATTING -- ordered list vim.keymap.set("n", "n", "I0. gvg", { noremap = true }) vim.keymap.set("v", "u", "'<,'>s/^[0-9]\\+\\. //", { noremap = true }) +-- table +vim.keymap.set("v", "t", "!column -t -s '|' -o '|'", { noremap = true }) + -- scripts vim.keymap.set("n", "x", "!chmod +x %", { noremap = true, silent = true}) -- replace -- cgit v1.2.3 From c0f0bc7ee9a2e48961dffa2c8d65adf85fd05172 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 3 Nov 2023 15:01:33 +0100 Subject: removed confirmation --- config/essentials/zsh/functions.zsh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index f498f9e..4145813 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -273,13 +273,10 @@ muttmail() local config local mail config="$HOME/.config/mutt" - mail="$(find "$config"/configs -type f -printf '%f\n' | fzf)" [ "$mail" ] || return 1 - logn "$mail" ln -sf "$config/configs/$mail" "$config"/muttrc - log 'Press [Enter] to login.' - head -n 1 && mutt + mutt } resize() -- cgit v1.2.3 From bcfcca89fbe9c195988b46b554472cf871540856 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 3 Nov 2023 17:42:26 +0100 Subject: added clone from clipboard 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 3250021..0da835a 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -339,6 +339,7 @@ alias gcasm='git commit --all --signoff --message' alias gcb='git checkout -b' alias gcf='git config --list' alias gcl='git clone' +alias gclc='git clone "$(clipo)"' alias gclr='git clone --recurse-submodules' alias gc1='git clone --depth 1' alias gclean='git clean --interactive -d' -- cgit v1.2.3 From 694813e05187b5ccf144425c4bad6f5ab4f92234 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 6 Nov 2023 08:21:05 +0100 Subject: ERASE THIS --- config/X/x11/xinitrc | 1 + config/common/mpv/input.conf | 3 +++ config/essentials/zsh/aliases.sh | 3 ++- config/wayland/dwl/startup.sh | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc index 4eb34ed..beb33f2 100755 --- a/config/X/x11/xinitrc +++ b/config/X/x11/xinitrc @@ -27,6 +27,7 @@ xmodmap -e "keycode 135 = Super_L" xautolock -time 5 -locker slock & gammastep -m randr & slstatus & +emacs --daemon & eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)" unclutter --timeout 3 --jitter 50 -b exec startdwm diff --git a/config/common/mpv/input.conf b/config/common/mpv/input.conf index 295dd4d..dd2674f 100644 --- a/config/common/mpv/input.conf +++ b/config/common/mpv/input.conf @@ -204,3 +204,6 @@ Alt+c cycle sub-visibility # Toggle subtitles v cycle audio # switch audio track V cycle audio # switch audio track ctrl+l cycle-values loop-file "inf" "no" # toggle infinite looping + +# Keep open after exit +P cycle keep-open up diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 0da835a..10e6c23 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -265,6 +265,7 @@ alias czo='cd ~/zot/' alias cdpw='cd ${PASSWORD_STORE_DIR:-~/.password-store}' alias cdng='cd /etc/nginx' alias cdrs='cd /srv/' +alias cdv='cd ~/vids' alias god='cd "$(find . -mindepth 1 -maxdepth 1 -type d | fzf)"' # fzf aliases @@ -272,7 +273,6 @@ alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -t alias ppjs='cd ~/proj/personal/scripts/"$(find ~/proj/personal/scripts -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' 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' alias asf='alias | fzf' alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp" @@ -300,6 +300,7 @@ alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music' # oh-my-zsh git aliases alias config='GIT_WORK_TREE=~/src/dotfiles/ GIT_DIR=~/src/dotfiles/.git' +alias cfg='$EDITOR ~/src/dotfiles/"$(config git ls-files | fzf || exit)"' alias gmod='git status --short | sed '\''/^\s*M/!d;s/^\s*M\s*//'\'' | fzf | xargs $EDITOR' alias g='git' alias ga='git add' diff --git a/config/wayland/dwl/startup.sh b/config/wayland/dwl/startup.sh index d743f19..8817ad2 100755 --- a/config/wayland/dwl/startup.sh +++ b/config/wayland/dwl/startup.sh @@ -10,6 +10,7 @@ swaybg -i ~/pics/wallpaper & wl-paste --watch cliphist store & swayidle 300 locker & keyadd id_rsa & +emacs --daemon & pkill -f "tail -f $HOME/.config/wob/pipe" WOBCONFIG="$HOME"/.config/wob -- cgit v1.2.3 From e92fe2d61d3e01cbe2351166b8bf809362a5f72d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 6 Nov 2023 10:19:34 +0100 Subject: change back to packer and simplify treesitter config --- config/essentials/nvim/lua/user/init.lua | 2 +- config/essentials/nvim/lua/user/treesitter.lua | 31 ++------------------------ 2 files changed, 3 insertions(+), 30 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/init.lua b/config/essentials/nvim/lua/user/init.lua index f195e4f..972cb67 100644 --- a/config/essentials/nvim/lua/user/init.lua +++ b/config/essentials/nvim/lua/user/init.lua @@ -1,4 +1,4 @@ -require("user.lazy") +require("user.packer") require("user.remap") require("user.treesitter") require("user.set") diff --git a/config/essentials/nvim/lua/user/treesitter.lua b/config/essentials/nvim/lua/user/treesitter.lua index 5b1fc5e..2355215 100644 --- a/config/essentials/nvim/lua/user/treesitter.lua +++ b/config/essentials/nvim/lua/user/treesitter.lua @@ -9,36 +9,9 @@ require'nvim-treesitter.configs'.setup { -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally auto_install = true, - -- List of parsers to ignore installing (or "all") - ignore_install = { "javascript" }, + indent = { enable = on }, - ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) - -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! - indent = { - enable = on - }, + highlight = { enable = true, }, - highlight = { - enable = true, - - -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to - -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is - -- the name of the parser) - -- list of language that will be disabled - disable = { "c", "rust" }, - -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files - disable = function(lang, buf) - local max_filesize = 100 * 1024 -- 100 KB - local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) - if ok and stats and stats.size > max_filesize then - return true - end - end, - - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages additional_vim_regex_highlighting = false, - }, } -- cgit v1.2.3 From 5ad22dddaf672552cba44932f8d33860456907df Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 7 Nov 2023 01:25:21 +0100 Subject: disabled polyglot temporarily --- 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 8091d85..edb763d 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -42,7 +42,7 @@ return require('packer').startup(function(use) use('ojroques/vim-oscyank', { branch = "main" }) use("potamides/pantran.nvim") use('alx741/vinfo') - use('sheerun/vim-polyglot') + -- use('sheerun/vim-polyglot') TODO: fix error conflicting with telekasten -- use('github/copilot.vim') -- use { -- cgit v1.2.3 From fed0fd249ef9d2c2a21bb5dfb98ce53b12040354 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 7 Nov 2023 22:38:02 +0100 Subject: added completion system configuration --- config/essentials/zsh/.zshrc | 52 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 76ff87f..45f98e4 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -15,13 +15,61 @@ autoload -U select-word-style autoload -z edit-command-line zle -N edit-command-line zstyle ':compinstall' filename '/home/aluc/.zshrc' + +### Completion +# cache +zstyle ':completion:*' use-cache on +zstyle ':completion:*' cache-path "$ZDOTDIR/zcompcache" + +# completers +zstyle ':completion:*' completer _extensions _complete _approximate + +# format +zstyle ':completion:*:*:*:*:corrections' format '%F{yellow}!- (%e) -!%f' +zstyle ':completion:*:*:*:*:descriptions' format '%F{blue}-- %D%d --%f' +zstyle ':completion:*:*:*:*:messages' format '%F{purple}-- %d --%f' +zstyle ':completion:*:*:*:*:warnings' format '%F{red}-- no matches found --%f' +zstyle ':completion:*:default' list-prompt '%S%M matches%s' +# show a 'ls -a' like outptut when listing files +zstyle ':completion:*' file-list all +zstyle ':completion:*:*:*:*:default' list-colors ${(s.:.)LS_COLORS} + +# Group completions by categories +zstyle ':completion:*' group-name '' +zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands + +zstyle ':completion:*' squeeze-slashes true + +# Prefer completing for an option (think cd -) +zstyle ':completion:*' complete-options true + +# See ZSHCOMPWID "completion matching control" +zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' + +# keep prefix when completing +zstyle ':completion:*' keep-prefix true + +# ui zstyle ':completion:*' menu select -autoload -Uz compinit +# Move around using h j k l in completion menu +zmodload zsh/complist +bindkey -M menuselect 'h' vi-backward-char +bindkey -M menuselect 'k' vi-up-line-or-history +bindkey -M menuselect 'j' vi-down-line-or-history +bindkey -M menuselect 'l' vi-forward-char +bindkey -M menuselect '^xg' clear-screen +# interactive mode +bindkey -M menuselect '^xi' vi-insert +bindkey -M menuselect '^xh' accept-and-hold # Hold +bindkey -M menuselect '^xn' accept-and-infer-next-history # Next +bindkey -M menuselect '^xu' undo # Undo + +autoload -Uz compinit; compinit + autoload -Uz surround zle -N delete-surround surround zle -N add-surround surround zle -N change-surround surround -compinit # Source files . $ZDOTDIR/functions.zsh -- cgit v1.2.3 From 020cd46cb03e5d7f0bee8cedc6ce0b666aaebe3e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Nov 2023 00:45:19 +0100 Subject: removed approxiamte completer --- config/essentials/zsh/.zshrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 45f98e4..74bab34 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -22,10 +22,9 @@ zstyle ':completion:*' use-cache on zstyle ':completion:*' cache-path "$ZDOTDIR/zcompcache" # completers -zstyle ':completion:*' completer _extensions _complete _approximate +zstyle ':completion:*' completer _extensions _complete # format -zstyle ':completion:*:*:*:*:corrections' format '%F{yellow}!- (%e) -!%f' zstyle ':completion:*:*:*:*:descriptions' format '%F{blue}-- %D%d --%f' zstyle ':completion:*:*:*:*:messages' format '%F{purple}-- %d --%f' zstyle ':completion:*:*:*:*:warnings' format '%F{red}-- no matches found --%f' -- cgit v1.2.3 From 6a3577ba1635dfb6f19b66db9b1b75b06b355699 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Nov 2023 11:36:56 +0100 Subject: added emacs to srcsupd --- 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 10e6c23..2596285 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -180,7 +180,7 @@ alias gdate='date +%y_%m_%d-%T' alias tpid='tail -f /dev/null --pid' alias pwdcp='pwd | clipp' alias gw="grep -ri" -alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} | supd' +alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} ~/.config/emacs | supd' # systemctl aliases alias smc='systemctl' -- cgit v1.2.3 From f1bb5ec20fcc323ec50eff2d726c5027e18589f6 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Nov 2023 11:37:58 +0100 Subject: removed completion matching control --- config/essentials/zsh/.zshrc | 3 --- 1 file changed, 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 74bab34..db93ac9 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -42,9 +42,6 @@ zstyle ':completion:*' squeeze-slashes true # Prefer completing for an option (think cd -) zstyle ':completion:*' complete-options true -# See ZSHCOMPWID "completion matching control" -zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' - # keep prefix when completing zstyle ':completion:*' keep-prefix true -- cgit v1.2.3 From b28306573004c1538eacc55328e672aa8d101230 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Nov 2023 10:48:37 +0100 Subject: added choosing when no argument provided --- config/essentials/zsh/functions.zsh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 4145813..8d464e3 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -242,7 +242,14 @@ pacsize() mime-default () { + local mime + [ "${mime:=$1}" ] || + mime="$(find /usr/share/applications/ -iname '*.desktop' -printf '%f\n' | + sed 's/\.desktop$//' | + fzf)" + logn "Setting '$1' as default for its mimetypes" + [ "$mime" ] || exit 1 grep "MimeType=" /usr/share/applications/"$1".desktop | cut -d '=' -f 2- | tr ';' '\0' | xargs -0I{} xdg-mime default "$1".desktop "{}" -- cgit v1.2.3 From 482d9efce8c3cf7139e7bd1fbfcd28595e7827f7 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Nov 2023 11:59:36 +0100 Subject: added systemctl enable alias --- config/essentials/zsh/aliases.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 2596285..5de4803 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -191,15 +191,17 @@ alias smcr='systemctl restart' alias smcrl='systemctl reload' alias smcd='systemctl daemon-reload' alias smce='systemctl edit' +alias smcen='systemctl enable' #user alias smcu='systemctl --user' -alias smcus='systemctl status --user' -alias smcust='systemctl start --user' -alias smcuS='systemctl stop --user' -alias smcur='systemctl restart --user' -alias smcurl='systemctl reload --user' -alias smcud='systemctl daemon-reload --user' -alias smcue='systemctl edit --user' +alias smcus='systemctl --user status' +alias smcust='systemctl --user start' +alias smcuS='systemctl --user stop' +alias smcur='systemctl --user restart' +alias smcurl='systemctl --user reload' +alias smcud='systemctl --user daemon-reload' +alias smcue='systemctl --user edit' +alias smcuen='systemctl --user enable' #doas alias dsmc='doas systemctl' alias dsmcs='doas systemctl status' @@ -209,6 +211,7 @@ alias dsmcr='doas systemctl restart' alias dsmcrl='doas systemctl reload' alias dsmcd='doas systemctl daemon-reload' alias dsmce='doas systemctl edit' +alias dsmcen='doas systemctl enable' # virtualbox aliases alias vbm='vboxmanage' -- cgit v1.2.3 From 2f3909181e31fb443c4ad2048a1e886e877e4a5c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Nov 2023 12:30:38 +0100 Subject: put channels in a subfolder --- bin/common/ytclipo | 2 +- config/essentials/zsh/aliases.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config/essentials') diff --git a/bin/common/ytclipo b/bin/common/ytclipo index 5d86c3f..8997539 100755 --- a/bin/common/ytclipo +++ b/bin/common/ytclipo @@ -23,5 +23,5 @@ yt-dlp "$inp" \ -f "b" \ -S "res:1080" \ -P "$HOME/vids/youtube/" \ - -o "%(channel)s - %(title)s.%(ext)s" + -o "%(channel)s/%(title)s.%(ext)s" notify-send "ytclipo" "finished downloading." || : diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 5de4803..a166513 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -282,7 +282,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 ytdl='yt-dlp --restrict-filenames --embed-chapters -f "b" -S "res:1080" -P "$HOME/vids/youtube/" -o "%(channel)s/%(title)s.%(ext)s"' # docker aliases alias dcb='docker build' -- cgit v1.2.3 From 3f704ee3e28f1448bc344400c2c6082157e7ee42 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Nov 2023 17:21:33 +0100 Subject: remove file list all on completion --- 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 db93ac9..1de3e91 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -30,7 +30,6 @@ zstyle ':completion:*:*:*:*:messages' format '%F{purple}-- %d --%f' zstyle ':completion:*:*:*:*:warnings' format '%F{red}-- no matches found --%f' zstyle ':completion:*:default' list-prompt '%S%M matches%s' # show a 'ls -a' like outptut when listing files -zstyle ':completion:*' file-list all zstyle ':completion:*:*:*:*:default' list-colors ${(s.:.)LS_COLORS} # Group completions by categories -- cgit v1.2.3 From d6d5aa0577e1cdf9ab924b8c3f0241e17831540e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Nov 2023 17:21:59 +0100 Subject: use an intermediate variable --- config/essentials/zsh/functions.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 8d464e3..da8bf12 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -248,11 +248,11 @@ mime-default () sed 's/\.desktop$//' | fzf)" - logn "Setting '$1' as default for its mimetypes" + logn "Setting '$mime' as default for its mimetypes" [ "$mime" ] || exit 1 - grep "MimeType=" /usr/share/applications/"$1".desktop | + grep "MimeType=" /usr/share/applications/"$mime".desktop | cut -d '=' -f 2- | tr ';' '\0' | - xargs -0I{} xdg-mime default "$1".desktop "{}" + xargs -0I{} xdg-mime default "$mime".desktop "{}" logn "Done." } -- cgit v1.2.3 From b386965b95808a0ad78e6c1dedaefac4693aaad5 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Nov 2023 17:22:50 +0100 Subject: added ideas vault --- config/essentials/nvim/lua/user/zk.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 98476ca..3641025 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -41,6 +41,11 @@ require("telekasten").setup({ media_previewer = "telescope-media-files", follow_url_fallback = nil, vaults = { + Ideas = { + home = home .. "/" .. "Ideas", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, Driving = { home = home .. "/" .. "Driving", template_new_note = home .. "/" .. "templates/new_note.md", -- cgit v1.2.3 From 5c6e9b64eef36b98f05b85673089c6d8ef6b140d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 14 Nov 2023 12:47:39 +0100 Subject: won two characters of screen! --- 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 1de3e91..c590d54 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -153,7 +153,7 @@ command_not_found_handler () { } # prompt -PS1=' %B%(#.%F{1}.%F{13})[%n%b%f@%B%F{6}%m]%b%f %3~ ' +PS1=' %B%(#.%F{1}.%F{13})%n%b%f@%B%F{6}%m%b%f %3~ ' RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(parse_git_branch)%f%(?.. %?)' setopt prompt_subst -- cgit v1.2.3 From e47d5d440679e35c138a93b9543ebf6210d93570 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 15 Nov 2023 01:43:11 +0100 Subject: added gov 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 a166513..4c2533f 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -270,6 +270,7 @@ alias cdng='cd /etc/nginx' alias cdrs='cd /srv/' alias cdv='cd ~/vids' alias god='cd "$(find . -mindepth 1 -maxdepth 1 -type d | fzf)"' +alias gov='go ~/vids d' # fzf aliases alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | fzf)"' -- cgit v1.2.3 From 22b300743769a1f98771d4f63b49937aa32786f9 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 15 Nov 2023 01:43:43 +0100 Subject: added emacs aliases --- config/essentials/zsh/aliases.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 4c2533f..3d23cf4 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -285,6 +285,11 @@ alias pff='find ${PASSWORD_STORE_DIR:=~/src/password-store/} -name "*.gpg" | sed 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"' +# emacs aliases +alias emacsd='emacs --daemon' +alias emacsdbg='emacs --debug-init' +alias e='emacsclient -c -a "emacs"' + # docker aliases alias dcb='docker build' alias dcbt='docker build -t' -- cgit v1.2.3 From f09beaf5fd4d0d1912e25c7fadeaf2e7bc0d7137 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Wed, 15 Nov 2023 01:44:02 +0100 Subject: added to_webm function --- config/essentials/zsh/functions.zsh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index da8bf12..8bf6c43 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -299,3 +299,8 @@ edit_in_dir() { [ -f "$file" ] || return 1 $EDITOR "$file" } + +to_webm() +{ + ffmpeg -y -i "$1" -vcodec libvpx -cpu-used -12 -deadline realtime "${1%.*}".webm +} -- cgit v1.2.3