diff --git a/.bashrc b/.bashrc index b48c5ce..fde2277 100644 --- a/.bashrc +++ b/.bashrc @@ -4,8 +4,8 @@ # If not running interactively, don't do anything case $- in - *i*) ;; - *) return;; +*i*) ;; +*) return ;; esac # don't put duplicate lines or lines starting with space in the history. @@ -32,12 +32,12 @@ shopt -s checkwinsize # set variable identifying the chroot you work in (used in the prompt below) if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) + debian_chroot=$(cat /etc/debian_chroot) fi # set a fancy prompt (non-color, unless we know we "want" color) case "$TERM" in - xterm-color|*-256color) color_prompt=yes;; +xterm-color | *-256color) color_prompt=yes ;; esac # uncomment for a colored prompt, if the terminal has the capability; turned @@ -46,42 +46,41 @@ esac #force_color_prompt=yes if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi fi if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' fi unset color_prompt force_color_prompt # If this is an xterm set the title to user@host:dir case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; +xterm* | rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) ;; esac # enable color support of ls and also add handy aliases if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' fi # colored GCC warnings and errors @@ -102,7 +101,7 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo # See /usr/share/doc/bash-doc/examples in the bash-doc package. if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases + . ~/.bash_aliases fi # enable programmable completion features (you don't need to enable @@ -116,8 +115,9 @@ if ! shopt -oq posix; then fi fi alias cd-repos='cd /mnt/c/Users/zacmon001/repos' +alias cd-beetl='cd /mnt/c/Users/zacmon001/repos/beetl' export PATH=$PATH:/home/zacmon001/.local/bin -#eval "$(oh-my-posh init bash --config /mnt/c/Temp/theme.omp.json)" +eval "$(oh-my-posh init bash --config ~/.config/oh-my-posh/theme.omp.json)" alias vim='nvim' alias edit-bash='vim ~/.bashrc && source ~/.bashrc && clear && echo "sourced ~/.bashrc"' @@ -127,5 +127,5 @@ alias edit-vim='vim ~/.config/nvim' alias install-requirements='/bin/sh ~/.config/requirements/install.sh' export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml new file mode 100755 index 0000000..c45e99b --- /dev/null +++ b/.config/alacritty/alacritty.toml @@ -0,0 +1,145 @@ +#[colors.bright] +#black = "#4c566a" +#blue = "#81a1c1" +#cyan = "#8fbcbb" +#green = "#a3be8c" +#magenta = "#b48ead" +#red = "#bf616a" +#white = "#eceff4" +#yellow = "#ebcb8b" +#[colors.cursor] +#cursor = "#d8dee9" +#text = "#2e3440" + +#[colors.dim] +#black = "#373e4d" +#blue = "#68809a" +#cyan = "#6d96a5" +#green = "#809575" +#magenta = "#8c738c" +#red = "#94545d" +#white = "#aeb3bb" +#yellow = "#b29e75" +# +#[colors.normal] +#black = "#3b4252" +#blue = "#81a1c1" +#cyan = "#88c0d0" +#green = "#a3be8c" +#magenta = "#b48ead" +#red = "#bf616a" +#white = "#e5e9f0" +#yellow = "#ebcb8b" +# +#[colors.primary] +#background = "#2e3440" +#dim_foreground = "#a5abb6" +#foreground = "#d8dee9" + +# [colors.search.bar] +# background = "#434c5e" +# foreground = "#d8dee9" + +#[colors.search.matches] +#background = "#88c0d0" +#foreground = "CellBackground" + +#[colors.selection] +#background = "#4c566a" +#text = "CellForeground" + +#[colors.vi_mode_cursor] +#cursor = "#d8dee9" +#text = "#2e3440" + +[font] +size = 16.0 + +[font.normal] +family = "FiraCode Nerd Font" +style = "Regular" + +[font.bold] +family = "FiraCode Nerd Font" +style = "Bold" + +[font.italic] +family = "FiraCode Nerd Font" +style = "Italic" + +[font.bold_italic] +family = "FiraCode Nerd Font" +style = "Bold Italic" + +[terminal.shell] +program = "ubuntu.exe" + +[window] +startup_mode = "Maximized" + +# Theme +[colors.primary] +background = "#303446" +foreground = "#c6d0f5" +dim_foreground = "#838ba7" +bright_foreground = "#c6d0f5" + +[colors.cursor] +text = "#303446" +cursor = "#f2d5cf" + +[colors.vi_mode_cursor] +text = "#303446" +cursor = "#babbf1" + +[colors.search.matches] +foreground = "#303446" +background = "#a5adce" + +[colors.search.focused_match] +foreground = "#303446" +background = "#a6d189" + +[colors.footer_bar] +foreground = "#303446" +background = "#a5adce" + +[colors.hints.start] +foreground = "#303446" +background = "#e5c890" + +[colors.hints.end] +foreground = "#303446" +background = "#a5adce" + +[colors.selection] +text = "#303446" +background = "#f2d5cf" + +[colors.normal] +black = "#51576d" +red = "#e78284" +green = "#a6d189" +yellow = "#e5c890" +blue = "#8caaee" +magenta = "#f4b8e4" +cyan = "#81c8be" +white = "#b5bfe2" + +[colors.bright] +black = "#626880" +red = "#e78284" +green = "#a6d189" +yellow = "#e5c890" +blue = "#8caaee" +magenta = "#f4b8e4" +cyan = "#81c8be" +white = "#a5adce" + +[[colors.indexed_colors]] +index = 16 +color = "#ef9f76" + +[[colors.indexed_colors]] +index = 17 +color = "#f2d5cf" diff --git a/.config/oh-my-posh/theme.omp.json b/.config/oh-my-posh/theme.omp.json new file mode 100755 index 0000000..90dcd55 --- /dev/null +++ b/.config/oh-my-posh/theme.omp.json @@ -0,0 +1,74 @@ +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "palette": { + "os": "#ACB0BE", + "closer": "p:os", + "pink": "#F4B8E4", + "lavender": "#BABBF1", + "blue": "#8CAAEE" + }, + "blocks": [ + { + "alignment": "left", + "segments": [ + { + "foreground": "p:os", + "style": "plain", + "template": "{{.Icon}} ", + "type": "os" + }, + { + "foreground": "p:blue", + "style": "plain", + "template": "{{ .UserName }}@{{ .HostName }} ", + "type": "session" + }, + { + "foreground": "p:pink", + "properties": { + "folder_icon": "..\ue5fe..", + "home_icon": "~", + "style": "agnoster_short" + }, + "style": "plain", + "template": "{{ .Path }} ", + "type": "path" + }, + { + "foreground": "p:lavender", + "properties": { + "branch_icon": "\ue725 ", + "cherry_pick_icon": "\ue29b ", + "commit_icon": "\uf417 ", + "fetch_status": false, + "fetch_upstream_icon": false, + "merge_icon": "\ue727 ", + "no_commits_icon": "\uf0c3 ", + "rebase_icon": "\ue728 ", + "revert_icon": "\uf0e2 ", + "tag_icon": "\uf412 " + }, + "template": "{{ .HEAD }} ", + "style": "plain", + "type": "git" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "segments": [ + { + "style": "plain", + "foreground": "p:closer", + "template": "\uf105", + "type": "text" + } + ], + "type": "prompt", + "newline": true + } + ], + "final_space": true, + "version": 3 +} diff --git a/.gitconfig b/.gitconfig index 5596445..1c407a6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -3,3 +3,5 @@ name = wholteza [credential] helper = store --file ~/.git-credentials +[init] + defaultBranch = main