Updates to fix dependencies
This commit is contained in:
@@ -2,82 +2,141 @@
|
|||||||
# In ~/.config/fish/configs/alias_useful.fish
|
# In ~/.config/fish/configs/alias_useful.fish
|
||||||
#
|
#
|
||||||
|
|
||||||
if test "$TERM" = "xterm-kitty"
|
################# STUFF YOU HAVE INSTALLED #####################################
|
||||||
alias icat='kitty +kitten icat'
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
alias fish_config='nano $HOME/.config/fish/config.fish' # Open the fish Config in Text editor
|
|
||||||
|
|
||||||
# Easier Ollama Commands
|
|
||||||
alias llama_start='ollama serve' # Start the LLama server
|
|
||||||
alias llama3='ollama run llama3' # Start the LLama Chat
|
|
||||||
|
|
||||||
alias force_delete='sudo rm -rf' # Delete Folder/Files with included Folder/Files
|
|
||||||
|
|
||||||
alias tasks='btop'
|
|
||||||
|
|
||||||
alias python='python3'
|
|
||||||
alias py='python3'
|
|
||||||
|
|
||||||
alias uni_play='mpv --vo=tct' # Plays a video in terminal with Unicode
|
|
||||||
alias asci_play='mpv --vo=caca' # Plays a video in terminal with ASCII
|
|
||||||
|
|
||||||
alias remount='sudo mount -a'
|
alias remount='sudo mount -a'
|
||||||
|
|
||||||
alias mount_config='sudo nano /etc/fstab'
|
alias mount_config='sudo nano /etc/fstab'
|
||||||
|
|
||||||
function mkvenv
|
alias force_delete='sudo rm -rf' # Delete Folder/Files with included Folder/Files
|
||||||
if test (count $argv) -lt 1
|
|
||||||
echo "Usage: mkvenv {folder name}"
|
|
||||||
return 1
|
|
||||||
end
|
|
||||||
python3 -m venv $argv[1]
|
|
||||||
source $argv[1]/bin/activate.fish
|
|
||||||
end
|
|
||||||
|
|
||||||
alias own='sudo chown -R "$USER":"$USER" themes'
|
alias own='sudo chown -R "$USER":"$USER" themes'
|
||||||
alias right='sudo chmod -R 755'
|
alias right='sudo chmod -R 755'
|
||||||
|
|
||||||
alias reload='clear && omf reload'
|
alias reload='clear && omf reload'
|
||||||
|
|
||||||
if test -e /usr/bin/eza; or test -e $HOME/.cargo/bin/eza
|
alias fish_config='nano $HOME/.config/fish/config.fish' # Open the fish Config in Text editor
|
||||||
# LS to eza Commands
|
|
||||||
alias ls 'eza -a --color=always --group-directories-first --icons' # preferred listing
|
|
||||||
alias lr 'eza -al --color=always --group-directories-first --icons' # all files and dirs
|
|
||||||
alias ll 'eza -l --color=always --group-directories-first --icons' # long format
|
|
||||||
alias lt 'eza -aT --color=always --group-directories-first --icons' # tree listing
|
|
||||||
alias l. 'eza -ald --color=always --group-directories-first --icons .*' # show only dotfiles
|
|
||||||
alias lf 'eza -aD --color=always --group-directories-first --icons' # show only folder
|
|
||||||
end
|
|
||||||
|
|
||||||
# Common use
|
|
||||||
alias .. 'cd ..'
|
|
||||||
alias ... 'cd ../..'
|
|
||||||
alias .... 'cd ../../..'
|
|
||||||
alias ..... 'cd ../../../..'
|
|
||||||
alias ...... 'cd ../../../../..'
|
|
||||||
|
|
||||||
if test -e /usr/bin/ugrep
|
|
||||||
alias grep 'ugrep --color=auto'
|
|
||||||
alias egrep 'ugrep -E --color=auto'
|
|
||||||
alias fgrep 'ugrep -F --color=auto'
|
|
||||||
end
|
|
||||||
|
|
||||||
alias ip 'ip -color'
|
alias ip 'ip -color'
|
||||||
|
|
||||||
alias psmem 'ps auxf | sort -nr -k 4'
|
alias psmem 'ps auxf | sort -nr -k 4'
|
||||||
alias psmem10 'ps auxf | sort -nr -k 4 | head -10'
|
alias psmem10 'ps auxf | sort -nr -k 4 | head -10'
|
||||||
|
|
||||||
alias tarnow 'tar -acf '
|
alias jctl 'journalctl -p 3 -xb'
|
||||||
alias untar 'tar -zxvf '
|
|
||||||
|
# Common use
|
||||||
|
alias ... 'cd ../..'
|
||||||
|
alias .... 'cd ../../..'
|
||||||
|
alias ..... 'cd ../../../..'
|
||||||
|
alias ...... 'cd ../../../../..'
|
||||||
|
|
||||||
alias dir 'dir --color=auto'
|
alias dir 'dir --color=auto'
|
||||||
alias vdir 'vdir --color=auto'
|
alias vdir 'vdir --color=auto'
|
||||||
|
|
||||||
alias wget 'wget -c '
|
alias tarnow 'tar -acf '
|
||||||
|
alias untar 'tar -zxvf '
|
||||||
|
|
||||||
alias jctl 'journalctl -p 3 -xb'
|
|
||||||
|
################# STUFF YOU MAY NOT HAVE #####################################
|
||||||
|
|
||||||
|
if test "$TERM" = "xterm-kitty"
|
||||||
|
alias icat='kitty +kitten icat'
|
||||||
|
end
|
||||||
|
|
||||||
|
if test -e /usr/bin/python3
|
||||||
|
alias python='python3'
|
||||||
|
alias py='python3'
|
||||||
|
end
|
||||||
|
|
||||||
|
# Easier Ollama Commands
|
||||||
|
if test -e /usr/bin/ollama
|
||||||
|
alias llama_start='ollama serve' # Start the LLama server
|
||||||
|
alias llama3='ollama run llama3' # Start the LLama Chat
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
if test -e /usr/bin/btop
|
||||||
|
alias tasks='btop'
|
||||||
|
end
|
||||||
|
|
||||||
|
if test -e /usr/bin/mpv
|
||||||
|
alias uni_play='mpv --vo=tct' # Plays a video in terminal with Unicode
|
||||||
|
alias asci_play='mpv --vo=caca' # Plays a video in terminal with ASCII
|
||||||
|
else
|
||||||
|
for cmd in uni_play asci_play
|
||||||
|
function $cmd
|
||||||
|
echo "You need to install mpv Inorder to use these commands: https://github.com/mpv-player/mpv"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function mkvenv
|
||||||
|
if not type -q python3
|
||||||
|
echo "Python3 is not installed. Please install Python3 to use mkvenv."
|
||||||
|
return 1
|
||||||
|
end
|
||||||
|
if not python3 -c "import venv" ^/dev/null
|
||||||
|
echo "Python3 'venv' module is not available. Please install it (e.g., 'python3-venv' on Debian/Ubuntu)."
|
||||||
|
return 1
|
||||||
|
end
|
||||||
|
if test (count $argv) -lt 1
|
||||||
|
echo "Usage: mkvenv {folder name}"
|
||||||
|
return 1
|
||||||
|
end
|
||||||
|
python3 -m venv $argv[1]
|
||||||
|
if test -f $argv[1]/bin/activate.fish
|
||||||
|
source $argv[1]/bin/activate.fish
|
||||||
|
else
|
||||||
|
echo "Error: Could not find activate.fish in $argv[1]/bin/"
|
||||||
|
return 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Check if eza exists in either location
|
||||||
|
if test -x /usr/bin/eza -o -x $HOME/.cargo/bin/eza
|
||||||
|
function ls
|
||||||
|
command eza -a --color=always --group-directories-first --icons $argv # Just more beautiful
|
||||||
|
end
|
||||||
|
function lr
|
||||||
|
command eza -al --color=always --group-directories-first --icons $argv # With rights and Owner
|
||||||
|
end
|
||||||
|
function ll
|
||||||
|
command eza -l --color=always --group-directories-first --icons $argv # Hidden Stuff is hidden
|
||||||
|
end
|
||||||
|
function lt
|
||||||
|
command eza -aT --color=always --group-directories-first --icons $argv # Tree View may take some time
|
||||||
|
end
|
||||||
|
function l.
|
||||||
|
command eza -ald --color=always --group-directories-first --icons .* $argv # Only Hidden Stuff
|
||||||
|
end
|
||||||
|
function lf
|
||||||
|
command eza -aD --color=always --group-directories-first --icons $argv # Only Folder
|
||||||
|
end
|
||||||
|
else
|
||||||
|
# Define dummy functions that remind user to install eza
|
||||||
|
for cmd in lr ll lt l. lf
|
||||||
|
function $cmd
|
||||||
|
echo "The command 'eza' is not installed. Please install 'eza' to use this: https://github.com/eza-community/eza"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if test -e /usr/bin/ugrep
|
||||||
|
alias grep 'ugrep --color=auto'
|
||||||
|
alias egrep 'ugrep -E --color=auto'
|
||||||
|
alias fgrep 'ugrep -F --color=auto'
|
||||||
|
else
|
||||||
|
for cmd in egrep fgrep
|
||||||
|
function $cmd
|
||||||
|
echo "The command 'ugrep' is not installed. Please install 'ugrep' to use this: https://github.com/Genivia/ugrep"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if test -e /usr/bin/wget
|
||||||
|
alias wget 'wget -c '
|
||||||
|
end
|
||||||
|
|
||||||
alias ocrmypdf 'ocrmypdf --deskew --clean --rotate-pages'
|
alias ocrmypdf 'ocrmypdf --deskew --clean --rotate-pages'
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,24 @@
|
|||||||
# Load pywal colors (extract from ~/.cache/wal/colors.json)
|
# Load pywal colors (extract from ~/.cache/wal/colors.json)
|
||||||
|
if test -e $HOME/.cache/wal/colors.json
|
||||||
set -g theme_0 (jq -r '.colors.color0' ~/.cache/wal/colors.json) # Primary color
|
set -g theme_0 (jq -r '.colors.color0' ~/.cache/wal/colors.json) # Primary color
|
||||||
set -g theme_1 (jq -r '.colors.color1' ~/.cache/wal/colors.json) # Secondary color (e.g., for git, @)
|
set -g theme_1 (jq -r '.colors.color1' ~/.cache/wal/colors.json) # Secondary color (e.g., for git, @)
|
||||||
set -g theme_2 (jq -r '.colors.color2' ~/.cache/wal/colors.json) # Third color (e.g., for hostname)
|
set -g theme_2 (jq -r '.colors.color2' ~/.cache/wal/colors.json) # Third color (e.g., for hostname)
|
||||||
set -g background_color (jq -r '.special.background' ~/.cache/wal/colors.json) # Background color
|
set -g background_color (jq -r '.special.background' ~/.cache/wal/colors.json) # Background color
|
||||||
set -g foreground_color (jq -r '.special.foreground' ~/.cache/wal/colors.json) # Foreground color
|
set -g foreground_color (jq -r '.special.foreground' ~/.cache/wal/colors.json) # Foreground color
|
||||||
|
else
|
||||||
|
set -g background_color "#1e1e2e" # Dark slate
|
||||||
|
set -g foreground_color "#cdd6f4" # Soft white/light gray
|
||||||
|
|
||||||
|
# Primary and accent colors
|
||||||
|
set -g theme_0 "#a6e3a1" # Green - success, directories
|
||||||
|
set -g theme_1 "#f38ba8" # Red - errors, git changes
|
||||||
|
set -g theme_2 "#89b4fa" # Blue - hostnames, info
|
||||||
|
|
||||||
|
# Extra accent colors
|
||||||
|
set -g theme_3 "#f9e2af" # Yellow - warnings
|
||||||
|
set -g theme_4 "#cba6f7" # Magenta - user prompts
|
||||||
|
set -g theme_5 "#94e2d5" # Cyan - secondary info
|
||||||
|
end
|
||||||
|
|
||||||
# BOBTHEFISH COLORING: Apply pywal colors to the bobthefish theme
|
# BOBTHEFISH COLORING: Apply pywal colors to the bobthefish theme
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,41 @@
|
|||||||
if test -e /path/to/file
|
if test -e /path/to/file
|
||||||
command/alias
|
command/alias
|
||||||
end
|
end
|
||||||
|
|
||||||
if test -e /path/to/file1; or test -e /path/to/file2
|
if test -e /path/to/file1; or test -e /path/to/file2
|
||||||
command/alias
|
command/alias
|
||||||
end
|
end
|
||||||
$HOME/.cargo/bin/eza
|
|
||||||
|
if test -x /usr/bin/eza -o -x $HOME/.cargo/bin/eza
|
||||||
|
# Define eza-based commands
|
||||||
|
function ls
|
||||||
|
command eza -a --color=always --group-directories-first --icons $argv
|
||||||
|
end
|
||||||
|
|
||||||
|
function lr
|
||||||
|
command eza -al --color=always --group-directories-first --icons $argv
|
||||||
|
end
|
||||||
|
|
||||||
|
function ll
|
||||||
|
command eza -l --color=always --group-directories-first --icons $argv
|
||||||
|
end
|
||||||
|
|
||||||
|
function lt
|
||||||
|
command eza -aT --color=always --group-directories-first --icons $argv
|
||||||
|
end
|
||||||
|
|
||||||
|
function l.
|
||||||
|
command eza -ald --color=always --group-directories-first --icons .* $argv
|
||||||
|
end
|
||||||
|
|
||||||
|
function lf
|
||||||
|
command eza -aD --color=always --group-directories-first --icons $argv
|
||||||
|
end
|
||||||
|
else
|
||||||
|
# Define dummy functions that remind user to install eza
|
||||||
|
for cmd in lr ll lt l. lf
|
||||||
|
function $cmd
|
||||||
|
echo "The command 'eza' is not installed. Please install 'eza' to use this: https://github.com/eza-community/eza"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Reference in New Issue
Block a user