diff options
| -rw-r--r-- | .bash_profile | 5 | ||||
| -rw-r--r-- | .bashrc | 15 | ||||
| -rw-r--r-- | .config/fish/config.fish | 54 | ||||
| -rw-r--r-- | .config/shell/profile | 25 | ||||
| -rw-r--r-- | .config/starship.toml | 123 | ||||
| -rw-r--r-- | .config/zsh/.zshenv | 1 | ||||
| -rw-r--r-- | .config/zsh/.zshrc | 6 |
7 files changed, 189 insertions, 40 deletions
diff --git a/.bash_profile b/.bash_profile index 65cbbb1..56b565e 100644 --- a/.bash_profile +++ b/.bash_profile @@ -10,8 +10,3 @@ then fi source "$HOME/.config/shell/profile" - -#if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]] -#then -# exec fish -#fi @@ -6,7 +6,17 @@ # always source profile source "$HOME/.bash_profile" +# options +shopt -s cdspell +shopt -s checkwinsize +shopt -s cmdhist +shopt -s globstar +shopt -s nocaseglob +shopt -s no_empty_cmd_completion + export HISTFILE="$XDG_STATE_HOME/bash/history" +export HISTSIZE=20 +export HISTFILESIZE=500 # aliases alias ls='exa' @@ -14,3 +24,8 @@ alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' # prompt PS1='[\u@\h \W]\$ ' + +#if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]] +#then +# exec fish +#fi diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 2af421a..51c6d3e 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -3,5 +3,55 @@ # -# plugins -starship init fish | source +function set_envvars + if test -d "$HOME/.local/bin" + fish_add_path "$HOME/.local/bin" + end + + # xdg dirs + set -gx XDG_DATA_HOME "$HOME/.local/share" + set -gx XDG_CONFIG_HOME "$HOME/.config" + set -gx XDG_STATE_HOME "$HOME/.local/state" + set -gx XDG_CACHE_HOME "$HOME/.cache" + if not set -q XDG_DATA_DIRS + set -gx XDG_DATA_DIRS "/usr/local/share/:/usr/share/" + end + set -gx XDG_CONFIG_DIRS "/etc/xdg" + + # default programs + set -gx EDITOR 'nvim' + set -gx VISUAL 'nvim' + set -gx GPG_TTY (tty) + set -gx AUR_PAGER 'fff' + set -gx AUR_EXEC_PATH "$XDG_DATA_HOME/aurutils/lib:/usr/lib/aurutils" + + # flags + set -gx CFLAGS "-march=native -mtune=native -O3 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection" + set -gx CXXFLAGS "$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" + set -gx LDFLAGS "-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" + set -gx LTOFLAGS "-flto=12" + set -gx RUSTFLAGS "-C target-cpu=native -C opt-level=3" + set -gx MAKEFLAGS "-j12" + + # paths + set -gx CARGO_HOME "$XDG_DATA_HOME/cargo" + set -gx RUSTUP_HOME "$XDG_DATA_HOME/rustup" + set -gx LESSHISTFILE "$XDG_STATE_HOME/less/history" + set -gx NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME/npm/npmrc" + +end + +function load_plugins + starship init fish | source +end + +if status is-login + set_envvars + load_plugins +else if status is-interactive + load_plugins +else + set_envvars +end diff --git a/.config/shell/profile b/.config/shell/profile index 804ff2a..72a0601 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,17 +1,30 @@ -# default programs -export EDITOR='nvim' -export VISUAL='nvim' -export GPG_TTY=$TTY - # xdg dirs export XDG_DATA_HOME="$HOME/.local/share" export XDG_CONFIG_HOME="$HOME/.config" export XDG_STATE_HOME="$HOME/.local/state" export XDG_CACHE_HOME="$HOME/.cache" -export XDG_DATA_DIRS="/usr/local/share/:/usr/share/" +export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" export XDG_CONFIG_DIRS="/etc/xdg" +# default programs +export EDITOR='nvim' +export VISUAL='nvim' +export GPG_TTY=$(tty) +export AUR_PAGER='fff' +export AUR_EXEC_PATH="$XDG_DATA_HOME/aurutils/lib:/usr/lib/aurutils" + +# flags +export CFLAGS="-march=native -mtune=native -O3 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection" +export CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" +export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" +export LTOFLAGS="-flto=12" +export RUSTFLAGS="-C target-cpu=native -C opt-level=3" +export MAKEFLAGS="-j12" + # paths export CARGO_HOME="$XDG_DATA_HOME/cargo" export RUSTUP_HOME="$XDG_DATA_HOME/rustup" export LESSHISTFILE="$XDG_STATE_HOME/less/history" +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" diff --git a/.config/starship.toml b/.config/starship.toml index 40f75a1..7fbdec7 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -1,23 +1,100 @@ -format = """ -$username\ -$hostname\ -$localip\ -$directory\ -$vcsh\ -$git_branch\ -$git_commit\ -$git_state\ -$git_metrics\ -$git_status\ -$hg_branch\ -$container\ -$env_var\ -$sudo\ -$cmd_duration\ -$line_break\ -$jobs\ -$battery\ -$time\ -$status\ -$shell\ -$character""" +add_newline = false + +[buf] +format = "via [$symbol]($style)" + +[cmake] +format = "via [$symbol]($style)" + +[cobol] +format = "via [$symbol]($style)" + +[crystal] +format = "via [$symbol]($style)" + +[daml] +format = "via [$symbol]($style)" + +[dart] +format = "via [$symbol]($style)" + +[deno] +format = "via [$symbol]($style)" + +[dotnet] +format = "[$symbol(🎯 $tfm )]($style)" + +[elixir] +format = 'via [$symbol]($style)' + +[elm] +format = 'via [$symbol]($style)' + +[erlang] +format = 'via [$symbol]($style)' + +[golang] +format = 'via [$symbol]($style)' + +[helm] +format = 'via [$symbol]($style)' + +[julia] +format = 'via [$symbol]($style)' + +[kotlin] +format = 'via [$symbol]($style)' + +[lua] +format = 'via [$symbol]($style)' + +[nim] +format = 'via [$symbol]($style)' + +[nodejs] +format = 'via [$symbol]($style)' + +[ocaml] +format = 'via [$symbol(\($switch_indicator$switch_name\) )]($style)' + +[perl] +format = 'via [$symbol]($style)' + +[php] +format = 'via [$symbol]($style)' + +[pulumi] +format = 'via [$symbol$stack]($style)' + +[purescript] +format = 'via [$symbol]($style)' + +[python] +format = 'via [$symbol]($style)' + +[raku] +format = 'via [$symbol]($style)' + +[red] +format = 'via [$symbol]($style)' + +[rlang] +format = 'via [$symbol]($style)' + +[ruby] +format = 'via [$symbol]($style)' + +[rust] +format = 'via [$symbol]($style)' + +[swift] +format = 'via [$symbol]($style)' + +[vagrant] +format = 'via [$symbol]($style)' + +[vlang] +format = 'via [$symbol]($style)' + +[zig] +format = 'via [$symbol]($style)' diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index c32ce0b..0bab150 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -12,4 +12,3 @@ if [[ -d "$HOME/.local/bin" ]]; then fi source "$HOME/.config/shell/profile" -ZDOTDIR="$XDG_CONFIG_HOME/zsh" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index b4c5fd5..299fbc7 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -33,9 +33,9 @@ zle -N clear-screen-and-scrollback bindkey '^L' clear-screen-and-scrollback # enable history -HISTFILE="$HOME/.cache/zsh/history" -HISTSIZE=100 -SAVEHIST=1000 +HISTFILE="$XDG_STATE_HOME/zsh/history" +HISTSIZE=20 +SAVEHIST=500 # aliases alias ls='exa' |