diff options
| -rw-r--r-- | .config/starship.toml | 237 | ||||
| -rw-r--r-- | .vimrc | 2 | ||||
| -rw-r--r-- | .zshrc | 199 |
3 files changed, 317 insertions, 121 deletions
diff --git a/.config/starship.toml b/.config/starship.toml new file mode 100644 index 0000000..2a90c61 --- /dev/null +++ b/.config/starship.toml @@ -0,0 +1,237 @@ +[character] +success_symbol = "[>](bold green)" +error_symbol = "[x](bold red)" +vimcmd_symbol = "[<](bold green)" + +[git_commit] +tag_symbol = " tag " + +[git_status] +ahead = ">" +behind = "<" +diverged = "<>" +renamed = "r" +deleted = "x" + +[aws] +symbol = "aws " + +[azure] +symbol = "az " + +[bun] +symbol = "bun " + +[c] +symbol = "C " + +[cobol] +symbol = "cobol " + +[conda] +symbol = "conda " + +[crystal] +symbol = "cr " + +[cmake] +symbol = "cmake " + +[daml] +symbol = "daml " + +[dart] +symbol = "dart " + +[deno] +symbol = "deno " + +[dotnet] +symbol = ".NET " + +[directory] +read_only = " ro" + +[docker_context] +symbol = "docker " + +[elixir] +symbol = "exs " + +[elm] +symbol = "elm " + +[fennel] +symbol = "fnl " + +[fossil_branch] +symbol = "fossil " + +[gcloud] +symbol = "gcp " + +[git_branch] +symbol = "git " + +[gleam] +symbol = "gleam " + +[golang] +symbol = "go " + +[gradle] +symbol = "gradle " + +[guix_shell] +symbol = "guix " + +[hg_branch] +symbol = "hg " + +[java] +symbol = "java " + +[julia] +symbol = "jl " + +[kotlin] +symbol = "kt " + +[lua] +symbol = "lua " + +[nodejs] +symbol = "nodejs " +detect_folders=['!.config'] + +[memory_usage] +symbol = "memory " + +[meson] +symbol = "meson " + +[nats] +symbol = "nats " + +[nim] +symbol = "nim " + +[nix_shell] +symbol = "nix " + +[ocaml] +symbol = "ml " + +[opa] +symbol = "opa " + +[os.symbols] +AIX = "aix " +Alpaquita = "alq " +AlmaLinux = "alma " +Alpine = "alp " +Amazon = "amz " +Android = "andr " +Arch = "rch " +Artix = "atx " +CentOS = "cent " +Debian = "deb " +DragonFly = "dfbsd " +Emscripten = "emsc " +EndeavourOS = "ndev " +Fedora = "fed " +FreeBSD = "fbsd " +Garuda = "garu " +Gentoo = "gent " +HardenedBSD = "hbsd " +Illumos = "lum " +Kali = "kali " +Linux = "lnx " +Mabox = "mbox " +Macos = "mac " +Manjaro = "mjo " +Mariner = "mrn " +MidnightBSD = "mid " +Mint = "mint " +NetBSD = "nbsd " +NixOS = "nix " +OpenBSD = "obsd " +OpenCloudOS = "ocos " +openEuler = "oeul " +openSUSE = "osuse " +OracleLinux = "orac " +Pop = "pop " +Raspbian = "rasp " +Redhat = "rhl " +RedHatEnterprise = "rhel " +RockyLinux = "rky " +Redox = "redox " +Solus = "sol " +SUSE = "suse " +Ubuntu = "ubnt " +Ultramarine = "ultm " +Unknown = "unk " +Void = "void " +Windows = "win " + +[package] +symbol = "pkg " + +[perl] +symbol = "pl " +detect_folders=['!.config'] + +[php] +symbol = "php " + +[pijul_channel] +symbol = "pijul " + +[pulumi] +symbol = "pulumi " + +[purescript] +symbol = "purs " + +[python] +symbol = "py " +detect_folders=['!.config'] + +[quarto] +symbol = "quarto " + +[raku] +symbol = "raku " + +[ruby] +symbol = "rb " + +[rust] +symbol = "rs " + +[scala] +symbol = "scala " + +[spack] +symbol = "spack " + +[solidity] +symbol = "solidity " + +[status] +symbol = "[x](bold red) " + +[sudo] +symbol = "sudo " + +[swift] +symbol = "swift " + +[typst] +symbol = "typst " + +[terraform] +symbol = "terraform " + +[zig] +symbol = "zig " @@ -15,6 +15,8 @@ Plug 'junegunn/fzf.vim' Plug 'itchyny/lightline.vim' +Plug 'mattn/emmet-vim' + call plug#end() set termguicolors @@ -1,123 +1,3 @@ -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH - -# Path to your Oh My Zsh installation. -export ZSH="$HOME/.oh-my-zsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time Oh My Zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -# ZSH_THEME="robbyrussell" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment one of the following lines to change the auto-update behavior -# zstyle ':omz:update' mode disabled # disable automatic updates -# zstyle ':omz:update' mode auto # update automatically without asking -# zstyle ':omz:update' mode reminder # just remind me to update when it's time - -# Uncomment the following line to change how often to auto-update (in days). -# zstyle ':omz:update' frequency 13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=( - git - zsh-autosuggestions - fast-syntax-highlighting -) - -ZSH_THEME="powerlevel10k/powerlevel10k" -source $ZSH/oh-my-zsh.sh - -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch $(uname -m)" - -# Set personal aliases, overriding those provided by Oh My Zsh libs, -# plugins, and themes. Aliases can be placed here, though Oh My Zsh -# users are encouraged to define aliases within a top-level file in -# the $ZSH_CUSTOM folder, with .zsh extension. Examples: -# - $ZSH_CUSTOM/aliases.zsh -# - $ZSH_CUSTOM/macos.zsh -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh - PATH="$PATH:/usr/sbin:/home/$USER/go/bin" alias yactl="$HOME/.local/share/yabridge/yabridgectl" @@ -129,4 +9,81 @@ alias dotfiles="/usr/bin/git --git-dir=$HOME/Documents/repos/.dotfiles/ --work-t # kitty ssh fix [[ "$TERM" == "xterm-kitty" ]] && alias ssh="TERM=xterm-256color ssh" -export FZF_DEFAULT_COMMAND='find -L' +# Catppuccin Macchiato Theme (for zsh-syntax-highlighting) +# +# Paste this files contents inside your ~/.zshrc before you activate zsh-syntax-highlighting +ZSH_HIGHLIGHT_HIGHLIGHTERS=(main cursor) +typeset -gA ZSH_HIGHLIGHT_STYLES + +# Main highlighter styling: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md +# +## General +### Diffs +### Markup +## Classes +## Comments +ZSH_HIGHLIGHT_STYLES[comment]='fg=#5b6078' +## Constants +## Entitites +## Functions/methods +ZSH_HIGHLIGHT_STYLES[alias]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[global-alias]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[function]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[command]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[precommand]='fg=#a6da95,italic' +ZSH_HIGHLIGHT_STYLES[autodirectory]='fg=#f5a97f,italic' +ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='fg=#f5a97f' +ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='fg=#f5a97f' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=#c6a0f6' +## Keywords +## Built ins +ZSH_HIGHLIGHT_STYLES[builtin]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=#a6da95' +ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=#a6da95' +## Punctuation +ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=#ed8796' +ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-unquoted]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]='fg=#ed8796' +ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=#ed8796' +ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=#ed8796' +## Serializable / Configuration Languages +## Storage +## Strings +ZSH_HIGHLIGHT_STYLES[command-substitution-quoted]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter-quoted]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[single-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=#eed49f' +ZSH_HIGHLIGHT_STYLES[double-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[rc-quote]='fg=#eed49f' +## Variables +ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[assign]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[named-fd]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[numeric-fd]='fg=#cad3f5' +## No category relevant in spec +ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[path]='fg=#cad3f5,underline' +ZSH_HIGHLIGHT_STYLES[path_pathseparator]='fg=#ed8796,underline' +ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=#cad3f5,underline' +ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]='fg=#ed8796,underline' +ZSH_HIGHLIGHT_STYLES[globbing]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[history-expansion]='fg=#c6a0f6' +#ZSH_HIGHLIGHT_STYLES[command-substitution]='fg=?' +#ZSH_HIGHLIGHT_STYLES[command-substitution-unquoted]='fg=?' +#ZSH_HIGHLIGHT_STYLES[process-substitution]='fg=?' +#ZSH_HIGHLIGHT_STYLES[arithmetic-expansion]='fg=?' +ZSH_HIGHLIGHT_STYLES[back-quoted-argument-unclosed]='fg=#ee99a0' +ZSH_HIGHLIGHT_STYLES[redirection]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[arg0]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[default]='fg=#cad3f5' +ZSH_HIGHLIGHT_STYLES[cursor]='fg=#cad3f5' + +eval "$(starship init zsh)" +source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh +source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh |