From f6b2e996ef42dad05689decfa169c08972fa14fb Mon Sep 17 00:00:00 2001
From: PieckA <admin@example.com>
Date: Sat, 25 May 2024 14:28:53 +0200
Subject: [PATCH] addet some functionality

---
 config.fish         | 95 ++++++++++++++++++++++++---------------------
 functions/tmux.fish |  2 +
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/config.fish b/config.fish
index 35a4e40..e2268fe 100644
--- a/config.fish
+++ b/config.fish
@@ -10,7 +10,6 @@ end
 # ╰───────────────────────────────────────────────────╯
 
 # ────────────────────────────────────────< sources >──────────────────────────────────────
-# source $HOME/.config/fish/functions/git.fish
 # source $HOME/.config/fish/functions/tmux.fish
 # source $HOME/.config/fish/functions/c_fisher.fish
 
@@ -31,31 +30,33 @@ upin
 # ─< colorized ls >─────────────────────────────────────────────────────────────────────────
 # ─< lsd >──────────────────────────────────────────────────────────────────────────────────
 if command -v lsd >/dev/null 2>&1
-    alias ls='lsd -l'
-    alias ll='lsd -lA'
-    alias tree='lsd --tree'
+    alias ls="lsd -l"
+    alias ll="lsd -lA"
+    alias tree="lsd --tree"
 else
 # ─< exa >──────────────────────────────────────────────────────────────────────────────────
 if command -v exa >/dev/null 2>&1
-    alias ls='exa --icons -l'
-    alias ll='exa --icons -laa'
-    alias tree='exa --icons -l -tree'
+    alias ls="exa --icons -l"
+    alias ll="exa --icons -laa"
+    alias tree="exa --icons -l -tree"
 else
 # ─< eza >──────────────────────────────────────────────────────────────────────────────────
 if command -v eza >/dev/null 2>&1
-    alias ls='eza --icons -l'
-    alias ll='eza --icons -laa'
-    alias tree='eza --icons -l -tree'
+    alias ls="eza --icons -l"
+    alias ll="eza --icons -laa"
+    alias tree="eza --icons -l -tree"
 else
 # ─< if nothing works -- plain old ls >─────────────────────────────────────────────────────
-    alias ls='ls --color=always -lph'
-    alias ll='ls --color=always -lAph'
+    alias ls="ls --color=always -lph"
+    alias ll="ls --color=always -lAph"
 end
 end
 end
 
 # ─< colored everything >───────────────────────────────────────────────────────────────────
 alias ip="ip --color=always"
+
+# ─< check for rg >─────────────────────────────────────────────────────────────────────────
 if command -v rg >/dev/null 2>&1
     alias grep="rg --color=always"
 else
@@ -63,24 +64,28 @@ else
 end
 
 # ─< weather >──────────────────────────────────────────────────────────────────────────────
-alias www='curl wttr.in/Ulm'
+alias www="curl wttr.in/Ulm"
 
 # ─< rsync >────────────────────────────────────────────────────────────────────────────────
 if command -v rsync >/dev/null 2>&1
-    alias cp='rsync -avP'
-    alias scp='rsync -avP'
+    alias cp="rsync -avP"
+    alias scp="rsync -avP"
 end
 
 # ─< bat alias >────────────────────────────────────────────────────────────────────────────
 if command -v batcat >/dev/null 2>&1
-    alias cat='batcat --color=always -p --paging=never'
-    alias less='bat --paging always --color=always'
+    alias cat="batcat --color=always -p --paging=never"
+    alias less="batcat --paging always --color=always"
+    alias gd="batcat --diff"
+    alias gda="batcat --diff *"
 end
 
 # ─< batcat alias >─────────────────────────────────────────────────────────────────────────
 if command -v bat >/dev/null 2>&1
-    alias cat='bat --color=always -p'
-    alias less='bat --paging always --color=always'
+    alias cat="bat --color=always -p"
+    alias less="bat --paging always --color=always"
+    alias gd="bat --diff"
+    alias gda="bat --diff *"
 end
 
 # ─< t stands for tmux >────────────────────────────────────────────────────────────────────
@@ -92,40 +97,40 @@ end
 
 # ─< d stands for docker >──────────────────────────────────────────────────────────────────
 if command -v docker >/dev/null 2>&1
-    alias up='docker compose up'
-    alias down='docker compose down'
-    alias pull='docker compose pull'
-    alias d='docker'
-    alias dr='docker run --rm -it'
-    alias ds='docker ps -a'
-    alias dc='docker compose'
-    alias appupdate='docker compose pull && docker compose up -d --force-recreate'
+    alias up="docker compose up"
+    alias down="docker compose down"
+    alias pull="docker compose pull"
+    alias d="docker"
+    alias dr="docker run --rm -it"
+    alias ds="docker ps -a"
+    alias dc="docker compose"
+    alias appupdate="docker compose pull && docker compose up -d --force-recreate"
 end
 
 # ─< g stands for git >─────────────────────────────────────────────────────────────────────
 if command -v git >/dev/null 2>&1
-    alias g='git'
-    alias gs='git status'
-    alias gf='git fetch'
-    alias gf='git fetch && git merge'
-    alias gc='git clone --recurse-submodule'
-    alias ga='git add'
-    alias gp='git pull --recurse-submodule'
-    alias gsu='git submodule foreach git pull && git add . && git commit -m "  updated 📌submodules" && echo "-- Committed changes, pushing now.." && sleep 1 && git push'
-    alias gcm='git commit -m'
-    alias gpu='git push --recurse-submodule=on-demand'
+    alias g="git"
+    alias gs="git status"
+    alias gf="git fetch"
+    alias gf="git fetch && git merge"
+    alias gc="git clone --recurse-submodule"
+    alias ga="git add"
+    alias gp="git pull --recurse-submodule"
+    alias gsu="git submodule foreach git pull && git add . && git commit -m "  updated 📌submodules" && echo "-- Committed changes, pushing now.." && sleep 1 && git push"
+    alias gcm="git commit -m"
+    alias gpu="git push --recurse-submodule=on-demand"
 end
 
 # ─< fastfetch >────────────────────────────────────────────────────────────────────────────
 if command -v fastfetch >/dev/null 2>&1
-    alias ff='fastfetch'
-    alias clearff='command clear & fastfetch'
+    alias ff="fastfetch"
+    alias clearff="command clear & fastfetch"
 # ─< check for fastfetch module-existance >─────────────────────────────────────────────────
     command fastfetch --config os >/dev/null 2>&1
 # ─< check the status >─────────────────────────────────────────────────────────────────────
 	switch $status
 	case 0
-	alias f='fastfetch --config os'
+	alias f="fastfetch --config os"
 # ─< unsuccessfull, cloning repo >──────────────────────────────────────────────────────────
 	case '*'
 	git clone https://git.k4li.de/mirror/fastfetch $HOME/.local/share/fastfetch >/dev/null 2>&1
@@ -133,15 +138,15 @@ if command -v fastfetch >/dev/null 2>&1
 	exec fish
 	end
     clear & f
-    alias clear='clear & f'
+    alias clear="clear & f"
 end
 
 # ─< set nmap-alias >───────────────────────────────────────────────────────────────────────
 if command -v nmap >/dev/null 2>&1
-	alias scanvuln='sudo nmap --script vuln -vvv'
-	alias sv='scanvuln'
-	alias portscan='sudo nmap -sT'
-	alias ps='portscan'
+	alias scanvuln="sudo nmap --script vuln -vvv"
+	alias sv="scanvuln"
+	alias portscan="sudo nmap -sT"
+	alias ps="portscan"
 end
 
 # ────────────────────────────────────────< functions >─────────────────────────────────────
diff --git a/functions/tmux.fish b/functions/tmux.fish
index b557960..b3dd9d5 100644
--- a/functions/tmux.fish
+++ b/functions/tmux.fish
@@ -1,3 +1,4 @@
+if command -v tmux >/dev/null 2>&1
 function ta
   if command tmux list-sessions >/dev/null 2>&1
     echo "Tmux session found. Entering it now! --"
@@ -8,3 +9,4 @@ function ta
     tmux
   end
 end
+end