Merge pull request 'headers' (#1) from headers into main

Reviewed-on: #1
This commit is contained in:
Russell R. 2020-10-02 00:18:23 +00:00
commit cfe43f54f1
5 changed files with 99 additions and 45 deletions

View File

@ -1,7 +1,15 @@
# _ _ _ _
# | |__ __ _ ___| |__ __ _| (_) __ _ ___ ___ ___
# | '_ \ / _` / __| '_ \ / _` | | |/ _` / __|/ _ \/ __|
# _| |_) | (_| \__ \ | | | | (_| | | | (_| \__ \ __/\__ \
# (_)_.__/ \__,_|___/_| |_|___\__,_|_|_|\__,_|___/\___||___/
# |_____|
# some more ls aliases
alias ll='ls -alF'
alias la='ls -A'
alias l='ls -CF'
alias la='ls -a'
# alias l='ls -CF'
# Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert
@ -17,6 +25,8 @@ alias ...='cd ../..'
alias gs='git status'
alias gc='git commit -m'
alias ga='git add'
alias gd='git diff'
alias gac='git commit -a'
# vi and nvim aliases

30
.bashrc
View File

@ -1,7 +1,16 @@
# _ _
# | | | |
# | |__ __ _ ___| |__ _ __ ___
# | '_ \ / _` / __| '_ \| '__/ __|
# _| |_) | (_| \__ \ | | | | | (__
# (_)_.__/ \__,_|___/_| |_|_| \___|
# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples
# If not running interactively, don't do anything
case $- in
*i*) ;;
@ -112,7 +121,7 @@ fi
export GOPATH=$HOME/dev/go
export GOBIN=$HOME/dev/go/bin
export EDITOR=vim
export EDITOR=nvim
# Use the Powerline_go prompt system
function _update_ps1() {
@ -129,18 +138,15 @@ fi
# Add my local /bin to the path
export PATH=/home/drwasabi/.local/bin:$PATH
# cd to my wsl2 home folder
cd ~
# XDG
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_DATA_HOME="$HOME/.local/share"
# Print a lolcat banner
#echo ''
#echo '**************************************************'|lolcat
#cowsay -f tux "Welcome Dr. The system is ready to accept your commands. Have a nice day" | lolcat
#echo '**************************************************'|lolcat
#echo ''
# Set a random banner file to print
# Look in my ascii-art folder, and use shuf to get a randome file name.
BANNERFILE=$(ls ~/mydocs/ascii-art/ | shuf -n 1)
# Then use lolcat to display the colorful ascii art file
lolcat ~/mydocs/ascii-art/$BANNERFILE
@ -148,5 +154,5 @@ lolcat ~/mydocs/ascii-art/$BANNERFILE
/usr/bin/keychain --nogui $HOME/.ssh/id_rsa
source $HOME/.keychain/$HOSTNAME-sh
# Run fish
# fish
# cd to my wsl2 home folder
cd ~

View File

@ -1,3 +1,11 @@
# __ _ _
# _ __ _ __ ___ / _(_) | ___
# | '_ \| '__/ _ \| |_| | |/ _ \
# _| |_) | | | (_) | _| | | __/
# (_) .__/|_| \___/|_| |_|_|\___|
# |_|
# ~/.profile: executed by the command interpreter for login shells.
# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
# exists.

View File

@ -1,25 +1,18 @@
" _ _ __ _
" (_)___ (_) /__ __(_)___ ___
" / / __ \/ / __/ | / / / __ `__ \
" / / / / / / /__| |/ / / / / / / /
" /_/_/ /_/_/\__(_)___/_/_/ /_/ /_/
"
" *************************************************************
" my neovim init.vim config file
" Russell R. Riker (aka: Dr. WaSaBi)
" *************************************************************
set runtimepath^=~/.vim runtimepath+=~/.vim/after
let &packpath = $runtimepath
source ~/.vimrc
" Some of my settings, need to figure out how to do these things for only some
" file types. like txt and mkd file, wouldn't really want this.
set tabstop=4
set expandtab
set number
" Load my basic settings, mappings, etc..
source ~/.config/nvim/nvim-basic-settings.vim
" turn spelling on for text based documents
autocmd FileType tex,latex,markdown setlocal spell spelllang=en_us
" copy to the system clipboard
set clipboard+=unnamedplus
let g:vimwiki_list = [{'path': '~/vimwiki/',
\ 'syntax': 'markdown', 'ext': '.md'}]
" ***********************************************************
" ********************* install pluggins ********************
" ***********************************************************
@ -40,25 +33,10 @@ call plug#begin('~/.vim/plugged')
Plug 'junegunn/fzf.vim' " fuzzy finder
Plug 'airblade/vim-rooter'
Plug 'vimwiki/vimwiki'
Plug 'gertjanreynaert/cobalt2-vim-theme' " added coblt2 theme
call plug#end()
" ***********************************************************
" ****************** basic remap keys ***********************
" ***********************************************************
" remap the split window motion keybindings
" stole these from BrodieRobertson
map <A-h> <C-w>h
map <A-j> <C-w>j
map <A-k> <C-w>k
map <A-l> <C-w>l
" nerdtree file manager
:nmap <silent> <C-D> :NERDTreeToggle<CR>
" buffers
:nnoremap <F5> :buffers<CR>:buffer<Space>
" ***********************************************************
" **************** fzf & ripgrep config *********************
" ***********************************************************

52
nvim-basic-settings.vim Normal file
View File

@ -0,0 +1,52 @@
" _ __ _ __ __ _
" ____ _ __(_)___ ___ / /_ ____ ______(_)____ ________ / /_/ /_(_)___ ____ ______
" / __ \ | / / / __ `__ \______/ __ \/ __ `/ ___/ / ___/_____/ ___/ _ \/ __/ __/ / __ \/ __ `/ ___/
" / / / / |/ / / / / / / /_____/ /_/ / /_/ (__ ) / /__/_____(__ ) __/ /_/ /_/ / / / / /_/ (__ )
" /_/ /_/|___/_/_/ /_/ /_/ /_.___/\__,_/____/_/\___/ /____/\___/\__/\__/_/_/ /_/\__, /____/
" /____/
"
" My basic settings file.
set runtimepath^=~/.vim runtimepath+=~/.vim/after
let &packpath = $runtimepath
source ~/.vimrc
" Some of my settings, need to figure out how to do these things for only some
" file types. like txt and mkd file, wouldn't really want this.
set tabstop=4
set expandtab
set number
" turn spelling on for text based documents
autocmd FileType tex,latex,markdown setlocal spell spelllang=en_us
" copy to the system clipboard
" set clipboard+=unnamedplus
" set the vimwiki folder path and file type
let g:vimwiki_list = [{'path': '~/vimwiki/',
\ 'syntax': 'markdown', 'ext': '.md'}]
" set the colorscheme
colorscheme cobalt2
" ***********************************************************
" ****************** basic remap keys ***********************
" ***********************************************************
" remap the split window motion keybindings
" stole these from BrodieRobertson
map <A-h> <C-w>h
map <A-j> <C-w>j
map <A-k> <C-w>k
map <A-l> <C-w>l
" nerdtree file manager
:nmap <silent> <C-D> :NERDTreeToggle<CR>
" buffers
:nnoremap <F5> :buffers<CR>:buffer<Space>