Compare commits

..

No commits in common. "365f01da5472200e8154a2a068f6088c5197674d" and "29735c36f2afbf34e4e5c28a43027fe37cd3d4b5" have entirely different histories.

4 changed files with 2 additions and 24 deletions

View File

@ -411,7 +411,3 @@ end
if type -q chezmoi if type -q chezmoi
abbr cz chezmoi abbr cz chezmoi
end end
if type -q hledger
abbr hl hledger
end

View File

@ -13,10 +13,6 @@ if status --is-interactive
command -v zoxide > /dev/null && zoxide init fish | source command -v zoxide > /dev/null && zoxide init fish | source
command -v starship > /dev/null && starship init fish | source command -v starship > /dev/null && starship init fish | source
if not set -q FISH_IS_IN_PRIVATE
command -v atuin > /dev/null && atuin init fish | source
end
if type -q tmux; and test -z "$TMUX" if type -q tmux; and test -z "$TMUX"
tmux attach -t default || tmux new-session -s default tmux attach -t default || tmux new-session -s default
end end

View File

@ -151,14 +151,10 @@ if type -q vidir;
set -x VIDIR_EDITOR_ARGS '-c :set nolist | :set ft=vidir-ls' set -x VIDIR_EDITOR_ARGS '-c :set nolist | :set ft=vidir-ls'
end end
if type -q stack; # Haskell if type -q stack: # Haskell
set -x STACK_ROOT "$XDG_DATA_HOME"/stack set -x STACK_ROOT "$XDG_DATA_HOME"/stack
end end
if type -q hledger;
set -x LEDGER_FILE "$HOME/vc/accounting/hledger/main.journal"
end
{{- if (and (eq .chezmoi.os "linux") (eq .hosttype "desktop" "laptop")) }} {{- if (and (eq .chezmoi.os "linux") (eq .hosttype "desktop" "laptop")) }}
if test -d "$XDG_DATA_HOME/flatpak/exports/bin" if test -d "$XDG_DATA_HOME/flatpak/exports/bin"
set -ax PATH "$XDG_DATA_HOME/flatpak/exports/bin" set -ax PATH "$XDG_DATA_HOME/flatpak/exports/bin"
@ -174,22 +170,14 @@ if type -q calibre;
set -x CALIBRE_USE_DARK_PALETTE 1 set -x CALIBRE_USE_DARK_PALETTE 1
end end
if type -q ksshaskpass if type -q ksshaskpass:
set -x SSH_ASKPASS (which ksshaskpass) set -x SSH_ASKPASS (which ksshaskpass)
set -x SUDO_ASKPASS (which ksshaskpass) set -x SUDO_ASKPASS (which ksshaskpass)
end end
if type -q gpodder
set -x GPODDER_HOME "$XDG_CONFIG_HOME/gpodder"
end
{{- end }} {{- end }}
{{- if (eq .chezmoi.hostname "arch") }} {{- if (eq .chezmoi.hostname "arch") }}
if type -q ollama if type -q ollama
set -x OLLAMA_HOST "10.0.2.1:11434" set -x OLLAMA_HOST "10.0.2.1:11434"
end end
if type -q gpodder
set -x GPODDER_DOWNLOAD_DIR "/mnt/hdd/gpodder"
end
{{- end }} {{- end }}

View File

@ -38,8 +38,6 @@ bind C-j split-window -v -c '#{pane_current_path}'
bind C-c new-session bind C-c new-session
{{- if eq .chezmoi.hostname "arch" }} {{- if eq .chezmoi.hostname "arch" }}
bind C-t run "tmuxsh >/dev/null" bind C-t run "tmuxsh >/dev/null"
bind C-y run "tmuxsh remote >/dev/null"
bind C-u run "tmuxsh dev >/dev/null"
bind 0 run "tmuxsh wiki >/dev/null" bind 0 run "tmuxsh wiki >/dev/null"
bind 1 run "tmuxsh blog >/dev/null" bind 1 run "tmuxsh blog >/dev/null"
bind 3 run "tmuxsh tessoku >/dev/null" bind 3 run "tmuxsh tessoku >/dev/null"