From 17d058b984c7709b9ed3fcf073961485b7588f23 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sun, 9 Apr 2023 13:11:36 +0100 Subject: Update fish to rely on zsh --- fish/.config/fish/config.fish | 33 +-------------------------------- kitty/.config/kitty/kitty.conf | 2 +- zsh-fish/.zprofile | 35 +++++++++++++++++++++++++++++++++++ zsh-fish/.zshrc | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 zsh-fish/.zprofile create mode 100644 zsh-fish/.zshrc diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index b1ca69e..4d423fe 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,28 +1,3 @@ -set -x _JAVA_AWT_WM_NONREPARENTING 1 -set -x DOTNET_CLI_TELEMETRY_OPTOUT 1 -set -x EDITOR 'emacsclient -nw' -set -x VISUAL 'emacsclient -c' -set -x CLICOLOR 1 -set -x LEDGER_FILE "$HOME/Dropbox/ledger/main.ledger" -set -x VAGRANT_HOME /mnt/orca/vagrant -set -x QMK_HOME "$HOME/projects/qmk_firmware" -set -x HOMEBREW_NO_ENV_HINTS 1 - -set -x CDS_LIC_FILE 5280@ee-llic01.ee.ic.ac.uk -set -x SNPS_LICENSE_FILE 7182@ee-llic01.ee.ic.ac.uk -set -x MGLS_LICENSE_FILE 1717@ee-llic01.ee.ic.ac.uk -set -x LM_LICENSE_FILE 2100@ee-llic01.ee.ic.ac.uk:7193@ee-llic01.ee.ic.ac.uk:5280@ee-llic01.ee.ic.ac.uk:7182@ee-llic01.ee.ic.ac.uk:1717@ee-llic01.ee.ic.ac.uk - -# nix section -source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish - -fish_add_path /Library/TeX/texbin -fish_add_path /usr/local/bin -fish_add_path $HOME/.nix-profile/bin -fish_add_path $HOME/.cargo/bin -fish_add_path $HOME/.local/bin -fish_add_path $HOME/Library/ConTeXt/tex/texmf-osx-64/bin - function latestqr -d "Return the string corresponding to the latest QR code." ls -aS $HOME/Desktop | tail -n1 | tr \\n \\0 | xargs -0 -I% zbarimg --raw -q $HOME/Desktop/% end @@ -31,13 +6,7 @@ function ll; ls -lah $argv; end function vim; nvim $argv; end if status is-interactive - # Commands to run in interactive sessions can go here set -x GPG_TTY (tty) - set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) gpgconf --launch gpg-agent + direnv hook fish | source end - -direnv hook fish | source - -# opam configuration -source $HOME/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index 0edc08d..e7f0ab9 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -1165,7 +1165,7 @@ tab_bar_style separator #: Advanced {{{ -shell /usr/local/bin/fish +#shell /usr/local/bin/fish #: The shell program to execute. The default value of . means to use #: whatever shell is set as the default shell for the current user. diff --git a/zsh-fish/.zprofile b/zsh-fish/.zprofile new file mode 100644 index 0000000..2e4bcd3 --- /dev/null +++ b/zsh-fish/.zprofile @@ -0,0 +1,35 @@ +export _JAVA_AWT_WM_NONREPARENTING=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + +export EDITOR=nvim +export VISUAL=emacs +export CLICOLOR=1 + +export LEDGER_FILE=$HOME/Dropbox/ledger/main.ledger +# export VAGRANT_HOME=/mnt/orca/vagrant + +export QMK_HOME=$HOME/projects/qmk_firmware +export HOMEBREW_NO_ENV_HINTS=1 + +export CDS_LIC_FILE=5280@ee-llic01.ee.ic.ac.uk +export SNPS_LICENSE_FILE=7182@ee-llic01.ee.ic.ac.uk +export MGLS_LICENSE_FILE=1717@ee-llic01.ee.ic.ac.uk +export LM_LICENSE_FILE=2100@ee-llic01.ee.ic.ac.uk:7193@ee-llic01.ee.ic.ac.uk:5280@ee-llic01.ee.ic.ac.uk:7182@ee-llic01.ee.ic.ac.uk:1717@ee-llic01.ee.ic.ac.uk + +[ -f /usr/local/bin/brew ] && eval "$(/usr/local/bin/brew shellenv)" +[ -f $HOME/.cargo/env ] && source $HOME/.cargo/env +[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ] \ + && source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh +[ -f $HOME/.opam/opam-init/init.zsh ] && source $HOME/.opam/opam-init/init.zsh +[ -f $HOME/.fzf.zsh ] && source $HOME/.fzf.zsh + +PATH=$HOME/.nix-profile/bin:$PATH +PATH=/Library/TeX/texbin:$PATH +PATH=/usr/local/bin:/usr/local/sbin:$PATH +PATH=$HOME/.cargo/bin:$PATH +PATH=$HOME/.local/bin:$PATH +PATH=$HOME/Library/ConTeXt/tex/texmf-osx-64/bin:$PATH + +export PATH + +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) diff --git a/zsh-fish/.zshrc b/zsh-fish/.zshrc new file mode 100644 index 0000000..09669b6 --- /dev/null +++ b/zsh-fish/.zshrc @@ -0,0 +1 @@ +exec /usr/local/bin/fish -- cgit