From e1893b1b31503adaa2c2484b57a5d7a4a5d0516c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 14 Aug 2023 21:37:08 +0200 Subject: [googoo] fixed destination argument not working --- config/essentials/zsh/functions.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 3c5f11f..e0eeb45 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -49,7 +49,7 @@ _googoo_fzf_opt () o () { _googoo_fzf_opt "$1" - f="$(goo f "dest" | fzf $opt)" + f="$(goo f "$dest" | fzf $opt)" test "$1" && shift test -f "$f" && $EDITOR $@ "$f" } -- cgit v1.2.3 From 85dbd4176e214696b0ed0892f7fe6c0bce2bc828 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:04:14 +0200 Subject: [luasnip.lua] renamed die to log and logn log and logn seem like better names, also because now we use printf we make an apart logn function that adds a newline on the end. --- config/essentials/nvim/after/plugin/luasnip.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 7ee274f..5b45d11 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -155,18 +155,20 @@ ls.add_snippets("sh", { stty \$old_stty_cfg } ]], {}), - parse("fdie", + parse("flogn", [[ - die () + logn () { - echo "\$@" >&2 + >&2 printf '%s\n' "\$@" } ]], {}), - s("die", fmt( + parse("flog", [[ - die "{}: {}"{} - ]], - { c(1, {t "I", t "E", t "W"}), i(2), i(0) })), + log () + { + >&2 printf '%s' "\$@" + } + ]], {}), s("inp", fmt( [[ test -z "${{{}:=$1}}" && -- cgit v1.2.3 From edf8bc8432bb17854b5ef5667864ed58550956d1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:06:44 +0200 Subject: [functions.zsh] changed function name format --- config/essentials/zsh/functions.zsh | 60 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 31 deletions(-) (limited to 'config') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index e0eeb45..dee883f 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -1,6 +1,6 @@ #!/bin/zsh -die () +die() { echo "$@" >&2 } @@ -39,34 +39,34 @@ nnn() { test -z "$NNNLVL" && /usr/bin/nnn "$@" || exit } ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit } # googoo aliases -_googoo_fzf_opt () +_googoo_fzf_opt() { if [ "$1" ] then [ -d "$1" ] && dest="$1" || opt="-q $1" fi } -o () +o() { _googoo_fzf_opt "$1" f="$(goo f "$dest" | fzf $opt)" test "$1" && shift test -f "$f" && $EDITOR $@ "$f" } -go () +go() { _googoo_fzf_opt "$1" d="$(goo d "$dest" | fzf $opt)" test -d "$d" && cd "$d" } -ogo () +ogo() { _googoo_fzf_opt "$1" d="$(dirname "$(goo f "$dest")" | fzf $opt)" test -d "$d" && cd "$d" } -ipc () +ipc() { if [[ "$(ip link show eno1 | awk -F, 'NR=1 {print $3}')" == "UP" ]] then @@ -76,22 +76,20 @@ ipc () fi } -calc () { echo "$@" | bc -l | numfmt --grouping; } - -psgrep () +psgrep() { [ $# -eq 0 ] && return 1 pgrep "$@" | xargs ps } -unique () { +unique() { local f f="$(mktemp)" awk '!x[$0]++' "$1" > "$f" mv "$f" "$1" } -clip () { +clip() { if [ "$WAYLAND_DISPLAY" ] then echo -n "$@" | wl-copy @@ -100,7 +98,7 @@ clip () { fi } -unzipp () { +unzipp() { file=$1 shift unzip $file $@ || exit 1 @@ -108,18 +106,18 @@ unzipp () { } # fix long waiting time -__git_files () { +__git_files() { _wanted files expl 'local files' _files } -esc () { +esc() { $EDITOR "$(which $1)" } -delfile () { +delfile() { curl "${2:-https://upfast.cronyakatsuki.xyz/delete/$1}" } -upfile () { +upfile() { curl -F "file=@\"$1\"" ${2:-https://upfast.cronyakatsuki.xyz} } @@ -177,7 +175,7 @@ function git_develop_branch() { } # gpg backup -gpg_backup () +gpg_backup() { gpg --export-secret-keys --armor > private.asc gpg --export --armor > public.asc @@ -186,7 +184,7 @@ gpg_backup () shred -uz {public,private,trust}.asc } -gpg_import () +gpg_import() { tar xf $1 shred -uz $1 @@ -196,29 +194,29 @@ gpg_import () shred -uz {public,private,trust}.asc } -ngenable () +ngenable() { ln -sf /etc/nginx/sites-available/$1 /etc/nginx/sites-enabled/ } -vbsr () +vbsr() { vboxmanage snapshot "$1" restore "$2" && vboxmanage startvm "$1" || vboxmanage controlvm "$1" poweroff } -vbsrr () +vbsrr() { vbsr "$1" "$2" sleep 3 vbsr "$1" "$2" } -vbst () +vbst() { vboxmanage snapshot "$1" take "$2" } -pacsize () +pacsize() { if test -n "$1"; then packages="$@" @@ -232,7 +230,7 @@ pacsize () expac '%m %n' - | numfmt --to=iec-i --suffix=B --format="%.2f" } -pkbs () +pkbs() { pkgfile -b "$1" | tee /dev/stderr | doas pacman -S - } @@ -247,7 +245,7 @@ mime-default () die "Done." } -addedkeys () { +addedkeys() { find ~/.ssh -iname "*.pub" | while read key do local fingerprint="$(ssh-keygen -lf "$key" 2>/dev/null)" @@ -258,7 +256,7 @@ addedkeys () { done | sed "s,$HOME/.ssh/,," } -fpass () { +fpass() { find $HOME/.password-store -type f -not -path ".git" | grep "\.gpg$" | sed "s,$HOME/.password-store/,,;s,\.gpg$,," | @@ -266,22 +264,22 @@ fpass () { xargs pass show -c } -oclip () +oclip() { printf "\033]52;c;$(echo -n "$@" | base64)\a" } -sms () +sms() { ssh phone sendmsg "$1" "'$2'" } -trcp () +trcp() { scp "$1" db:/media/basilisk/downloads/transmission/torrents/ } -muttmail () +muttmail() { die -n "email set: " ls $HOME/.config/mutt/configs | @@ -292,7 +290,7 @@ muttmail () read && mutt } -resize () +resize() { test $# -lt 2 && printf "usage: %s [out]\n" "$0" >&2 && -- cgit v1.2.3 From dd75534e1878d7934d0a402a70e20d24226fcd8e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:07:02 +0200 Subject: [functions.zsh] renamed die to log --- config/essentials/zsh/functions.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index dee883f..0d4b8a5 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -1,9 +1,7 @@ #!/bin/zsh -die() -{ - echo "$@" >&2 -} +log() { >&2 printf '%s' "$@"; } +logn() { >&2 printf '%s\n' "$@"; } awnk() { awk "{print \$$1}" -- cgit v1.2.3 From 2321b913f89f2bc678c8931db05e0eb5898d7191 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:09:07 +0200 Subject: [functions.zsh] added ginit function to init a dir on db remote --- config/essentials/zsh/functions.zsh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 0d4b8a5..6c2437f 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -138,16 +138,24 @@ sgd () { unset d } -# Git functions +ginit() +{ + [ "$1" ] || return 1 + ssh db /var/git/initdir.sh "$1" + git remote add origin git@db:"$1.git" + git push --set-upstream origin $(git_current_branch) +} + # Returns current branch -function git_current_branch() +git_current_branch() { command git rev-parse --git-dir &>/dev/null || return git branch --show-current } # Check if main exists and use instead of master -function git_main_branch() { +git_main_branch() +{ command git rev-parse --git-dir &>/dev/null || return local ref for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do -- cgit v1.2.3 From 0d01d76680e90a8b87e98426800147639dd2fc75 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:07:37 +0200 Subject: [dunstrc] hide indicators --- config/X/dunst/dunstrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/X/dunst/dunstrc b/config/X/dunst/dunstrc index 6127474..0c4eebc 100644 --- a/config/X/dunst/dunstrc +++ b/config/X/dunst/dunstrc @@ -187,7 +187,7 @@ hide_duplicate_count = false # Display indicators for URLs (U) and actions (A). - show_indicators = yes + show_indicators = no ### Icons ### -- cgit v1.2.3 From 15d604ed1c9e0b74663ab4271a9ce17ded2889e2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:07:48 +0200 Subject: [aliases.zsh] added calc alias --- config/essentials/zsh/aliases.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 9849b93..4185999 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -15,6 +15,8 @@ then alias ogo/='ogo /' alias ogo/s='ogo /srv' + alias calc='bc <<<' + if [ "$WAYLAND_DISPLAY" ] then alias -g clipp='wl-copy -n' @@ -145,7 +147,6 @@ alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb' # ssh alias sha='ssh-add' alias sshs='eval "$(ssh-agent)" && ssh-add' - alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i' alias whatsmyip='curl -s "ifconfig.co"' alias icognito='unset HISTFILE' -- cgit v1.2.3 From 0ea5e7a97b7ccba919d5c495e3e328b30cec9e03 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:08:46 +0200 Subject: [functions.zsh] removed unecessary tests --- config/essentials/zsh/functions.zsh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 6c2437f..eb776f0 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -54,14 +54,20 @@ o() go() { _googoo_fzf_opt "$1" - d="$(goo d "$dest" | fzf $opt)" - test -d "$d" && cd "$d" + cd "$(goo d "$dest" | fzf $opt)" } ogo() { _googoo_fzf_opt "$1" - d="$(dirname "$(goo f "$dest")" | fzf $opt)" - test -d "$d" && cd "$d" + cd "$(dirname "$(goo f "$dest")" | fzf $opt)" +} +dgo() +{ + cd "$(goo d | fzf --filter "$@" | head -n 1)" +} +open() +{ + $EDITOR "$(goo f | fzf --filter "$@" | head -n 1)" } ipc() -- cgit v1.2.3 From 63c16da0da3e9b0cdc3fb6f9cd3031dc2297a09c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:26:23 +0200 Subject: [.zshrc] refactored git_parse_remote use cut instead of sed to get the state of the remote, now you could use this command: git branch -v 2> /dev/null | sed '/^*/!d;s/^[^[]*\[\([^ ]*\).*$/\1/' but at this point, it feels more like intellectual masturbation. --- config/essentials/zsh/.zshrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 0665533..769c805 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -121,13 +121,13 @@ 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 "^*" | sed 's/.\+\[\([^ ]\+\).*$/\1/')" + b="$(git branch -v 2>/dev/null | grep "^*" | cut -f2 -d'[' | cut -f1 -d' ')" if [ "$b" = "behind" ] then - echo -n "↓ " + printf "↓ " elif [ "$b" = "ahead" ] then - echo -n "↑ " + printf "↑ " fi } parse_git_branch() { -- cgit v1.2.3 From 859053ceb17299311aa1f33ccdefd58a5302e4b7 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 18 Aug 2023 16:08:01 +0200 Subject: [waybar] refactored --- config/hyprland/waybar/schemes/base16.css | 55 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 28 deletions(-) (limited to 'config') diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css index 61378fd..d0600b8 100644 --- a/config/hyprland/waybar/schemes/base16.css +++ b/config/hyprland/waybar/schemes/base16.css @@ -29,6 +29,12 @@ window#waybar.hidden { opacity: 0.2; } +tooltip { + background: @background; + color: @foreground; + border: 2px solid @color0; +} + window#waybar.termite #window, window#waybar.Firefox #window, window#waybar.Navigator #window, @@ -37,17 +43,21 @@ window#waybar.PCSX2 #window { background: @color7; } -#mpd, #battery, -#custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory { - margin-left: 8px; - padding-left: 16px; - padding-right: 16px; - border-radius: 26px; +.modules-right * { + padding: 0 16px; +} + +.modules-right { + margin-right: 2px; +} +.modules-left { + margin-left: 2px; } #workspaces, #mpd, #battery, #clock, #custom-wireguard, #network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray { - border: solid @background 2px; + border: solid @background; + border-width: 2px 2px 2px 0; margin-top: 4px; margin-bottom: 2px; transition: none; @@ -60,8 +70,7 @@ window#waybar.PCSX2 #window { } #workspaces { - margin-left: 12px; - border-radius: 26px; + border: solid @background 2px; background: @color3; } @@ -94,30 +103,27 @@ window#waybar.PCSX2 #window { } #clock { - margin-top: 4px; - margin-bottom: 2px; - margin-left: 8px; - padding-left: 16px; - padding-right: 16px; - border-radius: 26px; + border: solid @color4 2px; + padding: 0 16px; color: @color3; background: @background; - border-color: @color4; } #window { - padding-left: 16px; - color: @color4; + margin-left: 16px; + padding: 0; + color: @color5; } #custom-wireguard { color: @color5; - border-color: @color8; + border: 2px solid @color8; background: @background; } #network { color: @background; + border-left: 2px solid @background; background: @color5; } @@ -137,20 +143,13 @@ window#waybar.PCSX2 #window { } #custom-memory { - margin-left: 8px; - margin-right: 12px; - padding-left: 16px; - padding-right: 16px; - border-radius: 26px; + padding: 0 16px; color: @background; background: @color5; } #tray { - border: none; - margin-right: 12px; - color: @foreground; - background: transparent; + all: initial; } #tray > .needs-attention { -- cgit v1.2.3 From dca089967d2d4d1300445abecb84123aa7bbe196 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 11:52:24 +0200 Subject: [tmux] added nord theme --- config/common/tmux/tmux.conf | 56 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf index 409ad66..fd5777e 100755 --- a/config/common/tmux/tmux.conf +++ b/config/common/tmux/tmux.conf @@ -3,6 +3,7 @@ # Some tweaks to the status line set -g status-right "%H:%M" +set -g status-position top set -g window-status-current-style "underscore" # Enable RGB color if running in xterm set-option -sa terminal-overrides ",xterm*:Tc" @@ -26,7 +27,7 @@ set -g focus-events on # KEYBINDINGS # Reload config file -bind r source-file ~/.tmux.conf \; display "Reloaded ~/.tmux.conf" +bind r source-file ~/.config/tmux.conf \; display "Reloaded ~/.tmux.conf" # Clipboard bind -T copy-mode-vi v send-keys -X begin-selection bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -r -selection clipboard" @@ -88,3 +89,56 @@ bind W new-session -c "$HOME" bind S choose-tree -Z # Menu for mounting and ejecting devices. bind E display-menu -T "#[align=centre]#I:#W" -x W -y W '' Mount 0 "display-popup -E 'amount'" + +# Theme + +#+----------------+ +#+ Plugin Support + +#+----------------+ +#+--- tmux-prefix-highlight ---+ +set -g @prefix_highlight_fg black +set -g @prefix_highlight_bg brightcyan +set -g @prefix_highlight_output_prefix "#[fg=brightcyan]#[bg=black]#[nobold]#[noitalics]#[nounderscore]#[bg=brightcyan]#[fg=black]" +set -g @prefix_highlight_output_suffix "" +set -g @prefix_highlight_copy_mode_attr "fg=brightcyan,bg=black,bold" + + +#+---------+ +#+ Options + +#+---------+ +set -g status-interval 1 +set -g status on + +#+--------+ +#+ Status + +#+--------+ +#+--- Layout ---+ +set -g status-justify left +set -g status-left "#[fg=black,bg=blue,bold] #S #[fg=blue,bg=black,nobold,noitalics,nounderscore]" +set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_DATE_FORMAT} #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_TIME_FORMAT} #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H " +#+--- Colors ---+ +set -g status-style bg=black,fg=white + +#+-------+ +#+ Panes + +#+-------+ +set -g pane-border-style bg=default,fg=brightblack +set -g pane-active-border-style bg=default,fg=blue +set -g display-panes-colour black +set -g display-panes-active-colour brightblack + +#+------------+ +#+ Clock Mode + +#+------------+ +setw -g clock-mode-colour cyan + +#+----------+ +#+ Messages + +#+---------+ +set -g message-style bg=brightblack,fg=cyan +set -g message-command-style bg=brightblack,fg=cyan + +#+--- Windows ---+ +set -g window-status-format "#[fg=black,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack,nobold,noitalics,nounderscore] #[fg=white,bg=brightblack]#W #F #[fg=brightblack,bg=black,nobold,noitalics,nounderscore]" +set -g window-status-current-format "#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#I #[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F #[fg=cyan,bg=black,nobold,noitalics,nounderscore]" +set -g window-status-separator "" -- cgit v1.2.3 From 4927824a901541ce31ad96b25825f6854c0ddb99 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 11:59:58 +0200 Subject: [waybar] added padding to mpd module --- config/hyprland/waybar/schemes/base16.css | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css index d0600b8..e351f69 100644 --- a/config/hyprland/waybar/schemes/base16.css +++ b/config/hyprland/waybar/schemes/base16.css @@ -92,6 +92,7 @@ window#waybar.PCSX2 #window { #mpd { color: @background; + padding: 0 16px; background: @color6; } -- cgit v1.2.3 From c4e4a6c46828a188b782fd60a68bb061c934047e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:03:53 +0200 Subject: [alacritty] added fullscreen keybinding --- config/common/alacritty/alacritty.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/common/alacritty/alacritty.yml b/config/common/alacritty/alacritty.yml index e5664f1..32fc95b 100644 --- a/config/common/alacritty/alacritty.yml +++ b/config/common/alacritty/alacritty.yml @@ -761,7 +761,7 @@ hints: # # If the same trigger is assigned to multiple actions, all of them are executed # in the order they were defined in. -# key_bindings: +key_bindings: #- { key: Paste, action: Paste } #- { key: Copy, action: Copy } #- { key: L, mods: Control, action: ClearLogNotice } @@ -871,6 +871,7 @@ hints: #- { key: F, mods: Command|Control, action: ToggleFullscreen } #- { key: F, mods: Command, mode: ~Search, action: SearchForward } #- { key: B, mods: Command, mode: ~Search, action: SearchBackward } + - {key: F11, action: ToggleFullscreen} #debug: # Display the time it takes to redraw each frame. -- cgit v1.2.3 From c2b8ef4441a00d2cead2b529487718caa5bd8a8c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:04:15 +0200 Subject: [nvim] changed die to log and logn snippets --- config/essentials/nvim/after/plugin/luasnip.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 5b45d11..5657560 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -157,17 +157,11 @@ ls.add_snippets("sh", { ]], {}), parse("flogn", [[ - logn () - { - >&2 printf '%s\n' "\$@" - } + logn () { >&2 printf '%s\n' "\$@"; } ]], {}), parse("flog", [[ - log () - { - >&2 printf '%s' "\$@" - } + log () { >&2 printf '%s' "\$@"; } ]], {}), s("inp", fmt( [[ -- cgit v1.2.3 From fce05e8d2257fc7a562afc1089c6290902aa4aa9 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:04:51 +0200 Subject: [nvim] use printf instead of echo for sh remaps --- config/essentials/nvim/ftplugin/sh.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 01b20d6..169059c 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,6 +1,6 @@ -vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"") -vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"") -vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"A") -vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"A") +vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"") +vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"") +vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"A") +vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"A") vim.keymap.set({"i", "n"}, "v", "A)\"I\"$(I") vim.opt.formatoptions = "cqrnj" -- cgit v1.2.3 From 696accd7fca3788193d8871bc3759074ef98e524 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:05:16 +0200 Subject: [nvim] added NetworkEssentials vault --- config/essentials/nvim/lua/user/zk.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 613c8e5..8004238 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -50,6 +50,11 @@ require('telekasten').setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, + NetworkEssentials = { + home = home .. "/" .. "NetworkEssentials", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, C = { home = home .. "/" .. "C", template_new_note = home .. "/" .. "templates/new_note.md", -- cgit v1.2.3 From af30025b0ddd2c6ba54d77b4eccefc04b5ad5ff6 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:16:29 +0200 Subject: [waybar] changed mpd format --- config/hyprland/waybar/config.jsonc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc index 0fc585f..ad4dc02 100644 --- a/config/hyprland/waybar/config.jsonc +++ b/config/hyprland/waybar/config.jsonc @@ -4,15 +4,15 @@ "modules-center": ["clock"], "modules-right": ["custom/wireguard", "network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"], "mpd": { - "tooltip": false, "format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})", "artist-len": 24, "format-disconnected": "s", - "format-stopped": "s", + "format-stopped": "", "state-icons": { "playing": "", "paused": "", }, + "tooltip-format": "{songPosition}/{queueLength} ({volume}%)", "on-click": "mpc toggle", "on-scroll-up": "mpc volume +5", "on-scroll-down": "mpc volume -5", -- cgit v1.2.3 From 62b93ec2d8ca2aa0cdfb0192ca885a72848edcd0 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:16:48 +0200 Subject: [waybar] added tooltips --- config/hyprland/waybar/config.jsonc | 2 -- 1 file changed, 2 deletions(-) (limited to 'config') diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc index ad4dc02..6866f62 100644 --- a/config/hyprland/waybar/config.jsonc +++ b/config/hyprland/waybar/config.jsonc @@ -26,7 +26,6 @@ "separate-outputs": true, }, "pulseaudio": { - "tooltip": false, "scroll-step": 5, "format": "{icon} {volume:3}%", "format-icons": { @@ -54,7 +53,6 @@ "format-disconnected": "", }, "cpu": { - "tooltip": false, "format": " {usage:2}%", "interval": 3, }, -- cgit v1.2.3 From ef702ec038ffd2202355eea937ee7374438a6cf5 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 12:17:17 +0200 Subject: [tofi] changed nord theme to be on top with 100% width --- config/hyprland/tofi/themes/nord | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config/hyprland/tofi/themes/nord b/config/hyprland/tofi/themes/nord index cf78b5c..5d8161f 100644 --- a/config/hyprland/tofi/themes/nord +++ b/config/hyprland/tofi/themes/nord @@ -13,21 +13,21 @@ selection-match-color = #ffffff prompt-text = "" prompt-padding = 0 placeholder-text = "..." +anchor=top-left -width = 20% +width = 100% height = 20% -background-color = #2e3440f0 +background-color = #3b4252f2 outline-width = 0 outline-color = #81a1c1 -border-width = 2 +border-width = 0 border-color = #88c0d0 -corner-radius = 26 +corner-radius = 0 -padding-top = 0 -padding-bottom = 0 -padding-left = 0 -# padding-left = 7% -padding-right = 0 +padding-top = 5 +padding-bottom = 5 +padding-left = 5 +padding-right = 5 matching-algorithm = prefix require-match = false -- cgit v1.2.3 From e09397267eac16e61fd9b4e406e9d4ab4f255f56 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 21:49:10 +0200 Subject: [tofi] created logic groups ordered the config, colors together, options affecting size together ensoforth... --- config/hyprland/tofi/themes/nord | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/hyprland/tofi/themes/nord b/config/hyprland/tofi/themes/nord index 5d8161f..c8a6192 100644 --- a/config/hyprland/tofi/themes/nord +++ b/config/hyprland/tofi/themes/nord @@ -1,7 +1,9 @@ ### Font font = monospace bold font-size = 12 +anchor=top +# colors text-color = #d8dee9 prompt-color = #81a1c1 placeholder-color = #4c566a @@ -9,26 +11,29 @@ input-color = #d8dee9 default-result-color = #88c0d0 selection-color = #5e81ac selection-match-color = #ffffff +background-color = #3b4252f2 +outline-color = #81a1c1 +border-color = #88c0d0 -prompt-text = "" -prompt-padding = 0 -placeholder-text = "..." -anchor=top-left - +# sizes width = 100% height = 20% -background-color = #3b4252f2 + +border-width = 2 outline-width = 0 -outline-color = #81a1c1 -border-width = 0 -border-color = #88c0d0 -corner-radius = 0 +prompt-padding = 0 padding-top = 5 padding-bottom = 5 padding-left = 5 padding-right = 5 +corner-radius = 0 + +# general +prompt-text = "" +placeholder-text = "..." + matching-algorithm = prefix require-match = false auto-accept-single = true -- cgit v1.2.3 From da4d5a30309bd40dcabd4fc1395bc44b2af06012 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 21:50:08 +0200 Subject: [tmux] updated config file location --- config/common/tmux/tmux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf index fd5777e..875ab7f 100755 --- a/config/common/tmux/tmux.conf +++ b/config/common/tmux/tmux.conf @@ -27,7 +27,7 @@ set -g focus-events on # KEYBINDINGS # Reload config file -bind r source-file ~/.config/tmux.conf \; display "Reloaded ~/.tmux.conf" +bind r source-file ~/.config/tmux/tmux.conf \; display "Reloaded ~/.tmux.conf" # Clipboard bind -T copy-mode-vi v send-keys -X begin-selection bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -r -selection clipboard" -- cgit v1.2.3 From bb5cb48e44ba6d54eba398e8b6473ec945f47413 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 21:56:29 +0200 Subject: [tmux] removed plugin support and added hour to status --- config/common/tmux/tmux.conf | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'config') diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf index 875ab7f..a349025 100755 --- a/config/common/tmux/tmux.conf +++ b/config/common/tmux/tmux.conf @@ -1,10 +1,6 @@ # By Nicholas Marriott. Public domain. # but -now- me. -# Some tweaks to the status line -set -g status-right "%H:%M" -set -g status-position top -set -g window-status-current-style "underscore" # Enable RGB color if running in xterm set-option -sa terminal-overrides ",xterm*:Tc" # Change the default $TERM to xterm-256color @@ -92,17 +88,6 @@ bind E display-menu -T "#[align=centre]#I:#W" -x W -y W '' Mount 0 "display-popu # Theme -#+----------------+ -#+ Plugin Support + -#+----------------+ -#+--- tmux-prefix-highlight ---+ -set -g @prefix_highlight_fg black -set -g @prefix_highlight_bg brightcyan -set -g @prefix_highlight_output_prefix "#[fg=brightcyan]#[bg=black]#[nobold]#[noitalics]#[nounderscore]#[bg=brightcyan]#[fg=black]" -set -g @prefix_highlight_output_suffix "" -set -g @prefix_highlight_copy_mode_attr "fg=brightcyan,bg=black,bold" - - #+---------+ #+ Options + #+---------+ @@ -113,9 +98,12 @@ set -g status on #+ Status + #+--------+ #+--- Layout ---+ +set -g set-titles on +set -g status-position top +set -g window-status-current-style "underscore" set -g status-justify left set -g status-left "#[fg=black,bg=blue,bold] #S #[fg=blue,bg=black,nobold,noitalics,nounderscore]" -set -g status-right "#{prefix_highlight}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_DATE_FORMAT} #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] ${NORD_TMUX_STATUS_TIME_FORMAT} #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H " +set -g status-right "#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] %H:%M #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]#[fg=white,bg=brightblack] #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]#[fg=black,bg=cyan,bold] #H " #+--- Colors ---+ set -g status-style bg=black,fg=white -- cgit v1.2.3 From 02d291772d52ba328a0d8f92bec757fae5417bcc Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 21:57:10 +0200 Subject: [hyprland] minor edits use a subgroup for blur tweaked the opacity to change on focus rectangle corners --- config/hyprland/hypr/hyprland.conf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf index a8a99c2..17f0235 100644 --- a/config/hyprland/hypr/hyprland.conf +++ b/config/hyprland/hypr/hyprland.conf @@ -41,14 +41,17 @@ misc { } decoration { - rounding = 2 - blur = no - blur_size = 3 - blur_passes = 1 - blur_new_optimizations = on + rounding = 0 + blur { + enabled = 1 + size = 6 + } dim_inactive = true dim_strength = 0.08 + active_opacity = 0.98 + inactive_opacity = 0.92 + drop_shadow = yes shadow_range = 4 shadow_render_power = 3 -- cgit v1.2.3 From edd077ea759c8bd7cc96782d5bfbd992a9d848a1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 21:58:27 +0200 Subject: [waybar] fixed tray icons menu too big --- config/hyprland/waybar/schemes/base16.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css index e351f69..541ffb8 100644 --- a/config/hyprland/waybar/schemes/base16.css +++ b/config/hyprland/waybar/schemes/base16.css @@ -149,8 +149,8 @@ window#waybar.PCSX2 #window { background: @color5; } -#tray { - all: initial; +#tray * { + padding: unset; } #tray > .needs-attention { -- cgit v1.2.3 From f2bcbc845adcd02b1b12fa00f1b8c08782ff929c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 21:58:48 +0200 Subject: [waybar] removed duplicate property --- config/hyprland/waybar/schemes/base16.css | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css index 541ffb8..76efbb3 100644 --- a/config/hyprland/waybar/schemes/base16.css +++ b/config/hyprland/waybar/schemes/base16.css @@ -77,7 +77,6 @@ window#waybar.PCSX2 #window { #workspaces button { transition: none; background: transparent; - font-size: 16px; color: @background; } -- cgit v1.2.3 From 4f0064e39f9ece084d765f4e54a7e212e366a4e3 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 22:22:18 +0200 Subject: [zshenv] added fzf nord theme --- config/home/.zshenv | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'config') diff --git a/config/home/.zshenv b/config/home/.zshenv index 9a8206c..0c5057e 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -55,3 +55,11 @@ export PASSWORD_STORE_CLIP_TIME=5 # export VIMINIT="source ~/.config/vim/vimrc" # export fpath=($XDG_CONFIG_HOME/zsh/completion/ $fpath) # export CUDA_CACHE_PATH="$XDG_CONFIG_HOME"/nv + +export FZF_DEFAULT_OPTS=$FZF_DEFAULT_OPTS' + --color=fg:#e5e9f0,hl:#88c0d0 + --color=pointer:blue + --color=gutter:#2e3440 + --color=fg+:#5e81ac,hl+:#d08770 + --color=info:#b48ead,prompt:#bf6069,pointer:#b48dac + --color=marker:#a3be8b,spinner:#ebcb8b,header:#a3be8b' -- cgit v1.2.3 From 4f80f256aacd5096aa40159f36769135a8765a00 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 22:31:48 +0200 Subject: [tmux] minor edits --- config/common/tmux/tmux.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf index a349025..e74713a 100755 --- a/config/common/tmux/tmux.conf +++ b/config/common/tmux/tmux.conf @@ -1,5 +1,4 @@ -# By Nicholas Marriott. Public domain. -# but -now- me. +# Special thanks to Nicholas Marriott. # Enable RGB color if running in xterm set-option -sa terminal-overrides ",xterm*:Tc" @@ -79,7 +78,7 @@ bind -n M-I switch-client -n bind n command-prompt "rename-window '%%'" bind N command-prompt "rename-session '%%'" # Starting new windows -bind w new-window -c "#{pane_current_path}" +bind w new-window -c "$HOME" bind W new-session -c "$HOME" # Show tree bind S choose-tree -Z -- cgit v1.2.3 From c6a1ae689420321c37d66055d8c09d0d2a3f784e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 22:32:48 +0200 Subject: [nvim] use stderr on printf --- config/essentials/nvim/ftplugin/sh.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 169059c..e18170a 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,6 +1,6 @@ -vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"") -vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"") -vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2\"A") -vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1printf \"\\2: %s\\\\n\" \"$\\2\"A") +vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2\"") +vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2: %s\\\\n\" \"$\\2\"") +vim.keymap.set("i", "t", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2\"A") +vim.keymap.set("i", "i", "s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2: %s\\\\n\" \"$\\2\"A") vim.keymap.set({"i", "n"}, "v", "A)\"I\"$(I") vim.opt.formatoptions = "cqrnj" -- cgit v1.2.3 From 9172676556847ff625cbf4b4eff19f441e0b9386 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 22:33:19 +0200 Subject: [aliases] edited aliases removed aliases that have been replaced such as floc and dloc, and added more aliases --- config/essentials/zsh/aliases.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 4185999..a1bbf50 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -5,9 +5,6 @@ if [ $SHELL = "/bin/zsh" ] then # googoo aliases - alias o.='o .' - alias go.='go .' - alias ogo.='ogo .' alias o/='o /' alias o/s='o /srv' alias go/='go /' @@ -133,10 +130,6 @@ alias df='df -h' alias diff='diff -u --color' alias shred='shred -uz' alias lsblk='lsblk -o name,type,fsused,fsavail,size,fstype,label,mountpoint' -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' alias wgsh='wget --quiet --show-progress' alias wgc='wgsh "$(clipo)"' @@ -185,6 +178,7 @@ alias rmd='rm -f *.{orig,rej}' alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite' alias gdate='date +%y_%m_%d-%T' alias tpid='tail -f /dev/null --pid' +alias pwdcp='pwd | clipp' alias vbm='vboxmanage' alias vbls='vbm list vms' @@ -217,6 +211,7 @@ alias cdpa='cd ~/pics/ai-outputs/' alias cdpp='cd ~/proj/personal/' alias chom='cd ~/proj/personal/homepage' alias lov='cd ~/proj/personal/lola' +alias cdsh='~/proj/personal/scheduler' alias cdsw='cd ~/proj/personal/WheelAdvisor' alias cddm='cd ~/proj/suckless/dmenu' alias cdw='cd ~/proj/suckless/dwm' @@ -238,6 +233,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 cfg='find -L ~/src/dotfiles -type f | fzf | xargs -r $EDITOR' 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" @@ -258,7 +255,6 @@ alias dbinf='ssh db dlinfo' alias sshdb='ssh -t db tmux a' alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music' -alias cfg='git --git-dir=~/src/dotfiles/.git --work-tree=~/src/dotfiles' # oh-my-zsh git aliases alias g='git' alias ga='git add' -- cgit v1.2.3