From 904482588e22914e6281120028d023f2c6e3c5b2 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Wed, 6 Sep 2017 01:19:27 -0400 Subject: [PATCH 1/7] Add control center fix and a .profile file --- install.sh | 1 + run/.profile | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 run/.profile diff --git a/install.sh b/install.sh index 29e2f9c..53dd5eb 100755 --- a/install.sh +++ b/install.sh @@ -20,6 +20,7 @@ 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/.bashrc" ~ ln -sfv "$DOTFILES_DIR/git/.gitconfig" ~ ln -sfv "$DOTFILES_DIR/system/.vimrc" ~ diff --git a/run/.profile b/run/.profile new file mode 100644 index 0000000..1f04575 --- /dev/null +++ b/run/.profile @@ -0,0 +1,23 @@ +# ~/.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 From 32257cb7645bf6e1378c6c62866118f9b79c14e8 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Thu, 7 Sep 2017 12:02:46 -0400 Subject: [PATCH 2/7] Add colour to man pages --- run/.profile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/run/.profile b/run/.profile index 1f04575..6b82b54 100644 --- a/run/.profile +++ b/run/.profile @@ -21,3 +21,11 @@ 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" From cd126ec0deb11bb771a28eee8c39fb6fce0fbb11 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Wed, 13 Sep 2017 14:48:44 -0400 Subject: [PATCH 3/7] Add xprofile and path bits for rofi --- install.sh | 1 + run/.bashrc | 3 +++ run/.profile | 5 +++++ run/.xprofile | 6 ++++++ 4 files changed, 15 insertions(+) create mode 100644 run/.xprofile diff --git a/install.sh b/install.sh index 53dd5eb..7e22da5 100755 --- a/install.sh +++ b/install.sh @@ -21,6 +21,7 @@ git clone https://github.com/pyenv/pyenv.git ~/.pyenv 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/git/.gitconfig" ~ ln -sfv "$DOTFILES_DIR/system/.vimrc" ~ diff --git a/run/.bashrc b/run/.bashrc index e37033b..968e4ef 100755 --- a/run/.bashrc +++ b/run/.bashrc @@ -183,3 +183,6 @@ setxkbmap dvorak 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/.profile b/run/.profile index 6b82b54..8d8a806 100644 --- a/run/.profile +++ b/run/.profile @@ -29,3 +29,8 @@ 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 From a8e4bc4107068e266d8a5aece4a930ca10eff168 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Wed, 13 Sep 2017 14:49:27 -0400 Subject: [PATCH 4/7] Tweak to i3 status to remove load --- .i3/i3status.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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_ { From 2b25dab098672af43b4600758cf4f1f14eae3d7c Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Tue, 17 Oct 2017 09:51:40 -0400 Subject: [PATCH 5/7] Update to nextcloud and assume dotfiles are installed first --- .i3/config | 2 +- install.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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/install.sh b/install.sh index 7e22da5..8d9b29c 100755 --- a/install.sh +++ b/install.sh @@ -9,6 +9,9 @@ export EXTRA_DIR [ -d "$DOTFILES_DIR/.git" ] && git --work-tree="$DOTFILES_DIR" --git-dir="$DOTFILES_DIR/.git" pull origin master +### 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 From 95041c5df0ed67b87f67f25c7ca84a5c4ddd55d2 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Tue, 17 Oct 2017 09:59:43 -0400 Subject: [PATCH 6/7] Shiftwidth to 2 because nicer! --- system/.vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From aa1161f7d5d531f6847a9990ed6729db98d62660 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Thu, 19 Oct 2017 21:56:08 -0400 Subject: [PATCH 7/7] Truly Random feh and proper nemo alias --- .fehbg | 2 +- run/.bashrc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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/run/.bashrc b/run/.bashrc index 968e4ef..aba09b5 100755 --- a/run/.bashrc +++ b/run/.bashrc @@ -186,3 +186,5 @@ eval "$(pyenv init -)" export PATH="$PATH:$HOME/.local/bin" export PATH="$PATH:/opt/trello:/opt/pycharm/bin" export XDG_CURRENT_DESKTOP=GNOME + +alias nemo='nemo --no-desktop'