a

.gitattributes

@@ -0,0 +1,2 @@
+*.png filter=lfs diff=lfs merge=lfs -text
+*.knsv filter=lfs diff=lfs merge=lfs -text

dotfiles/.zinit.zsh

@@ -1,10 +1,25 @@
 zinit ice depth=1; zinit light romkatv/powerlevel10k; # Powerlevel10k theme
-zinit light anatolykopyl/doas-zsh-plugin; # Double-escape adds doas to command
+#zinit light anatolykopyl/doas-zsh-plugin; # Double-escape adds doas to command
 zinit light Tarrasch/zsh-command-not-found; # Shows command suggestions on invalid
 zinit light Game4Move78/zsh-bitwarden; # Bitwarden cli utilities
 zinit light ianthehenry/zsh-autoquoter; # Auto adds quotes around some commands
 zinit light zdharma-continuum/fast-syntax-highlighting; # Syntax highlighting
-zinit light zsh-users/zsh-autosuggestions # Command suggestions
+zinit light zsh-users/zsh-autosuggestions; # Command suggestions
+zinit light Tarrasch/zsh-bd; # bd command
+zinit light zpm-zsh/colorize; # Colorizes a handfull of comands
 
-export ZSH_AUTOSUGGEST_STRATEGY=(history completion) # Use history when available, then completion
+if command -v atuin &> /dev/null; then
+	zinit light ellie/atuin; # Add atuin (better cmd history) support to zsh
+
+	# Declare a custom autosuggestion strategy for zsh-autosuggestions
+	_zsh_autosuggest_strategy_atuin() {
+		local results
+
+		results=("${(@f)$(atuin search -e 0 --cmd-only $1)}")
+
+		typeset -g suggestion="${results[-1]}"
+	}
+fi
+
+export ZSH_AUTOSUGGEST_STRATEGY=(atuin completion) # Use atuin history when available, then completion
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh # Load Powerlevel10k config

dotfiles/.zprofile

@@ -1,12 +1,22 @@
+[[ ! -f ~/.zenv.zsh ]] || source ~/.zenv.zsh
 #---------------------------------------------------------------------------------#
 ### 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
+if [[ $XDG_SESSION_TYPE = 'wayland' ]]; then
+	export MOZ_ENABLE_WAYLAND=1 # Use experimental native Wayland support for Firefox and Thunderbird
+	export QT_QPA_PLATFORM=wayland # Enable QT wayland plugin
+else
+	export PLASMA_USE_QT_SCALING=1 # Make Plasma work properly with high DPI scaling on X11
+fi
+## Below is disabled because it causes firefox to stop antialiasing fonts in wayland for some reason
+#export GTK_USE_PORTAL=1 # Try to use native file pickers in GTK programs
 #---------------------------------------------------------------------------------#
 ### Load pyenv
-export PYENV_ROOT="$HOME/.pyenv"
-export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init --path)"
+if command -v pyenv &> /dev/null; then
+	export PYENV_ROOT="$HOME/.pyenv"
+	export PATH="$PYENV_ROOT/bin:$PATH"
+	eval "$(pyenv init -)"
+fi
 #---------------------------------------------------------------------------------#
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)                                                                                                                                                                                
+echo "bye" | gpg-connect-agent &> /dev/null

dotfiles/.zsh_aliases

@@ -10,8 +10,8 @@ alias ......="cd ../../.."
 psh() {
 	fmt && ga && gc "$@" && gp
 }
-alias stop="doas systemctl stop"
-alias start="doas systemctl start"
+alias stop="sudo systemctl stop"
+alias start="sudo systemctl start"
 alias ls="exa"
 alias la="exa -a"
 alias lal="exa -al"
@@ -22,3 +22,16 @@ else
 	alias clip="xclip -selection clipboard"
 fi
 alias 2fa="TOKEN=\$(yad --title=\"Authy\" --text=\"What code would you like to copy?\" --entry) && mambembe-cli get-token --service-name \$TOKEN | tr -dc '0-9' | clip"
+ytp() { AUDIOFILE="$(mktemp -u)" && yt-dlp --default-search ytsearch "$@" -f ba --output $AUDIOFILE && cvlc $AUDIOFILE --play-and-exit && rm $AUDIOFILE }
+zshdir() {
+  zsh -c "cd $@; zsh -i"
+}
+mgc ()
+{
+    mambembe-cli get-token -s "$@" | fzf --reverse -0 -1 | rg -oP 'Token: "\K\d+' | xclip -i -selection clipboard
+}
+alias yarn-classic="corepack prepare yarn@1.22.19 --activate"
+alias yarn-modern="corepack prepare yarn@3.6.1 --activate"
+ckdir() {
+  mkdir $1 && cd $1
+}

dotfiles/.zshrc

@@ -1,3 +1,4 @@
+[[ ! -f ~/.zenv.zsh ]] || source ~/.zenv.zsh
 #---------------------------------------------------------------------------------#
 ### Powerlevel10k instant prompt
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
@@ -7,32 +8,40 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 #---------------------------------------------------------------------------------#
+### Load nvm if script is in aur location
+if [[ -f /usr/share/nvm/init-nvm.sh ]]; then
+    source /usr/share/nvm/init-nvm.sh
+fi
+#---------------------------------------------------------------------------------#
 ### Add things to PATH
-path+=("$HOME/.pyenv/bin")
+path+=("$XDG_DATA_HOME/pyenv/bin")
 path+=("$HOME/.local/bin")
 path+=("$HOME/Android/Sdk/platform-tools")
-path+=("$HOME/.cargo/bin")
+path+=("$XDG_DATA_HOME/cargo/bin")
 export PATH
 #--------------------------------------------------------------------------------#
 ### Zsh config
-# Configure command history saving
-HISTFILE=~/.zsh_history # Sets history file
-HISTSIZE=1000 # Sets lines to save history for
-SAVEHIST=1000 # Sets lines to save history for
+# Configure command history saving (if atuin is not found)
+if ! command -v atuin &> /dev/null; then
+    HISTFILE="$HOME/.zsh_history"
+    HISTSIZE=500000
+    SAVEHIST=500000
+    setopt INC_APPEND_HISTORY
+    setopt SHARE_HISTORY
+fi
 # Configure emacs keys
 bindkey -e
 #---------------------------------------------------------------------------------#
-### Load nvm (node version manager)
-source /usr/share/nvm/init-nvm.sh
-#---------------------------------------------------------------------------------#
 ### Load pyenv
-if ls "$HOME/.pyenv" &> /dev/null; then
+if command -v pyenv &> /dev/null; then
+    export PYENV_ROOT="$HOME/.pyenv"
+    export PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init -)"
 fi
 #---------------------------------------------------------------------------------#
 ### Aliases
 source "$HOME/.zsh_aliases"
-eval $(thefuck --alias) # `fuck` alias
+#eval $(thefuck --alias) # `fuck` alias
 #---------------------------------------------------------------------------------#
 ### Setup zinit
 # Added by Zinit's installer
@@ -60,7 +69,7 @@ zinit light-mode for \
 [[ ! -f ~/.zinit.zsh ]] || source ~/.zinit.zsh # Load zinit plugins and themes
 #---------------------------------------------------------------------------------#
 ### Fixes
-export GPG_TTY=$(tty) # Fix gpg signing
+export GPG_TTY=$TTY # Fix gpg signing
 ## A giant handful of key fixes
 bindkey "^[[3~" delete-char
 bindkey "^[[3;2~" delete-char
@@ -71,4 +80,7 @@ bindkey "^[[3;5~" kill-word
 bindkey "^H" backward-kill-word
 bindkey "^[[1;5D" backward-word
 bindkey "^[[1;5C" forward-word
-#---------------------------------------------------------------------------------#
+#--------------------------------------------------------------------------------#
+### Idk ssh or something
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+echo "bye" | gpg-connect-agent &> /dev/null

dotfiles/nvim/init.vim

@@ -14,6 +14,8 @@ Plug 'neoclide/coc.nvim', { 'branch': 'release' } " Language server support
 Plug 'tommcdo/vim-lion' " Allow aligning code by an amount of chars
 Plug 'Shirk/vim-gas' " GNU syntax support
 Plug 'ntpeters/vim-better-whitespace' " Shows whitespace at the end of lines
+Plug 'chrisbra/SudoEdit.vim' " Allow editing root files
+Plug 'mg979/vim-visual-multi', {'branch': 'master'} " Multi curser vim
 call plug#end()
 
 " Get syntax files from config folder