summaryrefslogtreecommitdiff
path: root/config/essentials
diff options
context:
space:
mode:
Diffstat (limited to 'config/essentials')
-rw-r--r--config/essentials/nvim/after/plugin/luasnip.lua9
-rw-r--r--config/essentials/nvim/ftplugin/sh.lua6
-rw-r--r--config/essentials/nvim/lua/user/remap.lua2
-rw-r--r--config/essentials/nvim/templates/inp.sh7
-rw-r--r--config/essentials/nvim/templates/minp.sh9
-rw-r--r--config/essentials/zsh/.zshrc1
-rw-r--r--config/essentials/zsh/aliases.zsh19
-rw-r--r--config/essentials/zsh/functions.zsh4
8 files changed, 44 insertions, 13 deletions
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 75e139b..df40b2f 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -138,7 +138,14 @@ ls.add_snippets("sh", {
echo "\$1" >&2
}
]], {}),
- parse("die", "die \"$1\"$0", {}),
+ parse("die", "die \"I: $1\"$0", {}),
+ 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", {
diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua
index 4b66c75..9290c29 100644
--- a/config/essentials/nvim/ftplugin/sh.lua
+++ b/config/essentials/nvim/ftplugin/sh.lua
@@ -1,3 +1,5 @@
-vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr><cmd>setlocal nohls<cr>")
-vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: ${\\2}\"<cr><cmd>setlocal nohls<cr>")
+vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr>")
+vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"<cr>")
+vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr><esc>A")
+vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"<cr><esc>A")
vim.opt.formatoptions = "cqrnj"
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index 30e1e2d..14f73c8 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -83,7 +83,7 @@ vim.keymap.set("n", "<Leader><C-s>", "<cmd>setlocal spell!<cr>", { noremap = tru
-- open terminal in file's parent director
-- this needs to be asynchrous
vim.keymap.set("n", "<Return>", function ()
- local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st"
+ local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid $TERMINAL"
-- asynchrous go brr
vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end })
end, { noremap = true })
diff --git a/config/essentials/nvim/templates/inp.sh b/config/essentials/nvim/templates/inp.sh
index ab04f7c..3507cd5 100644
--- a/config/essentials/nvim/templates/inp.sh
+++ b/config/essentials/nvim/templates/inp.sh
@@ -1,6 +1,3 @@
-#!/bin/sh
-
-test -z "${inp:=$1}" \
- && inp="$(cat /dev/stdin)"
-
+test -z "${inp:=$1}" &&
+ inp="$(cat /dev/stdin)"
echo "inp: ${inp}" 1>&2
diff --git a/config/essentials/nvim/templates/minp.sh b/config/essentials/nvim/templates/minp.sh
new file mode 100644
index 0000000..d91d249
--- /dev/null
+++ b/config/essentials/nvim/templates/minp.sh
@@ -0,0 +1,9 @@
+if [ "$MENUCMD" ] && [ -z "${inp:=$1}" ]
+then
+ inp="$($MENUCMD < /dev/null)"
+else
+ echo "input:" >&2
+ read inp
+fi
+test -z "$inp" &&
+ exit 1
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 279c07b..afe1eb6 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -104,6 +104,7 @@ parse_git_status() {
export REPORTTIME=2
export TIMEFMT="-> %*E"
alias time='/usr/bin/time'
+export MENUCMD='fzf'
# Options
setopt correct
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index a632089..0b7b629 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -93,7 +93,7 @@ alias xrandr-rpgmaker='xrandr --auto --output VGA-1 --mode 1024x768 --left-of HD
alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HDMI-1 --output HDMI-1 --mode 1920x1080 && ~/.fehbg'
alias d='du -d 0 -h'
-alias dud='du * -d 0 -h 2>/dev/null | sort -h'
+alias dud='du .* * -d 0 -h 2>/dev/null | sort -h'
alias df='df -h'
alias shred='shred -uz'
alias lsblk='lsblk -o name,type,fsused,size,fstype,label,mountpoint'
@@ -101,6 +101,7 @@ alias floc='doas find / -type "f" 2> /dev/null | grep'
alias dloc='doas find / -type "d" 2> /dev/null | grep'
alias fif='find . -type "f" | grep'
alias fid='find . -type "d" | grep'
+alias sxt='sxiv -t'
# ssh
alias sha='ssh-add'
@@ -128,10 +129,16 @@ alias -g sba='source env/bin/activate || source bin/activate'
alias -g smc='systemctl'
alias smcu='systemctl --user'
alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
+alias rh='rehash'
alias wf='doas wipefs -a'
alias dmci="doas make clean install"
alias rmd='rm -f *.{orig,rej}'
+alias vbm='vboxmanage'
+alias vbls='vbm list vms'
+alias vblsr='vbm list runningvms'
+alias vb='vbm startvm'
+
# quick config
alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
alias eza='$EDITOR ${ZDOTDIR}/aliases.zsh'
@@ -145,11 +152,19 @@ alias est='$EDITOR ~/src/st/config.def.h'
alias esl='$EDITOR ~/src/slock/config.def.h'
alias esls='$EDITOR ~/src/slstatus/config.def.h'
alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
-# quick cd
alias cfd='$EDITOR config.def.h'
+# quick cd
alias cds='cd $HOME/src/'
+alias cdw='cd $HOME/src/dwm'
+alias cddm='cd $HOME/src/dmenu'
+alias cdslo='cd $HOME/src/slock'
+alias cdsl='cd $HOME/src/slstatus'
+alias cdst='cd $HOME/src/st'
+alias cdsta='cd $HOME/src/stable-diffusion-webui'
alias cdo='cd $HOME/src/dotfiles'
alias cdi='cd $HOME/src/installdrier'
+alias cdia='cd $HOME/src/installdrier/arch'
+alias cdib='cd $HOME/src/installdrier/deb'
alias cdm='cd $HOME/music'
alias cdd='cd $HOME/dl'
alias cdrs='cd /srv/'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index f21ce9b..fefc125 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -79,10 +79,10 @@ esc () {
}
delfile () {
- curl ${2:-"https://upfast.craftmenners.men/delete/$1"}
+ curl ${2:-"https://up.kallipso.be/delete/$1"}
}
upfile () {
- curl -F "file=@\"$1\"" ${2:-"https://upfast.craftmenners.men"}
+ curl -F "file=@\"$1\"" ${2:-"https://up.kallipso.be"}
}
sgd () {