From 727ef7f81cf4186229e7858755642e6e9fa7574a Mon Sep 17 00:00:00 2001 From: pt Date: Sun, 3 May 2020 00:27:25 -0400 Subject: [PATCH] initial --- .bashrc | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .gitignore | 1 + .psqlrc | 3 ++ .tmux.conf | 1 + .vimrc | 24 +++++++++++ setup.sh | 80 ++++++++++------------------------ 6 files changed, 175 insertions(+), 58 deletions(-) create mode 100644 .bashrc create mode 100644 .gitignore create mode 100644 .psqlrc create mode 100644 .tmux.conf create mode 100644 .vimrc mode change 100644 => 100755 setup.sh diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..887a0a9 --- /dev/null +++ b/.bashrc @@ -0,0 +1,124 @@ +# ~/.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*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# 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) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +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 + # (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\]\$ ' +else + 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" + ;; +*) + ;; +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' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +alias ll='ls -alFh' +alias la='ls -A' +alias l='ls -CF' + +# 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 + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + +source /home/pt/.config/broot/launcher/bash/br +EDITOR=/usr/bin/vim.basic +IPTOKEN="6ac0a563fc06ab" + +export NVM_DIR="/home/pt/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.swp diff --git a/.psqlrc b/.psqlrc new file mode 100644 index 0000000..9843a2c --- /dev/null +++ b/.psqlrc @@ -0,0 +1,3 @@ +-- Switch pagers with :x and :xx commands +\set x '\\setenv PAGER less' +\set xx '\\setenv PAGER \'pspg -bX --no-mouse\'' diff --git a/.tmux.conf b/.tmux.conf new file mode 100644 index 0000000..fe88266 --- /dev/null +++ b/.tmux.conf @@ -0,0 +1 @@ +set -g default-terminal 'screen-256color' diff --git a/.vimrc b/.vimrc new file mode 100644 index 0000000..f65664a --- /dev/null +++ b/.vimrc @@ -0,0 +1,24 @@ +set nocompatible +filetype off + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() +" let Vundle manage Vundle, required +Plugin 'gmarik/Vundle.vim' +Plugin 'vim-airline/vim-airline' +Plugin 'scrooloose/nerdtree' +Plugin 'tpope/vim-fugitive' +Plugin 'edkolev/tmuxline.vim' +"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'} +" All of your Plugins must be added before the following line +call vundle#end() " required +filetype plugin indent on " required + +map j +map k +map h +map l +let NERDTreeShowHidden=1 +set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab +colorscheme desert diff --git a/setup.sh b/setup.sh old mode 100644 new mode 100755 index 2f06e00..381fccf --- a/setup.sh +++ b/setup.sh @@ -1,65 +1,29 @@ #!/bin/bash -############################ -# .make.sh -# This script creates symlinks from the home directory to any desired dotfiles in ~/dotfiles -############################ +# outcome: replace existing dot files with symlinks pointing to new version controlled files -########## Variables +# setup folder pointers and target files -dir=~/dotfiles # dotfiles directory -olddir=~/dotfiles_old # old dotfiles backup directory -files="bashrc vimrc vim zshrc oh-my-zsh private scrotwm.conf Xresources" # list of files/folders to symlink in homedir +dir=~/linux_user_setup +olddir=~/linux_user_setup_restore +files=".bashrc .vimrc .tmux.conf .psqlrc" -########## +# create the resore directory if it doesn't already exist -# create dotfiles_old in homedir -echo -n "Creating $olddir for backup of any existing dotfiles in ~ ..." -mkdir -p $olddir -echo "done" - -# change to the dotfiles directory -echo -n "Changing to the $dir directory ..." -cd $dir -echo "done" - -# move any existing dotfiles in homedir to dotfiles_old directory, then create symlinks from the homedir to any files in the ~/dotfiles directory specified in $files -for file in $files; do - echo "Moving any existing dotfiles from ~ to $olddir" - mv ~/.$file ~/dotfiles_old/ - echo "Creating symlink to $file in home directory." - ln -s $dir/$file ~/.$file -done - -install_zsh () { -# Test to see if zshell is installed. If it is: -if [ -f /bin/zsh -o -f /usr/bin/zsh ]; then - # Clone my oh-my-zsh repository from GitHub only if it isn't already present - if [[ ! -d $dir/oh-my-zsh/ ]]; then - git clone http://github.com/robbyrussell/oh-my-zsh.git - fi - # Set the default shell to zsh if it isn't currently set to zsh - if [[ ! $(echo $SHELL) == $(which zsh) ]]; then - chsh -s $(which zsh) - fi -else - # If zsh isn't installed, get the platform of the current machine - platform=$(uname); - # If the platform is Linux, try an apt-get to install zsh and then recurse - if [[ $platform == 'Linux' ]]; then - if [[ -f /etc/redhat-release ]]; then - sudo yum install zsh - install_zsh - fi - if [[ -f /etc/debian_version ]]; then - sudo apt-get install zsh - install_zsh - fi - # If the platform is OS X, tell the user to install zsh :) - elif [[ $platform == 'Darwin' ]]; then - echo "Please install zsh, then re-run this script!" - exit - fi +if [ ! -d $olddir ] +then + mkdir $olddir fi -} -install_zsh \ No newline at end of file +# loop through each target file, move it and create a symlink to the replacements + +for file in $files +do + #if the file is already a symlink then do nothing + if [ ! -L "$file"] + then + echo "moving $file to $olddir" + mv ~/$file $olddir + echo "snapping $file to be a new symlink to version controlled file in $dir" + ln -s $dir/$file ~/$file + fi +done