diff options
| -rw-r--r-- | .config/mimeapps.list | 23 | ||||
| -rw-r--r-- | .config/shell/variables | 16 | ||||
| -rw-r--r-- | .config/tmux/tmux.conf | 11 | ||||
| -rw-r--r-- | .config/zsh/managers | 4 | ||||
| -rw-r--r-- | .config/zsh/vi-mode | 2 |
5 files changed, 12 insertions, 44 deletions
diff --git a/.config/mimeapps.list b/.config/mimeapps.list index bc83351..3110307 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -1,32 +1,11 @@ [Default Applications] application/pdf=pdf.desktop -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop -x-scheme-handler/chrome=firefox.desktop -text/html=firefox.desktop +text/html=html.desktop; text/plain=text.desktop; application/postscript=pdf.desktop; -application/x-extension-htm=firefox.desktop -application/x-extension-html=firefox.desktop -application/x-extension-shtml=firefox.desktop -application/xhtml+xml=firefox.desktop -application/x-extension-xhtml=firefox.desktop -application/x-extension-xht=firefox.desktop application/rss+xml=rss.desktop text/x-shellscript=text.desktop; image/png=img.desktop; image/jpeg=img.desktop; image/gif=img.desktop; inode/directory=file.desktop - -[Added Associations] -x-scheme-handler/http=firefox.desktop; -x-scheme-handler/https=firefox.desktop; -x-scheme-handler/chrome=firefox.desktop; -text/html=firefox.desktop; -application/x-extension-htm=firefox.desktop; -application/x-extension-html=firefox.desktop; -application/x-extension-shtml=firefox.desktop; -application/xhtml+xml=firefox.desktop; -application/x-extension-xhtml=firefox.desktop; -application/x-extension-xht=firefox.desktop; diff --git a/.config/shell/variables b/.config/shell/variables index 87eb1bd..6cffdc1 100644 --- a/.config/shell/variables +++ b/.config/shell/variables @@ -31,8 +31,10 @@ export CABAL_CONFIG="$XDG_CONFIG_HOME/cabal/config" export CABAL_DIR="$XDG_DATA_HOME/cabal" export CABAL_BUILDDIR="$XDG_CACHE_HOME/cabal" -# Haskell formatter -export PATH="$HOME/.local/share/cabal/bin/fourmolu:$PATH" +# Haskell +export GHCUP_USE_XDG_DIRS=true +export PATH="$XDG_DATA_HOME/cabal/bin/fourmolu:$PATH" + # Ocaml export OPAMROOT="$XDG_CONFIG_HOME/opam" @@ -43,11 +45,7 @@ export ALT_KB_LAYOUT="se" # Other program settings: export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" -# pyenv -export PYENV_ROOT="${XDG_DATA_HOME:-$HOME/.local/share}/.pyenv" -export PATH="$PYENV_ROOT/bin:$PATH" - -export PYTHONSTARTUP="${XDG_CONFIG_HOME}/python/pythonrc" +export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc" # Rust export RUSTUP_HOME="$XDG_DATA_HOME"/rustup @@ -61,10 +59,6 @@ export LD_LIBRARY_PATH="/opt/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="/opt/cuda/lib64:$LD_LIBRARY_PATH" export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv -# Haskell -export GHCUP_USE_XDG_DIRS=true -export PATH="$XDG_DATA_HOME/cabal/bin/fourmolu:$PATH" - # Ollama models path export OLLAMA_MODELS="/storage2/projects/ollama/models" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 7311ff3..e0d033e 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -10,10 +10,11 @@ bind-key C-a send-prefix # Allows vim to display colors correctly. set -g default-terminal "${TERM}" set -ga terminal-overrides ',*256col*:Tc' +set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' + # Undercurl set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support -set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux-3.0 -set -ga terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q' +set -as terminal-overrides ',*:Setulc=\E[58::2::::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux-3.0 # Status line set -g status on @@ -32,13 +33,13 @@ set-option -g window-status-current-format " #[bold bg=#151515] > #{window_index set -s escape-time 0 set -g display-time 1500 set -g status-interval 5 -setw -g aggressive-resize on +set-window-option -g aggressive-resize on set -g status-keys vi set -g history-limit 10000 -setw -g mode-keys vi -setw -g mouse off +set-window-option -g mode-keys vi +set-window-option -g mouse off # split panes bind h split-window -h diff --git a/.config/zsh/managers b/.config/zsh/managers index 6595601..67bde02 100644 --- a/.config/zsh/managers +++ b/.config/zsh/managers @@ -1,9 +1,5 @@ # Language managers -# Init pyenv -eval "$(pyenv init --path)" -eval "$(pyenv virtualenv-init -)" - # Init fnm (node manager) eval "$(fnm env)" diff --git a/.config/zsh/vi-mode b/.config/zsh/vi-mode index fe4dd48..862c963 100644 --- a/.config/zsh/vi-mode +++ b/.config/zsh/vi-mode @@ -16,13 +16,11 @@ function zle-keymap-select () { viins|main) echo -ne '\e[5 q';; # beam esac } - zle -N zle-keymap-select zle-line-init() { zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere) echo -ne "\e[5 q" } - zle -N zle-line-init echo -ne '\e[5 q' # Use beam shape cursor on startup. preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt. |