bash/fish: update aliases

all ls-type aliases for eza use different settings
if launched from X/Wayland or TTY

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 0448e6a8b5c165dee502846e36f64cf900465467..9795b1f4f907110838e7425792042aad42cb3c3a 100644 (file)
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,7 +1,8 @@
 if status is-interactive
     # Commands to run in interactive sessions can go here
     #
-    #cat ~/.config/banner.asc
+    #cat ~/dotfiles/banner.asc
+    source ~/.config/fish/functions/eza-aliases.fish
     fastfetch
     set -g fish_greeting
 end

diff --git a/config/fish/fish_variables b/config/fish/fish_variables
index bc3f42285fe1077e481d6bd9fdf6678e5fb2a498..c837b09fe475a4f89819397ae30493a0def15d54 100644 (file)
--- a/config/fish/fish_variables
+++ b/config/fish/fish_variables
@@ -7,6 +7,19 @@ SETUVAR --export PAGER:less
 SETUVAR --export VDPAU_DRIVER:radeonsi
 SETUVAR --export VISUAL:kks\x20edit
 SETUVAR __fish_initialized:3400
+SETUVAR _fish_abbr_cheatsheet:cat\x20/home/andy/\x2econfig/banner\x2easc
+SETUVAR _fish_abbr_df:/usr/bin/df\x20\x2dh\x20\x2d\x2doutput\x3dtarget\x2cfstype\x2cused\x2cavail\x2cpcent\x2csource\x20\x7c\x20sort\x20\x2dn
+SETUVAR _fish_abbr_free:free\x20\x2d\x2dgiga\x20\x2dh\x20\x2dw
+SETUVAR _fish_abbr_gco:git\x20checkout
+SETUVAR _fish_abbr_gcp:git\x20cherry\x2dpick
+SETUVAR _fish_abbr_glo:git\x20log\x20\x2d\x2doneline
+SETUVAR _fish_abbr_grep:grep\x20\x2di\x20\x2d\x2dcolor\x3dauto
+SETUVAR _fish_abbr_gst:git\x20status
+SETUVAR _fish_abbr_hc:hyperctl
+SETUVAR _fish_abbr_hcc:hyperctl\x20clients
+SETUVAR _fish_abbr_lf:lfrun
+SETUVAR _fish_abbr_lsblk:lsblk\x20\x2do\x20name\x2csize\x2cpartuuid\x2cfstype\x2cmountpoints\x2clabel
+SETUVAR _fish_abbr_zdiff:zdiff\x20\x2d\x2dcolor\x3dauto
 SETUVAR fish_color_autosuggestion:777777
 SETUVAR fish_color_cancel:\x2d\x2dreverse
 SETUVAR fish_color_command:ffffff

diff --git a/config/fish/functions/df.fish b/config/fish/functions/df.fish
deleted file mode 100644 (file)
index 8a46d4a..0000000
--- a/config/fish/functions/df.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function df --wraps='/bin/df -h | tail -n +2 |  sort -n' --wraps='/bin/df -ah | tail -n +2 |  sort -n' --wraps='/bin/df -ahk | tail -n +2 |  sort -n' --description 'alias df /bin/df -h | tail -n +2 |  sort -n'
-  /bin/df -h | tail -n +2 |  sort -n $argv; 
-end

diff --git a/config/fish/functions/eza-aliases.fish b/config/fish/functions/eza-aliases.fish
new file mode 100644 (file)
index 0000000..378232d
--- /dev/null
+++ b/config/fish/functions/eza-aliases.fish
@@ -0,0 +1,54 @@
+#!/bin/fish
+function l1 --wraps='eza' --description='alias eza'
+    switch $(tty)
+        case /dev/tty**
+            EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first -1 $argv
+        case /dev/pts/**
+            EZA_GRID_ROWS=13 eza -w 0 --group --group-directories-first -1 $argv
+    end
+end
+
+function la --wraps='eza' --description='alias eza'
+    switch $(tty)
+        case /dev/tty**
+            EZA_GRID_ROWS=13 eza -w 220 --group --long --grid --group-directories-first -l -a $argv
+        case /dev/pts/**
+            EZA_GRID_ROWS=13 eza -w 0 --group --long --grid --group-directories-first -l -a $argv
+    end
+end
+
+function lg --wraps='eza' --description='alias eza'
+    switch $(tty)
+        case /dev/tty**
+            EZA_GRID_ROWS=13 eza -w 220 --group --long --grid --group-directories-first $argv
+        case /dev/pts/**
+            EZA_GRID_ROWS=13 eza -w 0 --group --long --grid --group-directories-first $argv
+    end
+end
+
+function ll --wraps='eza' --description='alias eza'
+    switch $(tty)
+        case /dev/tty**
+            EZA_GRID_ROWS=26 eza -w 220 --group --long --grid --group-directories-first $argv
+        case /dev/pts/**
+            EZA_GRID_ROWS=26 eza -w 0 --group --long --grid --group-directories-first $argv
+    end
+end
+
+function ls --wraps='eza' --description='alias eza'
+    switch $(tty)
+        case /dev/tty**
+            EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first --icons $argv
+        case /dev/pts/**
+            EZA_GRID_ROWS=13 eza -w 0 --group --group-directories-first --icons $argv
+    end
+end
+
+function lt --wraps='eza' --description='alias eza'
+    switch $(tty)
+        case /dev/tty**
+            EZA_GRID_ROWS=13 eza -w 220 --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso $argv
+        case /dev/pts/**
+            EZA_GRID_ROWS=13 eza -w 0 --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso $argv
+    end
+end

diff --git a/config/fish/functions/free.fish b/config/fish/functions/free.fish
deleted file mode 100644 (file)
index 1588642..0000000
--- a/config/fish/functions/free.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function free --wraps='/usr/bin/free --giga -h -w' --wraps='/usr/bin/free -h' --description 'alias free=free -wth --si'
- command free -wth --si $argv; 
-end

diff --git a/config/fish/functions/gco.fish b/config/fish/functions/gco.fish
deleted file mode 100644 (file)
index a484368..0000000
--- a/config/fish/functions/gco.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gco --wraps='git checkout' --description 'alias gco=git checkout'
-  git checkout $argv; 
-end

diff --git a/config/fish/functions/gcp.fish b/config/fish/functions/gcp.fish
deleted file mode 100644 (file)
index 907c340..0000000
--- a/config/fish/functions/gcp.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gcp --wraps='git cherry-pick' --description 'alias gcp=git cherry-pick'
-  git cherry-pick $argv; 
-end

diff --git a/config/fish/functions/gg.fish b/config/fish/functions/gg.fish
deleted file mode 100644 (file)
index 2422554..0000000
--- a/config/fish/functions/gg.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gg --wraps='cd /home/andy/dotfiles' --description 'alias gg=cd /home/andy/dotfiles'
-  cd /home/andy/dotfiles $argv; 
-end

diff --git a/config/fish/functions/glo.fish b/config/fish/functions/glo.fish
deleted file mode 100644 (file)
index 5d60fd5..0000000
--- a/config/fish/functions/glo.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function glo --wraps='git log --oneline' --description 'alias gcp=git log --oneline'
-  git log --oneline $argv; 
-end

diff --git a/config/fish/functions/grep.fish b/config/fish/functions/grep.fish
deleted file mode 100644 (file)
index 65baf8e..0000000
--- a/config/fish/functions/grep.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function grep --description 'alias grep=grep -i --color=auto'
- command grep -i --color=auto $argv; 
-end

diff --git a/config/fish/functions/gst.fish b/config/fish/functions/gst.fish
deleted file mode 100644 (file)
index 0555d05..0000000
--- a/config/fish/functions/gst.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function gst --wraps='git status' --description 'alias gst=git status'
-  git status $argv; 
-end

diff --git a/config/fish/functions/hc.fish b/config/fish/functions/hc.fish
deleted file mode 100644 (file)
index cfbfd46..0000000
--- a/config/fish/functions/hc.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function hc --wraps='hyprctl clients' --description 'alias hc=hyprctl clients'
-  hyprctl clients $argv; 
-end

diff --git a/config/fish/functions/l1.fish b/config/fish/functions/l1.fish
deleted file mode 100644 (file)
index 2b512a0..0000000
--- a/config/fish/functions/l1.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function l1 --description 'list files bare'
-   exa -1 --icons --group --time-style=iso --group-directories-first $argv;
-end

diff --git a/config/fish/functions/la.fish b/config/fish/functions/la.fish
deleted file mode 100644 (file)
index e3d3f06..0000000
--- a/config/fish/functions/la.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function la --description 'list standard incl. hidden'
-   ls -a $argv;
-end

diff --git a/config/fish/functions/lf.fish b/config/fish/functions/lf.fish
deleted file mode 100644 (file)
index 9b2e4b4..0000000
--- a/config/fish/functions/lf.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function lf --wraps=lfrun --description 'alias lf=lfrun'
-  lfrun $argv; 
-end

diff --git a/config/fish/functions/lg.fish b/config/fish/functions/lg.fish
deleted file mode 100644 (file)
index 705c12e..0000000
--- a/config/fish/functions/lg.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function lg --description 'list files sorted by size'
-  exa --icons --group --long --sort=size -t=mod --time-style=iso --group-directories-first $argv;
-end

diff --git a/config/fish/functions/lgo.fish b/config/fish/functions/lgo.fish
deleted file mode 100644 (file)
index c8bf2aa..0000000
--- a/config/fish/functions/lgo.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function lgo --wraps='git log --oneline' --description 'alias lgo=git log --oneline'
-  git log --oneline $argv; 
-end

diff --git a/config/fish/functions/ll.fish b/config/fish/functions/ll.fish
deleted file mode 100644 (file)
index fe524fd..0000000
--- a/config/fish/functions/ll.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function ll --description 'list files long'
-   exa --icons --group --time-style=iso --group-directories-first -l $argv;
-end

diff --git a/config/fish/functions/ls.fish b/config/fish/functions/ls.fish
deleted file mode 100644 (file)
index 2e4d264..0000000
--- a/config/fish/functions/ls.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function ls --description 'list files standard'
-   exa --icons --time-style=iso --group-directories-first $argv;
-end

diff --git a/config/fish/functions/lsblk.fish b/config/fish/functions/lsblk.fish
deleted file mode 100644 (file)
index 0b1dbdb..0000000
--- a/config/fish/functions/lsblk.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function lsblk --description 'alias lsblk=lsblk -o +MODEL,LABEL'
- command lsblk -o +MODEL,LABEL $argv; 
-end

diff --git a/config/fish/functions/lt.fish b/config/fish/functions/lt.fish
deleted file mode 100644 (file)
index ffa4b22..0000000
--- a/config/fish/functions/lt.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function lt --description 'list files sorted by mtime'
-  exa --icons --group --long --sort=mod -t=mod --time-style=iso --group-directories-first $argv;
-end

diff --git a/config/fish/functions/lw.fish b/config/fish/functions/lw.fish
deleted file mode 100644 (file)
index 173cc73..0000000
--- a/config/fish/functions/lw.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function lw --description 'list files wide'
-  exa --icons --group --long --grid --time-style=iso --group-directories-first $argv;
-end

diff --git a/config/fish/functions/zdiff.fish b/config/fish/functions/zdiff.fish
deleted file mode 100644 (file)
index 028c850..0000000
--- a/config/fish/functions/zdiff.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function zdiff --description 'alias zdiff=zdiff --color=auto'
- command zdiff --color=auto $argv; 
-end

diff --git a/config/hypr/scripts/startup.sh b/config/hypr/scripts/startup.sh
index 826acdc472f7f729a7707676c7f0f32e002dc576..aa80355cdc89613cd02d66c77c98582296b3fcd7 100755 (executable)
--- a/config/hypr/scripts/startup.sh
+++ b/config/hypr/scripts/startup.sh
@@ -82,6 +82,13 @@ else
     logger 'mpd already running'
 fi
 
+if [[ ! $(pidof mpd-mpris) ]]; then
+       mpd-mpris &
+       logger 'mpd-mpris started'
+else
+    logger 'mpd-mpris already running'
+fi
+
 if [[ ! $(pidof swww-daemon) ]]; then
     swww init > /dev/null 2>&1 &
     logger 'swww-daemon started'

diff --git a/home/.bashrc b/home/.bashrc
index 3e13b36cdc3531a93a43b951f50cce75f9b019c3..261d2a0ecb8fc7852087ed77980bc3b7cf037910 100644 (file)
--- a/home/.bashrc
+++ b/home/.bashrc
@@ -17,6 +17,7 @@ export KKS_USE_GITDIR_SESSIONS=1
 export VDPAU_DRIVER='radeonsi'
 export XZ_OPT='--threads=16'
 
+alias df='/usr/bin/df -h --output=target,fstype,used,avail,pcent,source | sort -n'
 alias grep='grep -i'
 alias gg='cd "$(git rev-parse --show-toplevel)"'
 alias gco='git checkout'
@@ -25,15 +26,29 @@ alias glo='git log --oneline'
 alias gst='git status'
 alias nano='nano -_qpT4 '
 alias free='free -h --si'
+alias lsblk='lsblk -o name,size,partuuid,fstype,mountpoints,label'
 
-alias lf='lfrun'
-alias ls='exa --icons --time-style=iso --group-directories-first'
-alias ll='exa --icons --group --time-style=iso --group-directories-first -l'
-alias l1='exa --icons --group -1 --grid --time-style=iso --group-directories-first'
-alias la='ll -d && ll'
-alias lw='exa --icons --group --long --grid --time-style=iso --group-directories-first'
-alias lt='exa --icons --group --long --sort=mod -t=mod --time-style=iso --group-directories-first'
+alias  lf='lfrun'
 
+case $(tty) in
+    /dev/tty[0-9]*)
+        alias  l1='EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first -1'
+        alias  la='EZA_GRID_ROWS=13 eza -w 220 --group --long --grid --group-directories-first -l -a'
+        alias  lg='EZA_GRID_ROWS=13 eza -w 220 --group --icons --long --sort=size -t=mod --time-style=iso --group-directories-first'
+        alias  ll='EZA_GRID_ROWS=13 eza -w 220 --group --long --grid --group-directories-first'
+        alias  ls='EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first --icons'
+        alias  lt='EZA_GRID_ROWS=13 eza -w 220 --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso'
+        echo tty ;;
+    /dev/pts/[0-9]*)
+        alias  l1='EZA_GRID_ROWS=26 eza -w 0 --group --group-directories-first -1'
+        alias  la='EZA_GRID_ROWS=26 eza -w 0 --group --long --grid --group-directories-first -l -a'
+        alias  lg='EZA_GRID_ROWS=26 eza -w 0 --group --icons --long --sort=size -t=mod --time-style=iso --group-directories-first'
+        alias  ll='EZA_GRID_ROWS=26 eza -w 0 --group --long --grid --group-directories-first'
+        alias  ls='EZA_GRID_ROWS=26 eza -w 0 --group --group-directories-first --icons'
+        alias  lt='EZA_GRID_ROWS=26 eza -w 0 --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso'
+        echo pts ;;
+esac
+ 
 alias emergelog='sudo cat /var/log/emerge.log | grep "started\|completed\|exiting"'
 
 alias k='kks edit'