summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/essentials/git/config4
-rw-r--r--config/essentials/shell/functions.sh21
-rw-r--r--config/essentials/starship.toml12
-rw-r--r--config/essentials/zsh/.gitignore3
-rw-r--r--config/home/.zshenv4
5 files changed, 35 insertions, 9 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config
index fcf80db..cb16983 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -10,3 +10,7 @@
rebase = false
[commit]
gpgsign = true
+[merge]
+ ff = false
+[alias]
+ change-commits = "!f() { VAR1=$1; VAR='$'$1; OLD=$2; NEW=$3; echo \"Are you sure for replace $VAR $OLD => $NEW ?(Y/N)\";read OK;if [ \"$OK\" = 'Y' ] ; then shift 3; git filter-branch --env-filter \"if [ \\\"${VAR}\\\" = '$OLD' ]; then export $VAR1='$NEW';echo 'to $NEW'; fi\" $@; fi;}; f "
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index 1fd6e92..1eca57c 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -343,3 +343,24 @@ fchange()
eval "$1"
done
}
+
+unhappy.exe() {
+ [ "$1" ] &&
+ smiles=("[: " ".-." " :]" "._.") ||
+ smiles=("]: " ".-." " :[" "._.")
+
+ while true
+ do
+ for s in $smiles
+ do
+ printf '\r%s' "$s"
+ sleep 1
+ done
+ done
+}
+
+ssh_port()
+{
+ ssh -f -N -L 0.0.0.0:"$3":localhost:"$1" "$2"
+ >&2 printf "Forwarded port '%s' on '%s' to '%s'.\n" "$1" "$2" "$3"
+}
diff --git a/config/essentials/starship.toml b/config/essentials/starship.toml
index 15139f5..efcaf48 100644
--- a/config/essentials/starship.toml
+++ b/config/essentials/starship.toml
@@ -3,7 +3,7 @@
# Inserts a blank line between shell prompts
add_newline = false
# format = ' ${custom.upds}'
-format = ' [\[$username@$hostname\]](bg:#000000) ${custom.upds}$all'
+format = ' [\[$username@$hostname\]](bg:#000000) $all'
right_format = """$status"""
[character]
@@ -32,8 +32,8 @@ min_time = 500
format = '($status)'
disabled = false
-[custom.upds]
-command = 'cat ~/.cache/updates' # shows output of command
-when = '[ "$(cat ~/.cache/updates)" -gt 0 ]'
-symbol = '📦'
-format = '$output$symbol '
+# [custom.upds]
+# command = 'cat ~/.cache/updates' # shows output of command
+# when = '[ "$(cat ~/.cache/updates)" -gt 0 ]'
+# symbol = '📦'
+# format = '$output$symbol '
diff --git a/config/essentials/zsh/.gitignore b/config/essentials/zsh/.gitignore
index b717a37..a13c79f 100644
--- a/config/essentials/zsh/.gitignore
+++ b/config/essentials/zsh/.gitignore
@@ -1,2 +1,3 @@
histfile
-zcompcache \ No newline at end of file
+zcompcache
+.zcompdump
diff --git a/config/home/.zshenv b/config/home/.zshenv
index f480c51..1af14cf 100644
--- a/config/home/.zshenv
+++ b/config/home/.zshenv
@@ -2,7 +2,7 @@
export EDITOR="nvim"
export VISUAL="nvim"
-export BROWSER="librewolf"
+export BROWSER="surf"
export VIEWER="zathura"
export PLAYER="mpv"
@@ -78,7 +78,7 @@ export FZF_DEFAULT_OPTS=$FZF_DEFAULT_OPTS'
--color=info:#b48ead,prompt:#bf6069,pointer:#b48dac
--color=marker:#a3be8b,spinner:#ebcb8b,header:#a3be8b'
-export LESS="-j 4 -i -r"
+export LESS="-i -r"
# Colored manpages
export MANPAGER="less -R --use-color -Dd+r -Du+b"