diff --git a/config/fish/conf.d/alias.fish b/config/fish/conf.d/alias.fish index 471aa26..ea33fcc 100644 --- a/config/fish/conf.d/alias.fish +++ b/config/fish/conf.d/alias.fish @@ -1,54 +1,32 @@ alias cls clear alias cp "cp -r" alias mkdir "mkdir -p" -alias py python -alias d docker -alias dcm "docker compose" alias free "free -h" alias df "df -h" +alias du "du -h" alias chmox "chmod +x" -# kitty specific -if test $TERM = "xterm-kitty" - alias ssh "kitty +kitten ssh" - alias icat "kitty +kitten icat" -end +alias vim nvim +alias e vim + +alias f hledger +alias g git +alias d docker +alias dcm "docker compose" + +alias ... "cd ../.." +alias .3 "cd ../../.." alias killbt "rfkill block bluetooth" alias unkillbt "rfkill unblock bluetooth" -# exa -alias ls "exa -l" -alias la "ls -a" -alias ll ls +if type -q eza + alias ls "eza -l" + alias la "ls -a" + alias ll ls +end -# vim -alias vim nvim -alias e vim - -# git -alias g git -alias ga "git add" -alias gc "git cm" - -# go -alias yaegi "rlwrap yaegi" -alias gor "go run" -alias gob "go build" -alias gog "go get" -alias gom "go mod" - -# clojure -alias cljcider "clj -M:cider" -alias cljrun "clj -M:run" -alias cljtest "clj -M:test" - -# rust -alias ca cargo -alias cabu "cargo build" -alias caru "cargo run" -alias cate "cargo test" - -# navigations -alias ... "cd ../.." -alias .3 "cd ../../.." +if test $TERM = "xterm-kitty" + alias ssh "kitty +kitten ssh" + alias icat "kitty +kitten icat" +end diff --git a/config/fish/config.fish b/config/fish/config.fish index fb50203..68b7c52 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -5,15 +5,14 @@ set -g GOPATH $HOME/go set -g GOBIN $GOPATH/bin set -g PATH $HOME/bin $PATH -set -g PATH $HOME/go/bin $PATH set -g PATH $HOME/.local/bin $PATH -set -g PATH $HOME/.bun/bin $PATH -set -g PATH $HOME/.cargo/bin $PATH +set -g PATH $HOME/go/bin $PATH set -g PATH node_modules/.bin $PATH set -g PATH .bin $PATH if status is-interactive set fish_greeting + starship init fish | source zoxide init fish | source mise activate fish | source diff --git a/config/fish/functions/envsource.fish b/config/fish/functions/envsource.fish deleted file mode 100644 index af570e4..0000000 --- a/config/fish/functions/envsource.fish +++ /dev/null @@ -1,7 +0,0 @@ -function envsource - for line in (cat $argv | grep -v '^#') - set item (string split -m 1 '=' $line) - set -gx $item[1] $item[2] - echo "Exported key $item[1]" - end -end diff --git a/config/fish/functions/srtdock.fish b/config/fish/functions/srtdock.fish index 285a850..05098a4 100644 --- a/config/fish/functions/srtdock.fish +++ b/config/fish/functions/srtdock.fish @@ -1,3 +1,3 @@ function srtdock - sudo systemctl start docker + sudo systemctl start docker end