From 305c8e8ff1fc4a76fb42151105e119e8266df57c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 18 Jun 2023 23:04:08 +0200 Subject: don't log on error --- config/essentials/zsh/.zshrc | 2 +- config/essentials/zsh/aliases.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index b2cda54..96ec100 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -28,7 +28,7 @@ zle -N add-surround surround zle -N change-surround surround compinit -if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null +if grep -qi "debian\|ubuntu" /etc/os-release 2>/dev/null then sfiles=( /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 7113147..c7894e3 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -1,7 +1,7 @@ #!/bin/zsh # s/alias \([^-]\)/alias -g \1 -if grep -qi "debian\|ubuntu" /etc/os-release +if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null then alias aptup='apt update && apt upgrade -y' fi -- cgit v1.2.3 From 83b7b71f56a432ca4eebd40af25b1fab913c7fe2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 18 Jun 2023 23:57:14 +0200 Subject: use die where possible --- stowdots | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/stowdots b/stowdots index b133092..1c72f80 100755 --- a/stowdots +++ b/stowdots @@ -1,20 +1,28 @@ #!/bin/sh -trap "echo -ne '\nbye'; exit 1" EXIT +trap "echo -e '\nbye'; exit 1" EXIT + +die () { + echo "$@" 1>&2 +} if ! stow --version > /dev/null 2>&1 then - echo "E: stow not installed or not found" 1>&2 - exit 1 + die "stow not installed or not found." + die "install stow?" + die -n ">" + test "y" = "$(head -n 1)" && + doas pacman -Sy stow || + exit 1 fi if [ -n "${MACH:=$1}" ] then - echo "I: stowing for $MACH" + die "I: stowing for $MACH" else - echo "E: MACH not set" 1>&2 - echo "Enter valid value for 'MACH'" - echo "d(esktop) | s(erver) | l(aptop)" - echo -n ">" + die "E: MACH not set" >&2 + die "Enter valid value for 'MACH'" + die "d(esktop) | s(erver) | l(aptop)" + echo -n ">" >&2 read MACH fi @@ -34,6 +42,6 @@ case "$MACH" in stow -d config/ -t "$HOME/" -R home ;; *) - echo "E: invalid value for 'MACH'" 1>&2 + die "E: invalid value for 'MACH'" break esac -- cgit v1.2.3 From c291021f425170ab02fb5fec806dcaa684f58155 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 19 Jun 2023 00:01:03 +0200 Subject: added groff to disabled filetypes --- config/essentials/nvim/after/plugin/autoclose.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/essentials/nvim/after/plugin/autoclose.lua b/config/essentials/nvim/after/plugin/autoclose.lua index 9dffb8a..89078ef 100644 --- a/config/essentials/nvim/after/plugin/autoclose.lua +++ b/config/essentials/nvim/after/plugin/autoclose.lua @@ -14,7 +14,7 @@ require("autoclose").setup({ ["`"] = { escape = true, close = true, pair = "``"}, }, options = { - disabled_filetypes = { "text", "telekasten", "diff", "gitcommit", "fugitive" }, + disabled_filetypes = { "text", "telekasten", "groff", "diff", "gitcommit", "fugitive" }, disable_when_touch = true, }, }) -- cgit v1.2.3 From 71f5e1ebde95606fcadb9c741f29b9ef8a26ae3b Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 19 Jun 2023 00:01:20 +0200 Subject: fixed typo --- config/essentials/zsh/aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index 78d9067..d193ee7 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -53,7 +53,7 @@ alias lst3='ls --tree -L3' alias ls.='ls -dl .*' which exa >/dev/null 2>&1 && alias ls='exa --sort extension --group-directories-first' || - alias ls='ls --color --group-directories-fist --sort=extension' + alias ls='ls --color --group-directories-first --sort=extension' # pacman aliases alias pac='pacman' -- cgit v1.2.3