From 8f4bff3514f31b88762e3b3e48773907f85265f8 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 11:06:38 +0100 Subject: use XDG base directories, set directories in .zshenv --- config/essentials/zsh/aliases.zsh | 2 + config/essentials/zsh/zshrc | 99 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 config/essentials/zsh/zshrc (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 33648a2..cfad09e 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -7,6 +7,8 @@ alias -g nb='newsboat' alias -g sr='surfraw' alias -g ccu='calcurse' +alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml' + if [ -x /usr/bin/dircolors ]; then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" # alias ls='ls -h --color --group-directories-first' diff --git a/config/essentials/zsh/zshrc b/config/essentials/zsh/zshrc new file mode 100644 index 0000000..dd52e5e --- /dev/null +++ b/config/essentials/zsh/zshrc @@ -0,0 +1,99 @@ +#!/bin/zsh + +if [ ! $(pgrep Xorg) ] && [ "tty1" = "$(basename $(tty))" ] +then + clear + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)" + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --noask --eval --quiet --agents ssh 2> /dev/null)" + clear + startx 2&> /dev/null + exit +fi + +autoload -U select-word-style +autoload -z edit-command-line +zle -N edit-command-line +zstyle ':compinstall' filename '/home/aluc/.zshrc' +zstyle ':completion:*' menu select +autoload -Uz compinit +compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION +autoload -Uz surround +zle -N delete-surround surround +zle -N add-surround surround +zle -N change-surround surround +compinit + +for f in \ + /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \ + /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \ + ~/.config/zsh/functions.zsh \ + ~/.config/zsh/aliases.zsh +do + test -f $f && source $f +done + +bindkey -v +bindkey -a cs change-surround +bindkey -a ds delete-surround +bindkey -a ys add-surround +bindkey -M visual S add-surround +bindkey "^A" beginning-of-line +bindkey "^E" end-of-line +bindkey '^I' expand-or-complete-prefix # necessary for completeinword +bindkey '^Y' autosuggest-accept +bindkey "^K" kill-line +bindkey "^P" up-line-or-history +bindkey "^N" down-line-or-history +bindkey "^V" quoted-insert +bindkey "^Xa" _expand_alias +bindkey "^Xe" edit-command-line +bindkey "^[." insert-last-word +bindkey "^['" quote-line + +# pacman synced rehash +zshcache_time="$(date +%s%N)" +autoload -Uz add-zsh-hook +rehash_precmd() { + if [[ -a /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if (( zshcache_time < paccache_time )); then + rehash + zshcache_time="$paccache_time" + fi + fi +} +add-zsh-hook -Uz precmd rehash_precmd + +# prompt +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 +parse_git_remote() { + b="$(git branch -v 2> /dev/null | grep "^*" | sed 's/.\+\[\([^ ]\+\).*$/\1/')" + if [ "$b" = "behind" ] + then + echo -n "↓ " + elif [ "$b" = "ahead" ] + then + echo -n "↑ " + fi +} +parse_git_branch() { + git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null +} +parse_git_status() { + git status --short 2> /dev/null | head -n1 | awk '{print $1 " "}' +} + +# Options +setopt correct +setopt nonomatch +setopt autocd +setopt completeinword +setopt extendedglob +setopt histignorealldups +setopt histreduceblanks +setopt interactivecomments +setopt notify +setopt cdablevars -- cgit v1.2.3 From f167c3cd20e874da6160ac4d9c45c3a0c3011635 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 11:18:41 +0100 Subject: renamed zshrc to .zshrc to make xdg base dir work --- config/essentials/zsh/.zshrc | 99 ++++++++++++++++++++++++++++++++++++++++++++ config/essentials/zsh/zshrc | 99 -------------------------------------------- config/home/.zshenv | 3 -- 3 files changed, 99 insertions(+), 102 deletions(-) create mode 100644 config/essentials/zsh/.zshrc delete mode 100644 config/essentials/zsh/zshrc (limited to 'config/essentials') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc new file mode 100644 index 0000000..dd52e5e --- /dev/null +++ b/config/essentials/zsh/.zshrc @@ -0,0 +1,99 @@ +#!/bin/zsh + +if [ ! $(pgrep Xorg) ] && [ "tty1" = "$(basename $(tty))" ] +then + clear + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)" + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --noask --eval --quiet --agents ssh 2> /dev/null)" + clear + startx 2&> /dev/null + exit +fi + +autoload -U select-word-style +autoload -z edit-command-line +zle -N edit-command-line +zstyle ':compinstall' filename '/home/aluc/.zshrc' +zstyle ':completion:*' menu select +autoload -Uz compinit +compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION +autoload -Uz surround +zle -N delete-surround surround +zle -N add-surround surround +zle -N change-surround surround +compinit + +for f in \ + /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \ + /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \ + ~/.config/zsh/functions.zsh \ + ~/.config/zsh/aliases.zsh +do + test -f $f && source $f +done + +bindkey -v +bindkey -a cs change-surround +bindkey -a ds delete-surround +bindkey -a ys add-surround +bindkey -M visual S add-surround +bindkey "^A" beginning-of-line +bindkey "^E" end-of-line +bindkey '^I' expand-or-complete-prefix # necessary for completeinword +bindkey '^Y' autosuggest-accept +bindkey "^K" kill-line +bindkey "^P" up-line-or-history +bindkey "^N" down-line-or-history +bindkey "^V" quoted-insert +bindkey "^Xa" _expand_alias +bindkey "^Xe" edit-command-line +bindkey "^[." insert-last-word +bindkey "^['" quote-line + +# pacman synced rehash +zshcache_time="$(date +%s%N)" +autoload -Uz add-zsh-hook +rehash_precmd() { + if [[ -a /var/cache/zsh/pacman ]]; then + local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" + if (( zshcache_time < paccache_time )); then + rehash + zshcache_time="$paccache_time" + fi + fi +} +add-zsh-hook -Uz precmd rehash_precmd + +# prompt +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 +parse_git_remote() { + b="$(git branch -v 2> /dev/null | grep "^*" | sed 's/.\+\[\([^ ]\+\).*$/\1/')" + if [ "$b" = "behind" ] + then + echo -n "↓ " + elif [ "$b" = "ahead" ] + then + echo -n "↑ " + fi +} +parse_git_branch() { + git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null +} +parse_git_status() { + git status --short 2> /dev/null | head -n1 | awk '{print $1 " "}' +} + +# Options +setopt correct +setopt nonomatch +setopt autocd +setopt completeinword +setopt extendedglob +setopt histignorealldups +setopt histreduceblanks +setopt interactivecomments +setopt notify +setopt cdablevars diff --git a/config/essentials/zsh/zshrc b/config/essentials/zsh/zshrc deleted file mode 100644 index dd52e5e..0000000 --- a/config/essentials/zsh/zshrc +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/zsh - -if [ ! $(pgrep Xorg) ] && [ "tty1" = "$(basename $(tty))" ] -then - clear - eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)" - eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --noask --eval --quiet --agents ssh 2> /dev/null)" - clear - startx 2&> /dev/null - exit -fi - -autoload -U select-word-style -autoload -z edit-command-line -zle -N edit-command-line -zstyle ':compinstall' filename '/home/aluc/.zshrc' -zstyle ':completion:*' menu select -autoload -Uz compinit -compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION -autoload -Uz surround -zle -N delete-surround surround -zle -N add-surround surround -zle -N change-surround surround -compinit - -for f in \ - /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \ - /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \ - ~/.config/zsh/functions.zsh \ - ~/.config/zsh/aliases.zsh -do - test -f $f && source $f -done - -bindkey -v -bindkey -a cs change-surround -bindkey -a ds delete-surround -bindkey -a ys add-surround -bindkey -M visual S add-surround -bindkey "^A" beginning-of-line -bindkey "^E" end-of-line -bindkey '^I' expand-or-complete-prefix # necessary for completeinword -bindkey '^Y' autosuggest-accept -bindkey "^K" kill-line -bindkey "^P" up-line-or-history -bindkey "^N" down-line-or-history -bindkey "^V" quoted-insert -bindkey "^Xa" _expand_alias -bindkey "^Xe" edit-command-line -bindkey "^[." insert-last-word -bindkey "^['" quote-line - -# pacman synced rehash -zshcache_time="$(date +%s%N)" -autoload -Uz add-zsh-hook -rehash_precmd() { - if [[ -a /var/cache/zsh/pacman ]]; then - local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)" - if (( zshcache_time < paccache_time )); then - rehash - zshcache_time="$paccache_time" - fi - fi -} -add-zsh-hook -Uz precmd rehash_precmd - -# prompt -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 -parse_git_remote() { - b="$(git branch -v 2> /dev/null | grep "^*" | sed 's/.\+\[\([^ ]\+\).*$/\1/')" - if [ "$b" = "behind" ] - then - echo -n "↓ " - elif [ "$b" = "ahead" ] - then - echo -n "↑ " - fi -} -parse_git_branch() { - git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null -} -parse_git_status() { - git status --short 2> /dev/null | head -n1 | awk '{print $1 " "}' -} - -# Options -setopt correct -setopt nonomatch -setopt autocd -setopt completeinword -setopt extendedglob -setopt histignorealldups -setopt histreduceblanks -setopt interactivecomments -setopt notify -setopt cdablevars diff --git a/config/home/.zshenv b/config/home/.zshenv index 00aab62..d9b3157 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -41,9 +41,6 @@ export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export PASSWORD_STORE_CLIP_TIME=5 - -source "$ZDOTDIR"/zshrc - # old # export RANGER_LOAD_DEFAULT_RC=FALSE # export VIMINIT="source ~/.config/vim/vimrc" -- cgit v1.2.3 From 604692c73c31d3ff3c0057b70a106e97490eea90 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 12:16:07 +0100 Subject: added fzps alias --- config/essentials/zsh/aliases.zsh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index f532a5f..f13d3bb 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -116,6 +116,12 @@ alias -g cfdef='$EDITOR config.def.h' alias -g ff='`fzffile`' alias -g fd='`fzfdir`' alias -g fdf='`fzfdirfile`' +alias fzps='ps aux | tail +2 | fzf --bind \ +"1:execute(echo -n {} | awk '\''{print \$1}'\'' | xclip -sel c -r),\ +2:execute(echo -n {} | awk '\''{print \$2}'\'' | xclip -sel c -r),\ +3:execute(echo -n {} | awk '\''{print \$7}'\'' | xclip -sel c -r),\ +4:execute(echo -n {} | awk '\''{print \$9}'\'' | xclip -sel c -r),\ +5:execute(echo -n {} | tr -s '\'' '\'' | cut -f 11- -d '\'' '\'' | xclip -sel c -r)"' alias -s conf="$EDITOR" alias -s txt="$EDITOR" -- cgit v1.2.3 From 7fc4c4cb57ebea10ad276f8c9578ecadcb7348e2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 14:36:52 +0100 Subject: edited nvim keybinds --- config/essentials/nvim/lua/tlast/remap.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 09589c4..56316f5 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -1,5 +1,5 @@ vim.g.mapleader = " " -vim.g.localleader = "\\" +vim.g.maplocalleader = "\\" vim.keymap.set("n", "-", vim.cmd.Ex) @@ -8,12 +8,6 @@ vim.keymap.set("i", "", "I") vim.keymap.set("i", "", "A") vim.keymap.set("i", "", "D") --- -- add closing -vim.keymap.set("i", '"', '""') --- vim.keymap.set("i", "'", "''") --- vim.keymap.set("i", "(", "()") --- vim.keymap.set("i", "[", "[]") --- vim.keymap.set("i", "{", "{}") vim.keymap.set("i", "{", "{}O") vim.keymap.set("i", "{;", "{};O") -- cgit v1.2.3 From da57f48abb29a572782e4274a75f76284c20b421 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 22:36:53 +0100 Subject: updated ytclipo to vids directory --- config/essentials/zsh/aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index f13d3bb..1d3a54b 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -87,7 +87,7 @@ alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i' alias whatsmyip='curl "ifconfig.me"' alias icognito='unset HISTFILE' alias penv='python -m venv' -alias ytclipo='yt-dlp "$(xclip -sel c -o)" -f "b" -S "res:720" -P $HOME/movies -o "%(title)s.%(ext)s"' +alias ytclipo='yt-dlp "$(xclip -sel c -o)" -f "b" -S "res:720" -P $HOME/vids -o "%(title)s.%(ext)s"' alias -g '...'='../..' alias -g '....'='../../..' -- cgit v1.2.3 From 37da47f677c280d80c5959896ce16e826dae9c89 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 22:37:26 +0100 Subject: updated zsh files to ZDOTDIT/ --- config/essentials/zsh/aliases.zsh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 1d3a54b..493248d 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -99,13 +99,13 @@ alias -g pi='ping archlinux.org -c4' alias -g sba='source bin/activate' alias -g smc='systemctl' alias -g smcu='systemctl --user' -alias zsr='source ~/.zshrc && rehash' +alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash' alias -g wf='doas wipefs -a' alias -g dmci="doas make clean install" # quick config -alias -g ez='$EDITOR ~/.zshrc' -alias -g eza='$EDITOR ~/.config/zsh/aliases.zsh' +alias -g ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc' +alias -g eza='$EDITOR ${ZDOTDIR}/aliases.zsh' alias -g eto='$EDITOR ~/sync/TODO' alias -g edw='$EDITOR ~/src/dwm/config.def.h' alias -g edm='$EDITOR ~/src/dmenu/config.def.h' -- cgit v1.2.3 From 39e2b6d33070e09b3c50fe39bcd9dd326998a85c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 22:38:33 +0100 Subject: added ** to path option for neovim to find files --- config/essentials/nvim/lua/tlast/set.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/tlast/set.lua index a89e2e3..b9a12f0 100644 --- a/config/essentials/nvim/lua/tlast/set.lua +++ b/config/essentials/nvim/lua/tlast/set.lua @@ -10,6 +10,8 @@ vim.opt.showcmd = true vim.opt.cursorline = true vim.opt.ruler = true +vim.opt.path:append("**") + vim.opt.wildmenu = true vim.opt.incsearch = true vim.opt.hlsearch = false -- cgit v1.2.3 From 55aaddc6ca3a4056f92de86f29a04baaaef183ca Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 22:39:11 +0100 Subject: remoade source keymap --- config/essentials/nvim/lua/tlast/remap.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 56316f5..7c3088c 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -67,7 +67,10 @@ vim.keymap.set("n", "rl", [[:s/\<\>//gIw", "write") vim.keymap.set("n", "W", "write!") vim.keymap.set("n", "e", "edit") -vim.keymap.set("n", "", "source") +vim.keymap.set("n", "s", function () + vim.cmd.source() + print("sourced.") +end) -- Packer vim.keymap.set("n", "P", "PackerSync") -- cgit v1.2.3 From 8d73085ec9575fb00b14956be8ae66081e98e714 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Thu, 9 Mar 2023 22:52:50 +0100 Subject: changed ytclipo alias to a script --- bin/common/ytclipo | 17 +++++++++++++++++ config/essentials/zsh/aliases.zsh | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 bin/common/ytclipo (limited to 'config/essentials') diff --git a/bin/common/ytclipo b/bin/common/ytclipo new file mode 100755 index 0000000..ee5bf0f --- /dev/null +++ b/bin/common/ytclipo @@ -0,0 +1,17 @@ +#!/bin/sh + +# argument ($1) -> clipboard -> stdin +test -z "${inp:=${1:-"$(xclip -sel c -o)"}}" \ + && inp="$(cat /dev/stdin)" + +echo "inp: ${inp}" 1>&2 +# take last link from clipboard +# works when link is from yt-local +inp="$(echo -n "$inp" | awk -F 'https?://' '{print $NF}')" +echo "inp: ${inp}" 1>&2 + +yt-dlp "$inp" \ + -f "b" \ + -S "res:720" \ + -P "$HOME/vids" \ + -o "%(title)s.%(ext)s" diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 493248d..411ae73 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -87,7 +87,6 @@ alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i' alias whatsmyip='curl "ifconfig.me"' alias icognito='unset HISTFILE' alias penv='python -m venv' -alias ytclipo='yt-dlp "$(xclip -sel c -o)" -f "b" -S "res:720" -P $HOME/vids -o "%(title)s.%(ext)s"' alias -g '...'='../..' alias -g '....'='../../..' -- cgit v1.2.3 From d9e412cb45695a32eb7e89973e86f91f0ee60e16 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Mar 2023 00:06:01 +0100 Subject: cleaned up keybinds --- config/essentials/nvim/lua/tlast/remap.lua | 74 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 38 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 7c3088c..4ff789b 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -1,42 +1,43 @@ vim.g.mapleader = " " vim.g.maplocalleader = "\\" -vim.keymap.set("n", "-", vim.cmd.Ex) +-- -- vinegar is already doing this +-- vim.keymap.set("n", "-", vim.cmd.Ex) -- moving -vim.keymap.set("i", "", "I") -vim.keymap.set("i", "", "A") -vim.keymap.set("i", "", "D") +vim.keymap.set("i", "", "I", { noremap = true }) +vim.keymap.set("i", "", "A", { noremap = true }) +vim.keymap.set("i", "", "D", { noremap = true }) -vim.keymap.set("i", "{", "{}O") -vim.keymap.set("i", "{;", "{};O") +vim.keymap.set("i", "{", "{}O", { noremap = true }) +vim.keymap.set("i", "{;", "{};O", { noremap = true }) -- buffers -vim.keymap.set("n", "gb", "buffers:buffer") -vim.keymap.set("n", "q", "q!") -vim.keymap.set("n", "Q", "qa!") +vim.keymap.set("n", "gb", "buffers:buffer", { noremap = true }) +vim.keymap.set("n", "q", "q!", { noremap = true }) +vim.keymap.set("n", "Q", "qa!", { noremap = true }) -- Windows -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "h") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "j") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "k") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "l") -vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "o") +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "h", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "j", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "k", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "l", { noremap = true }) +vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "", "o", { noremap = true }) -- command line -vim.keymap.set("c", "", "") -vim.keymap.set("c", "", "") -vim.keymap.set("c", "", "") +vim.keymap.set("c", "", "", { noremap = true }) +vim.keymap.set("c", "", "", { noremap = true }) +vim.keymap.set("c", "", "", { noremap = true }) -- move visual selection up/down wards -vim.keymap.set("v", "J", "m '>+1gv=gv") -vim.keymap.set("v", "K", "m '<-2gv=gv") +vim.keymap.set("v", "J", "m '>+1gv=gv", { noremap = true }) +vim.keymap.set("v", "K", "m '<-2gv=gv", { noremap = true }) -- clipboard -vim.keymap.set("n", "y", "\"+y") -vim.keymap.set("n", "o", "OSCYank") +vim.keymap.set("n", "y", "\"+y", { noremap = true }) +vim.keymap.set("n", "o", "OSCYank", { noremap = true }) -- templates -vim.keymap.set("n", "rt", ":r " .. vim.fn.stdpath("config") .. "/templates/") +vim.keymap.set("n", "rt", ":-1r " .. vim.fn.stdpath("config") .. "/templates", { noremap = true }) -- hide all local s = {hidden_all = 0} @@ -53,40 +54,37 @@ vim.keymap.set("n", "", function () end) -- utils -vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA") +vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA", { noremap = true }) -- ordered list -vim.keymap.set("v", "n", "I0. gvg") -vim.keymap.set("v", "u", "'<,'>s/^[0-9]\\+\\. //") +vim.keymap.set("v", "n", "I0. gvg", { noremap = true }) +vim.keymap.set("v", "u", "'<,'>s/^[0-9]\\+\\. //", { noremap = true }) -- scripts -vim.keymap.set("n", "x", "!chmod +x %", { silent = true}) +vim.keymap.set("n", "x", "!chmod +x %", { noremap = true, silent = true}) -- replace -vim.keymap.set("n", "rf", [[:%s/\<\>//gI]]) -vim.keymap.set("n", "rl", [[:s/\<\>//gI]]) +vim.keymap.set("n", "sf", [[:%s/\<\>//gI]]) +vim.keymap.set("n", "sl", [[:s/\<\>//gI]]) -- write -vim.keymap.set("n", "w", "write") -vim.keymap.set("n", "W", "write!") -vim.keymap.set("n", "e", "edit") +vim.keymap.set("n", "w", "write", { noremap = true }) +vim.keymap.set("n", "W", "write!", { noremap = true }) +vim.keymap.set("n", "e", "edit", { noremap = true }) vim.keymap.set("n", "s", function () vim.cmd.source() print("sourced.") end) -- Packer -vim.keymap.set("n", "P", "PackerSync") +vim.keymap.set("n", "P", "PackerSync", { noremap = true }) -- spelling -vim.keymap.set("n", "", "setlocal spell!") +vim.keymap.set("n", "", "setlocal spell!", { noremap = true }) -- open terminal in file's parent director -- this needs to be asynchrous vim.keymap.set("n", "", function () local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st" - vim.fn.jobstart(cmd, { - on_exit = function(job_id, exit_code, event_type) - -- Do nothing here - end - }) + -- asynchrous go brr + vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end }) end) -- cgit v1.2.3 From 49dd890eeb0572f3f7f0d078507a53073d1275ae Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Mar 2023 01:47:55 +0100 Subject: added go to dotfiles dir alias and fixed others --- config/essentials/zsh/aliases.zsh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 411ae73..79de6a1 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -111,10 +111,11 @@ alias -g edm='$EDITOR ~/src/dmenu/config.def.h' alias -g est='$EDITOR ~/src/st/config.def.h' alias -g esl='$EDITOR ~/src/slock/config.def.h' alias -g cfdef='$EDITOR config.def.h' +alias -g cdo='$HOME/src/dotfiles' -alias -g ff='`fzffile`' -alias -g fd='`fzfdir`' -alias -g fdf='`fzfdirfile`' +alias -g ff='"`fzffile`"' +alias -g fd='"`fzfdir`"' +alias -g fdf='"`fzfdirfile`"' alias fzps='ps aux | tail +2 | fzf --bind \ "1:execute(echo -n {} | awk '\''{print \$1}'\'' | xclip -sel c -r),\ 2:execute(echo -n {} | awk '\''{print \$2}'\'' | xclip -sel c -r),\ -- cgit v1.2.3 From e7e1a3e08b4497c695cfce14743579d94123c8ca Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Mar 2023 15:12:05 +0100 Subject: added luasnip config! --- config/essentials/nvim/after/plugin/luasnip.lua | 104 ++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 config/essentials/nvim/after/plugin/luasnip.lua (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua new file mode 100644 index 0000000..bfedfcc --- /dev/null +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -0,0 +1,104 @@ +local ls = require("luasnip") +local s = ls.snippet +local sn = ls.snippet_node +local isn = ls.indent_snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node +local r = ls.restore_node +local events = require("luasnip.util.events") +local ai = require("luasnip.nodes.absolute_indexer") +local extras = require("luasnip.extras") +local l = extras.lambda +local rep = extras.rep +local p = extras.partial +local m = extras.match +local n = extras.nonempty +local dl = extras.dynamic_lambda +local fmt = require("luasnip.extras.fmt").fmt +local fmta = require("luasnip.extras.fmt").fmta +local conds = require("luasnip.extras.expand_conditions") +local postfix = require("luasnip.extras.postfix").postfix +local types = require("luasnip.util.types") +local parse = require("luasnip.util.parser").parse_snippet + +-- keymaps +vim.keymap.set({"i", "s"}, "", "luasnip-expand-or-jump", { noremap = true }) +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.") +end, { noremap = true }) + + +local same = function(index) + return f(function (arg) + return arg[1] + end, { index }) +end + +ls.add_snippets("lua", { + -- print + s("pt", { + t("print(\""), + i(1, "Hello World!"), + t("\")"), i(0) + }), + -- local function + parse("lf", "local $1 = function($2)\n\t$3\nend$0", {}), + -- require + s("req", fmt("local {} = require('{}')", { i(1), rep(1) })), + parse("rq", "require('$1')$0", {}), + -- function + s("fn", fmt( + [[ + function {}({}) + {} + end + ]], + { i(1), i(2), i(3) } + ), i(0)), +}) + +ls.add_snippets("html", { + s("", { + t({"", "", "\t", "\t\t"}), + i(1, "title"), + t(""), i(2), + t({"", "\t", "\t", "\t\t

"}), + i(3, "Header"), + t("

"), i(4), + t({"", "\t", ""}), i(0) + }), +}) + +ls.add_snippets("java", { + s("gfn", fmt( + [[ + {}static void get_{} () {{ + return this.{}; + }} + ]], + { c(1, {t "", t "public ", t "private "}), i(2), rep(2) } + )), + s("fn", fmt( + [[ + {}static {} {} ({}) {{ + {} + return ({}); + }} + ]], + { + c(1, {t "", t "public ", t "private "}), + i(2, "type"), + i(3, "\"name\""), + i(4), i(5), + rep(2) + } + )) +}) + -- cgit v1.2.3 From dbde45cedec1e44d183c9507260ce93e23cd336d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Mar 2023 23:29:11 +0100 Subject: added more java snippets --- config/essentials/nvim/after/plugin/luasnip.lua | 68 +++++++++++++++++-------- 1 file changed, 46 insertions(+), 22 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index bfedfcc..e119f6f 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -77,28 +77,52 @@ ls.add_snippets("html", { }) ls.add_snippets("java", { - s("gfn", fmt( - [[ - {}static void get_{} () {{ - return this.{}; - }} - ]], - { c(1, {t "", t "public ", t "private "}), i(2), rep(2) } - )), + -- function s("fn", fmt( - [[ - {}static {} {} ({}) {{ - {} - return ({}); - }} - ]], - { - c(1, {t "", t "public ", t "private "}), - i(2, "type"), - i(3, "\"name\""), - i(4), i(5), - rep(2) - } - )) + [[ + {}static {} {} ({}) {{ + {} + }} + ]], + { + c(1, {t "", t "public ", t "private "}), + i(2, "type"), + i(3, "f"), + i(4), i(0) + })), + -- setter function + s("sfn", fmt( + [[ + {}void set_{} ({}) {{ + this.{} = {}; + }} + ]], + { c(1, {t "", t "public ", t "private "}), + i(2), rep(2), rep(2), rep(2) })), + -- getter function + s("gfn", fmt( + [[ + {}void get_{} () {{ + return this.{}; + }} + ]], + { c(1, {t "", t "public ", t "private "}), i(2), rep(2) })), + s("psv", fmt( + [[ + public class Main + {{ + public static void main (String[] args) + {{ + {} + }} + }} + ]], + { i(0) })), + s("pt", fmt( + [[ + System.out.{}("{}"); + {} + ]], + { c(1, {t "print", t "println", t "printf"}), i(2), i(0) })), }) -- cgit v1.2.3 From 39856c2282af61fef765f14d07a5b91b440e941d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 10 Mar 2023 23:29:21 +0100 Subject: added more lua snippets --- config/essentials/nvim/after/plugin/luasnip.lua | 4 +++- 1 file changed, 3 insertions(+), 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 e119f6f..88d8afe 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -51,8 +51,10 @@ ls.add_snippets("lua", { -- local function parse("lf", "local $1 = function($2)\n\t$3\nend$0", {}), -- require - s("req", fmt("local {} = require('{}')", { i(1), rep(1) })), + 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( [[ -- cgit v1.2.3 From b087ff299c8e749f6377c3963bdf26ff6526e0f1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Mar 2023 00:11:25 +0100 Subject: cleaned up snippets --- config/essentials/nvim/after/plugin/luasnip.lua | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 88d8afe..276854c 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -34,20 +34,9 @@ vim.keymap.set("n", "s", function() print("snippets reloaded.") end, { noremap = true }) - -local same = function(index) - return f(function (arg) - return arg[1] - end, { index }) -end - ls.add_snippets("lua", { -- print - s("pt", { - t("print(\""), - i(1, "Hello World!"), - t("\")"), i(0) - }), + s("pt", fmt([[print("{}")]], { i(1, "Hello World!") })), -- local function parse("lf", "local $1 = function($2)\n\t$3\nend$0", {}), -- require -- cgit v1.2.3 From afd843b48cceca0f879bf026b5523c481ccebcdc Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Mar 2023 12:09:47 +0100 Subject: added formatoptions and bash lsp --- config/common/newsboat/urls | 18 ++++---- config/essentials/nvim/ftplugin/all.lua | 1 + config/essentials/nvim/ftplugin/sh.lua | 1 + config/essentials/nvim/lua/tlast/cmp/bash.lua | 1 + config/essentials/nvim/lua/tlast/cmp/init.lua | 1 + config/essentials/nvim/lua/tlast/set.lua | 61 ++++++++++++++------------- 6 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 config/essentials/nvim/ftplugin/all.lua create mode 100644 config/essentials/nvim/lua/tlast/cmp/bash.lua (limited to 'config/essentials') diff --git a/config/common/newsboat/urls b/config/common/newsboat/urls index 743b55e..801d556 100644 --- a/config/common/newsboat/urls +++ b/config/common/newsboat/urls @@ -5,15 +5,15 @@ https://itsfoss.com/rss https://archlinux.org/feeds/news/ https://www.hln.be/home/rss.xml "---VIDEOS---" -https://www.youtube.com/feeds/videos.xml?channel_id=UCngn7SVujlvskHRvRKc1cTw -https://www.youtube.com/feeds/videos.xml?channel_id=UCVls1GmFKf6WlTraIb_IaJg -https://www.youtube.com/feeds/videos.xml?channel_id=UCsBjURrPoezykLs9EqgamOA -https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA -https://www.youtube.com/feeds/videos.xml?channel_id=UC7YOGHUfC1Tb6E4pudI9STA -https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw -https://www.youtube.com/feeds/videos.xml?channel_id=UCbTp1BYjpuhDRG5OmgIT8iw -https://www.youtube.com/feeds/videos.xml?channel_id=UC_ML5xP23TOWKUcc-oAE_Eg -https://www.youtube.com/feeds/videos.xml?channel_id=UCx-ljiKQcLSd8_4AFi_yaIw +https://www.youtube.com/feeds/videos.xml?channel_id=UCngn7SVujlvskHRvRKc1cTw # Bugswrite +https://www.youtube.com/feeds/videos.xml?channel_id=UCVls1GmFKf6WlTraIb_IaJg # Distrotube +https://www.youtube.com/feeds/videos.xml?channel_id=UCsBjURrPoezykLs9EqgamOA # Fireship +https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA # Luke Smith +https://www.youtube.com/feeds/videos.xml?channel_id=UC7YOGHUfC1Tb6E4pudI9STA # Mental Outlaw +https://www.youtube.com/feeds/videos.xml?channel_id=UC5UAwBUum7CPN5buc-_N1Fw # The Linux Experiment +https://www.youtube.com/feeds/videos.xml?channel_id=UCbTp1BYjpuhDRG5OmgIT8iw # James Tomsaino +https://www.youtube.com/feeds/videos.xml?channel_id=UC_ML5xP23TOWKUcc-oAE_Eg # Hussein Nasser +https://www.youtube.com/feeds/videos.xml?channel_id=UCd3dNckv1Za2coSaHGHl5aA # TJ De vries http://vimcasts.org/feeds/ogg.rss "---REDDIT---" https://www.reddit.com/r/linux.rss diff --git a/config/essentials/nvim/ftplugin/all.lua b/config/essentials/nvim/ftplugin/all.lua new file mode 100644 index 0000000..1608f4e --- /dev/null +++ b/config/essentials/nvim/ftplugin/all.lua @@ -0,0 +1 @@ +vim.cmd("set formatoptions=cqrnj") diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 3ebb1c9..4b66c75 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,2 +1,3 @@ vim.keymap.set("n", "t", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"setlocal nohls") vim.keymap.set("n", "i", "s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: ${\\2}\"setlocal nohls") +vim.opt.formatoptions = "cqrnj" diff --git a/config/essentials/nvim/lua/tlast/cmp/bash.lua b/config/essentials/nvim/lua/tlast/cmp/bash.lua new file mode 100644 index 0000000..91b6fba --- /dev/null +++ b/config/essentials/nvim/lua/tlast/cmp/bash.lua @@ -0,0 +1 @@ +require'lspconfig'.bashls.setup{} diff --git a/config/essentials/nvim/lua/tlast/cmp/init.lua b/config/essentials/nvim/lua/tlast/cmp/init.lua index d932138..a80856c 100644 --- a/config/essentials/nvim/lua/tlast/cmp/init.lua +++ b/config/essentials/nvim/lua/tlast/cmp/init.lua @@ -1,6 +1,7 @@ require("tlast.cmp.setup") require("tlast.cmp.arduino") +require("tlast.cmp.bash") require("tlast.cmp.clangd") require("tlast.cmp.html") require("tlast.cmp.css") diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/tlast/set.lua index b9a12f0..69ee4ae 100644 --- a/config/essentials/nvim/lua/tlast/set.lua +++ b/config/essentials/nvim/lua/tlast/set.lua @@ -1,40 +1,43 @@ -vim.opt.clipboard = "unnamed" +local opt = vim.opt -vim.opt.termguicolors = true +opt.clipboard = "unnamed" -vim.opt.number = true -vim.opt.relativenumber = true -vim.opt.showmatch = true -vim.opt.matchtime = 0 -vim.opt.showcmd = true -vim.opt.cursorline = true -vim.opt.ruler = true +opt.termguicolors = true -vim.opt.path:append("**") +opt.number = true +opt.relativenumber = true +opt.showmatch = true +opt.matchtime = 0 +opt.showcmd = true +opt.cursorline = true +opt.ruler = true -vim.opt.wildmenu = true -vim.opt.incsearch = true -vim.opt.hlsearch = false +opt.path:append("**") -vim.opt.mouse = "" +opt.wildmenu = true +opt.incsearch = true +opt.hlsearch = false -vim.opt.tabstop = 4 -vim.opt.shiftwidth = 4 -vim.opt.backspace = "indent,eol,start" +opt.mouse = "" -vim.opt.signcolumn = "yes" -vim.opt.updatetime = 100 -vim.opt.laststatus = 2 -vim.opt.history = 200 -vim.opt.encoding = "utf-8" +opt.tabstop = 4 +opt.shiftwidth = 4 +opt.backspace = "indent,eol,start" -vim.opt.smartindent = true -vim.opt.scrolloff = 8 +opt.signcolumn = "yes" +opt.updatetime = 100 +opt.laststatus = 2 +opt.history = 200 +opt.encoding = "utf-8" -vim.opt.ignorecase = true -vim.opt.smartcase = true +opt.smartindent = true +opt.scrolloff = 8 -vim.opt.swapfile = false -vim.opt.backup = false +opt.ignorecase = true +opt.smartcase = true -vim.opt.spelllang = "en_us,nl" +opt.swapfile = false +opt.backup = false + +opt.spelllang = "en_us,nl" +opt.formatoptions = "cqrnj" -- cgit v1.2.3 From 775ef96ee5f4bad6db681064924d7d047f1d438b Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Mar 2023 14:13:33 +0100 Subject: added more java snippets --- config/essentials/nvim/after/plugin/luasnip.lua | 71 ++++++++++++++++++------- 1 file changed, 51 insertions(+), 20 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 276854c..1a00e80 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -27,7 +27,7 @@ local parse = require("luasnip.util.parser").parse_snippet -- keymaps vim.keymap.set({"i", "s"}, "", "luasnip-expand-or-jump", { noremap = true }) vim.keymap.set({"i", "s"}, "", "luasnip-jump-prev", { noremap = true }) -vim.keymap.set({"i", "s"}, "", "luasnip-next-choice", { 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") @@ -49,10 +49,10 @@ ls.add_snippets("lua", { [[ function {}({}) {} - end + end{} ]], - { i(1), i(2), i(3) } - ), i(0)), + { i(1), i(2), i(3), i(0) })), + parse("sn", "s(\"$1\", fmt(\n[[\n$2\n]],\n{ $3 })),$0", {}), }) ls.add_snippets("html", { @@ -71,49 +71,80 @@ ls.add_snippets("java", { -- function s("fn", fmt( [[ - {}static {} {} ({}) {{ + {}{} {} ({}) {{ {} }} ]], { - c(1, {t "", t "public ", t "private "}), + c(1, {t "public ", t "private ", t ""}), i(2, "type"), i(3, "f"), i(4), i(0) })), + -- constructor + s("cst", fmt( + [[ + public {} ({}) {{ + {} + }}{} + ]], + { i(1), i(2), i(3), i(0) })), -- setter function s("sfn", fmt( [[ - {}void set_{} ({}) {{ + {}void set_{} ({} {}) {{ this.{} = {}; - }} + }}{} ]], - { c(1, {t "", t "public ", t "private "}), - i(2), rep(2), rep(2), rep(2) })), + { c(1, {t "public ", t "private ", t ""}), + i(2), i(3), rep(2), rep(2), rep(2), i(0) })), -- getter function s("gfn", fmt( [[ - {}void get_{} () {{ + {}{} get_{} () {{ return this.{}; - }} + }}{} ]], - { c(1, {t "", t "public ", t "private "}), i(2), rep(2) })), + { c(1, {t "public ", t "private ", t ""}), i(2, "type"), i(3), rep(3), i(0)})), s("psv", fmt( [[ - public class Main - {{ - public static void main (String[] args) - {{ + public class Main {{ + public static void main (String[] args) {{ {} }} }} ]], { i(0) })), - s("pt", fmt( + -- System.out.print + s("sout", fmt( + [[ + System.out.{}({});{} + ]], + { c(1, {t "println", t "print", t "printf"}), i(2), i(0)})), + -- constructor + s("class", fmt( [[ - System.out.{}("{}"); + {}class {} {{ + {} + }} + ]], + { c(1, {t "public ", t "private ", t ""}), i(2), i(0)})), + -- print variable + s("pti", fmt( + [[ + System.out.println("{} :" + {});{} + ]], + { i(1), rep(1), i(0) })), + -- quick + s("pr", t "private "), + s("ob", fmt( + [[ + {} {} = new {}({}); {} ]], - { c(1, {t "print", t "println", t "printf"}), i(2), i(0) })), + { i(1), i(2), rep(1), i(3), i(0) })), }) +ls.add_snippets("sh", { + parse("fn", "function $1 {\n\t$2\n}$0", {}) +}) -- cgit v1.2.3 From 3446a509e160006e150b2b32581236cb1ca177b0 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Mar 2023 14:30:38 +0100 Subject: added noremap to remap.lua --- config/essentials/nvim/lua/tlast/remap.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua index 4ff789b..c2d4c0b 100644 --- a/config/essentials/nvim/lua/tlast/remap.lua +++ b/config/essentials/nvim/lua/tlast/remap.lua @@ -51,7 +51,7 @@ vim.keymap.set("n", "", function () vim.opt.showcmd = opt vim.opt.laststatus = opt and 2 or 0 vim.opt.signcolumn = opt and "yes" or "no" -end) +end, { noremap = true }) -- utils vim.keymap.set("i", "r", "r!echo -n $RANDOMkJA", { noremap = true }) @@ -71,7 +71,7 @@ vim.keymap.set("n", "e", "edit", { noremap = true }) vim.keymap.set("n", "s", function () vim.cmd.source() print("sourced.") -end) +end, { noremap = true }) -- Packer vim.keymap.set("n", "P", "PackerSync", { noremap = true }) @@ -85,7 +85,7 @@ vim.keymap.set("n", "", function () local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st" -- asynchrous go brr vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end }) -end) +end, { noremap = true }) -- clear registers @@ -98,4 +98,4 @@ vim.keymap.set("n", "rc", function () for _, r in ipairs(regs) do vim.fn.setreg(r, {}) end -end) +end, { noremap = true }) -- cgit v1.2.3 From 004170a9d369b91e1d222ff92a0fe8e470d1b42c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 Mar 2023 14:32:52 +0100 Subject: added yet more java snippets --- config/essentials/nvim/after/plugin/luasnip.lua | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'config/essentials') diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 1a00e80..2e375e1 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -27,7 +27,7 @@ local parse = require("luasnip.util.parser").parse_snippet -- keymaps vim.keymap.set({"i", "s"}, "", "luasnip-expand-or-jump", { noremap = true }) vim.keymap.set({"i", "s"}, "", "luasnip-jump-prev", { noremap = true }) -vim.keymap.set({"i", "s"}, "", "luasnip-next-choice", { 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") @@ -115,12 +115,6 @@ ls.add_snippets("java", { }} ]], { i(0) })), - -- System.out.print - s("sout", fmt( - [[ - System.out.{}({});{} - ]], - { c(1, {t "println", t "print", t "printf"}), i(2), i(0)})), -- constructor s("class", fmt( [[ @@ -129,12 +123,10 @@ ls.add_snippets("java", { }} ]], { c(1, {t "public ", t "private ", t ""}), i(2), i(0)})), - -- print variable - s("pti", fmt( - [[ - System.out.println("{} :" + {});{} - ]], - { i(1), rep(1), i(0) })), + -- print + parse("pt", "System.out.println($1);$0", {}), + parse("pti", "System.out.println(\"$1: \" + $1);$0", {}), + parse("abs", "Math.abs($1);$0", {}), -- quick s("pr", t "private "), s("ob", fmt( -- cgit v1.2.3 From 21ebc25d535c49607d6f2c9f07ef9a06f8380a2a Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Mar 2023 15:10:03 +0100 Subject: readded telescope-symbols --- config/essentials/nvim/lua/tlast/packer.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials') diff --git a/config/essentials/nvim/lua/tlast/packer.lua b/config/essentials/nvim/lua/tlast/packer.lua index 2400ff9..931e7d4 100644 --- a/config/essentials/nvim/lua/tlast/packer.lua +++ b/config/essentials/nvim/lua/tlast/packer.lua @@ -6,6 +6,7 @@ return require('packer').startup(function(use) 'nvim-telescope/telescope.nvim', tag = '0.1.1', requires = { {'nvim-lua/plenary.nvim'} } } + use('nvim-telescope/telescope-symbols.nvim') use('theprimeagen/harpoon') -- colors -- cgit v1.2.3 From fab8d61418e2652881a56b586588f3373df5f971 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 12 Mar 2023 15:10:14 +0100 Subject: added l1 alias --- config/essentials/zsh/aliases.zsh | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials') diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 79de6a1..d9553e5 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -22,6 +22,7 @@ if [ -x /usr/bin/dircolors ]; then fi alias -g l='ls -l' +alias -g l1='ls -1' alias -g ll='ls -la' alias -g la='ls -aF' alias -g lst='ls --tree' -- cgit v1.2.3