diff --git a/dotfiles/.zprofile b/dotfiles/.zprofile new file mode 100644 index 0000000..ee7b63a --- /dev/null +++ b/dotfiles/.zprofile @@ -0,0 +1,7 @@ +#---------------------------------------------------------------------------------# +### Fixes +export PLASMA_USE_QT_SCALING=1 # Make Plasma work properly with high DPI scaling on X11 +export MOZ_USE_XINPUT2=1 # Use pixel-by-pixel touchpad scrolling in Firefox +export MOZ_ENABLE_WAYLAND=1 # Use experimental native Wayland support for Firefox and Thunderbird +export GTK_USE_PORTAL=1 # Try to use native file pickers in GTK programs +#---------------------------------------------------------------------------------# diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc index ba57232..0cfe0b1 100644 --- a/dotfiles/.zshrc +++ b/dotfiles/.zshrc @@ -10,6 +10,7 @@ fi ### Add things to PATH path+=("$HOME/.pyenv/bin") path+=("$HOME/.local/bin") +path+=("$HOME/Android/Sdk/platform-tools") export PATH #--------------------------------------------------------------------------------# ### Zsh config @@ -19,33 +20,6 @@ HISTSIZE=1000 # Sets lines to save history for SAVEHIST=1000 # Sets lines to save history for # Configure emacs keys bindkey -e -# Configure completion settings -autoload -Uz compinit -compinit - -zstyle ':completion:*' auto-description 'specify: %d' -zstyle ':completion:*' completer _expand _complete _correct _approximate -zstyle ':completion:*' format 'Completing %d' -zstyle ':completion:*' group-name '' -zstyle ':completion:*' menu select=2 -eval "$(dircolors -b)" -zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} -zstyle ':completion:*' list-colors '' -zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s -zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*' -zstyle ':completion:*' menu select=long -zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s -zstyle ':completion:*' use-compctl false -zstyle ':completion:*' verbose true - -zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31' -zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd' -#---------------------------------------------------------------------------------# -### Powerlevel10k theme -source ~/powerlevel10k/powerlevel10k.zsh-theme # Load theme - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh # Load zsh config #---------------------------------------------------------------------------------# ### Load nvm (node version manager) if ls "$HOME/.nvm" &> /dev/null; then @@ -60,14 +34,41 @@ if ls "$HOME/.pyenv" &> /dev/null; then eval "$(pyenv virtualenv-init -)" fi #---------------------------------------------------------------------------------# -### Make everything colorful +### Aliases alias ls="ls --color" # `ls` colors -# Find syntax highlighting location and start it (apt and pacman are different) -if ls "/usr/share/zsh/plugins/zsh-syntax-highlighting/" &> /dev/null; then - source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -elif ls "/usr/share/zsh-syntax-highlighting" &> /dev/null; then - source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +alias sudo="doas" # doas instead of sudo +#---------------------------------------------------------------------------------# +### Setup zinit +# Added by Zinit's installer +if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then + print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f" + command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit" + command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \ + print -P "%F{33} %F{34}Installation successful.%f%b" || \ + print -P "%F{160} The clone has failed.%f%b" fi + +source "$HOME/.local/share/zinit/zinit.git/zinit.zsh" +autoload -Uz _zinit +(( ${+_comps} )) && _comps[zinit]=_zinit + +# Load a few important annexes, without Turbo +# (this is currently required for annexes) +zinit light-mode for \ + zdharma-continuum/zinit-annex-as-monitor \ + zdharma-continuum/zinit-annex-bin-gem-node \ + zdharma-continuum/zinit-annex-patch-dl \ + zdharma-continuum/zinit-annex-rust + +# End of Zinit's installer chunk +#---------------------------------------------------------------------------------# +### Zinit plugins +zinit ice depth=1; zinit light romkatv/powerlevel10k # Powerlevel10k +zinit light zsh-users/zsh-autosuggestions # Autosuggestions +zinit light zsh-users/zsh-syntax-highlighting # Syntax highlighting + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh #---------------------------------------------------------------------------------# ### Fixes export GPG_TTY=$(tty) # Fix gpg signing