diff --git a/.fehbg b/.fehbg index 8a2bcc5..aaf6dc6 100755 --- a/.fehbg +++ b/.fehbg @@ -1,2 +1,2 @@ #!/bin/sh -feh --randomize --recursive --bg-scale ~/wallpaper/wallpaper +feh --bg-scale --no-fehbg --recursive --randomize ~/wallpaper/wallpaper diff --git a/.i3/config b/.i3/config index 0c34518..f14ed3e 100755 --- a/.i3/config +++ b/.i3/config @@ -14,7 +14,7 @@ exec "setxkbmap dvorak" exec --no-startup-id ~/.fehbg exec /home/ahosking/.screenlayout/home_desktop.sh exec --no-startup-id nm-applet -exec --no-startup-id owncloud +exec --no-startup-id nextcloud exec --no-startup-id insync start set $mod Mod4 diff --git a/.i3/i3status.conf b/.i3/i3status.conf index 2b31adc..0c9cc55 100755 --- a/.i3/i3status.conf +++ b/.i3/i3status.conf @@ -21,7 +21,7 @@ order += "run_watch VPN" #order += "ethernet _first_" order += "battery 0" order += "battery 1" -order += "load" +#order += "load" order += "tztime local" wireless _first_ { diff --git a/install.sh b/install.sh index 01ee32c..c8cccae 100755 --- a/install.sh +++ b/install.sh @@ -11,6 +11,10 @@ export EXTRA_DIR #local tools mkdir -p ~/apps + +### install packages +sudo apt-get install -y -f python-pip python-dev powerline + #vim backup folders mkdir -p ~/.vim/{backup_files,swap_files,undo_files} #install vundle @@ -22,6 +26,8 @@ git clone https://github.com/pyenv/pyenv.git ~/.pyenv # Bunch of symlinks ln -sfv ~/dotfiles ~/.dotfiles #ln -sfv "$DOTFILES_DIR/run/.bash_profile" ~ +ln -sfv "$DOTFILES_DIR/run/.profile" ~ +ln -sfv "$DOTFILES_DIR/run/.xprofile" ~ ln -sfv "$DOTFILES_DIR/run/.bashrc" ~ ln -sfv "$DOTFILES_DIR/run/bruise" ~/apps/bruise ln -sfv "$DOTFILES_DIR/git/.gitconfig" ~ diff --git a/run/.bashrc b/run/.bashrc index 1276fe0..b94bb8b 100755 --- a/run/.bashrc +++ b/run/.bashrc @@ -184,3 +184,8 @@ export PYENV_ROOT="$HOME/.pyenv" export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" source ~/apps/bruise +export PATH="$PATH:$HOME/.local/bin" +export PATH="$PATH:/opt/trello:/opt/pycharm/bin" +export XDG_CURRENT_DESKTOP=GNOME + +alias nemo='nemo --no-desktop' diff --git a/run/.profile b/run/.profile new file mode 100644 index 0000000..8d8a806 --- /dev/null +++ b/run/.profile @@ -0,0 +1,36 @@ +# ~/.profile: executed by the command interpreter for login shells. +# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login +# exists. +# see /usr/share/doc/bash/examples/startup-files for examples. +# the files are located in the bash-doc package. + +# the default umask is set in /etc/profile; for setting the umask +# for ssh logins, install and configure the libpam-umask package. +#umask 022 + +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + +# set PATH so it includes user's private bin directories +PATH="$HOME/bin:$HOME/.local/bin:$PATH" +export PATH=$PATH:/opt/trello +#for i3 to use gnome control center +export XDG_CURRENT_DESKTOP=GNOME + +# Colored Man Pages! +export LESS_TERMCAP_md=$'\e'"[1;36m" +export LESS_TERMCAP_me=$'\e'"[0m" +export LESS_TERMCAP_se=$'\e'"[0m" +export LESS_TERMCAP_so=$'\e'"[1;40;92m" +export LESS_TERMCAP_ue=$'\e'"[0m" +export LESS_TERMCAP_us=$'\e'"[1;32m" + +## Add Applications to Path +export PATH="$HOME/bin:$HOME/.local/bin:/opt:$PATH" +export XDG_CURRENT_DESKTOP=GNOME + diff --git a/run/.xprofile b/run/.xprofile new file mode 100644 index 0000000..a3ea357 --- /dev/null +++ b/run/.xprofile @@ -0,0 +1,6 @@ +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" +export PATH="$PATH:$HOME/.local/bin" +export PATH="$PATH:/opt/trello:/opt/pycharm/bin" +export XDG_CURRENT_DESKTOP=GNOME diff --git a/run/bruise b/run/bruise old mode 100644 new mode 100755 index fb2dc9c..046ada8 --- a/run/bruise +++ b/run/bruise @@ -61,6 +61,25 @@ function bruisemake() { pip install -r requirements.txt fi } +function bruise3make() { + if [ ! -z $2 ]; then + export PATH=$2:$PATH + fi + if [ -z $VENV_TYPE ]; then + echo "You are not in a repository root" + return 1 + fi + if [ $VENV_TYPE == "python" ]; then + if [ ! -z $1 ]; then + VENV_PATH=$_VENV_BASE/python/$1 + fi + if [ ! -d $VENV_PATH ]; then + virtualenv -p python3 --no-site-packages $VENV_PATH + fi + source $VENV_PATH/bin/activate + pip install -r requirements.txt + fi +} function __bruise() { # pyenv support or not ;) if [ -z $PYTHON_VERSION ]; then diff --git a/system/.vimrc b/system/.vimrc index 3c3b6a8..38017c0 100755 --- a/system/.vimrc +++ b/system/.vimrc @@ -27,7 +27,7 @@ set ruler " Always show info along bottom. set autoindent " auto-indent set tabstop=4 " tab spacing set softtabstop=4 " unify -set shiftwidth=4 " indent/outdent by 4 columns +set shiftwidth=2 " indent/outdent by 2 columns set shiftround " always indent/outdent to the nearest tabstop set expandtab " use spaces instead of tabs set smarttab " use tabs at the start of a line, spaces elsewhere