diff options
| -rw-r--r-- | .bashrc | 51 | ||||
| -rw-r--r-- | .config/kitty/kitty.conf | 2 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 2 | ||||
| -rw-r--r-- | .vim/vimrc | 147 |
4 files changed, 21 insertions, 181 deletions
@@ -1,9 +1,12 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples +# __ _ _ +# ___ __ _ / _| ___ | |__ __ _| |__ ___ +# / __| / _' | |_ / _ \| _ \ / _' | _ \ / _ \ +# | |__ / (_| | _| __/| |_) / (_| | |_) | __/ +# \___|\___._/_| \___||____/\___._/____/ \___/ +# -# EDITOR='emacsclient -c' -PATH="/usr/local/lib:$HOME/.cargo/bin:$HOME/.emacs.d/bin${PATH:+:${PATH}}" +# Add various paths +export PATH="$PATH:usr/local/lib:$HOME/.cargo/bin" # Path for Android Development export ANDROID_HOME=$HOME/Android/Sdk @@ -12,6 +15,8 @@ export PATH=$PATH:$ANDROID_HOME/tools export PATH=$PATH:$ANDROID_HOME/tools/bin export PATH=$PATH:$ANDROID_HOME/platform-tools +export LC_ALL=en_US.UTF-8 + # If not running interactively, don't do anything case $- in *i*) ;; @@ -37,11 +42,9 @@ HISTFILESIZE=2000 # update the values of LINES and COLUMNS. shopt -s checkwinsize - # Enable globbing hidden/dot files (.filename). shopt -s dotglob - # If set, the pattern "**" used in a pathname expansion context will # match all files and zero or more directories and subdirectories. #shopt -s globstar @@ -59,11 +62,6 @@ case "$TERM" in xterm-color|*-256color) color_prompt=yes;; esac -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#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 @@ -91,23 +89,16 @@ xterm*|rxvt*) ;; esac - # enable colors eval "`dircolors -b ~/.dircolors`" # colored GCC warnings and errors # export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' - # Add an "alert" alias for long running commands. Use like so: # sleep 10; alert alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases fi @@ -123,29 +114,25 @@ if ! shopt -oq posix; then fi fi -neofetch - -##----------------------------------------------------- -## synth-shell-prompt.sh -if [ -f /home/cafebabe/.config/synth-shell/synth-shell-prompt.sh ] && [ -n "$( echo $- | grep i )" ]; then - source /home/cafebabe/.config/synth-shell/synth-shell-prompt.sh +## Powerline +if [ -f /usr/share/powerline/bindings/bash/powerline.sh ]; then + powerline-daemon -q + POWERLINE_BASH_CONTINUATION=1 + POWERLINE_BASH_SELECT=1 + source /usr/share/powerline/bindings/bash/powerline.sh fi - - - # Generated for envman. Do not edit. [ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh" - - - +# fzf configs [ -f ~/.fzf.bash ] && source ~/.fzf.bash export FZF_DEFAULT_OPS="--extended" export FZF_DEFAULT_COMMAND="fd --type f" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" - # BEGIN_KITTY_SHELL_INTEGRATION if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi # END_KITTY_SHELL_INTEGRATION + +neofetch diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index a6297ba..dab5df6 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -24,7 +24,7 @@ bold_italic_font auto #: italic_font Operator Mono Book Italic #: bold_italic_font Operator Mono Medium Italic -font_size 10.0 +font_size 11.0 #: Font size (in pts) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index fbe3caf..29ea4a3 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -2,7 +2,7 @@ -- ___ __ _ / _| ___ | |__ __ _| |__ ___ -- / __| / _' | |_ / _ \| _ \ / _' | _ \ / _ \ -- | |__ / (_| | _| __/| |_) / (_| | |_) | __/ --- \___|\___._|_| \___||____/\___._|____/ \___/ +-- \___|\___._/_| \___||____/\___._/____/ \___/ -- -- Personal vim configuration of cafebabe diff --git a/.vim/vimrc b/.vim/vimrc deleted file mode 100644 index d241ab6..0000000 --- a/.vim/vimrc +++ /dev/null @@ -1,147 +0,0 @@ -" __ _ _ -" ___ __ _ / _| ___ | |__ __ _| |__ ___ -" / __| / _' | |_ / _ \| _ \ / _' | _ \ / _ \ -" | |__ / (_| | _| __/| |_) / (_| | |_) | __/ -" \___|\___._|_| \___||____/\___._|____/ \___/ -" -" Filename: vimrc - -" General Settings {{{{{{ - -filetype plugin indent on -syntax enable -set nocompatible -set modeline -set modelines=5 -set nobackup -set nowritebackup -set updatetime=300 -set hidden -set noswapfile -set laststatus=2 -set shortmess+=c - -let g:markdown_fenced_languages = ['javascript', 'js=javascript', 'json=javascript'] - -let $RTP=split(&runtimepath, ',')[0] -let $RC="$HOME/.vim/vimrc" - -" }}}}}} - -" Plugins {{{ - -call plug#begin('~/.vim/plugged') - -source ~/.config/vim/plugins/ale.vim -source ~/.config/vim/plugins/coc.vim -source ~/.config/vim/plugins/commentary.vim -source ~/.config/vim/plugins/dirvish.vim -source ~/.config/vim/plugins/gitbranch.vim -source ~/.config/vim/plugins/javascript.vim -source ~/.config/vim/plugins/lightline.vim -source ~/.config/vim/plugins/maximizer.vim -source ~/.config/vim/plugins/onedark.vim -source ~/.config/vim/plugins/polyglot.vim - -call plug#end() - - -" }}} - -" Colors {{{ - -if (has("termguicolors")) - set termguicolors -endif - -" joshdick/onedark.vim -colorscheme onedark - -" }}} - -" Tabs and Spaces {{{ - -set autoindent -set smartindent -set expandtab -set tabstop=4 -set shiftwidth=4 - -" }}} - -" File Find {{{ - -" Search down into subfolders -set path+=~/Scripts/**,~/Documents/** -set wildmenu - -" }}} - -" UI {{{ - -set number -set relativenumber -set cursorline -set showcmd -set cmdheight=1 -set completeopt=menuone,noinsert,noselect -set splitright -set splitbelow -set ignorecase -set smartcase -set showmatch -set signcolumn=yes -set incsearch -set diffopt+=vertical -set foldenable -set foldlevelstart=10 -set foldnestmax=10 -set foldmethod=marker - -" }}} - -" Commands {{{ - -" Use ^] to jump to tag under cursor -" Use g^] for ambiguous tags -" Use ^t to jump back up the tag stack -command! MakeTags !ctags -R * - -" }}} - -" Keybindings {{{ - -let mapleader="\<space>" - -" Quick navigation between splits -nmap <silent> <c-h> <c-w>h -nmap <silent> <c-j> <c-w>j -nmap <silent> <c-k> <c-w>k -nmap <silent> <c-l> <c-w>l - -" Delete all buffers -nmap <leader>Q :bufdo bdelete<CR> - -nmap <leader>ve :edit $MYVIMRC<CR> -nmap <leader>vr :source $MYVIMRC <bar> :doautocmd BufRead<CR> - -nnoremap <leader>m :MaximizerToggle!<CR> -nnoremap <leader>F :ALEFix<CR> -nnoremap <leader>d :cd %:p:h<CR>:pwd<CR> - -" Copy & Paste with system-clipboard -vnoremap <c-c> "+y -nnoremap <c-v> "+p - -" Quickly escape to normal mode -imap jj <Esc> - -" Allow gf to open non-existent files -map gf :edit <cfile><CR> - -" Open the current file in the default program -nmap <leader>x :!xdg-open %<CR><CR> - -" }}} - -" vim:foldlevel=0 |