From 2aad7fe8e758d4d4938c891945e563224499e6c4 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Tue, 29 May 2018 12:58:52 -0400 Subject: [PATCH 1/4] add git lfs --- git/.gitconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/git/.gitconfig b/git/.gitconfig index d8c4819..996fbfb 100755 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -7,8 +7,3 @@ autostash = true [core] editor = vim -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true From dea3e7362b3b38689187fbcde1b2ca56898a62ae Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Tue, 29 May 2018 13:00:52 -0400 Subject: [PATCH 2/4] Add Screen Layout to dotfiles --- .screenlayout/home_desktop.sh | 2 ++ .screenlayout/lyrical.sh | 2 ++ 2 files changed, 4 insertions(+) create mode 100755 .screenlayout/home_desktop.sh create mode 100755 .screenlayout/lyrical.sh diff --git a/.screenlayout/home_desktop.sh b/.screenlayout/home_desktop.sh new file mode 100755 index 0000000..d6edb9d --- /dev/null +++ b/.screenlayout/home_desktop.sh @@ -0,0 +1,2 @@ +#!/bin/sh +xrandr --output DP-1 --off --output HDMI-1 --mode 3840x2160 --pos 0x0 --rotate normal --output HDMI-2 --mode 2560x1440_24.00 --pos 3840x0 --rotate normal diff --git a/.screenlayout/lyrical.sh b/.screenlayout/lyrical.sh new file mode 100755 index 0000000..d6edb9d --- /dev/null +++ b/.screenlayout/lyrical.sh @@ -0,0 +1,2 @@ +#!/bin/sh +xrandr --output DP-1 --off --output HDMI-1 --mode 3840x2160 --pos 0x0 --rotate normal --output HDMI-2 --mode 2560x1440_24.00 --pos 3840x0 --rotate normal From 40a7c555032787c8a1e0b8cf291f35236ca3a84f Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Tue, 29 May 2018 15:47:29 -0400 Subject: [PATCH 3/4] Latest changes for Ubuntu 18 --- .screenlayout/lyrical.sh | 4 +++- install.sh | 4 +++- run/.bashrc | 4 ++-- system/.vimrc | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.screenlayout/lyrical.sh b/.screenlayout/lyrical.sh index d6edb9d..0cef9c3 100755 --- a/.screenlayout/lyrical.sh +++ b/.screenlayout/lyrical.sh @@ -1,2 +1,4 @@ #!/bin/sh -xrandr --output DP-1 --off --output HDMI-1 --mode 3840x2160 --pos 0x0 --rotate normal --output HDMI-2 --mode 2560x1440_24.00 --pos 3840x0 --rotate normal +xrandr --newmode "2560x1440_24.00" 113.75 2560 2648 2904 3248 1440 1443 1448 1463 -hsync +vsync +xrandr --addmode HDMI-2 2560x1440_24.00 +xrandr --output DP-1 --off --output HDMI-1 --primary --mode 3840x2160 --pos 0x0 --rotate normal --output HDMI-2 --mode 2560x1440_24.00 --pos 3840x0 --rotate normal diff --git a/install.sh b/install.sh index a120ce0..ab99d39 100755 --- a/install.sh +++ b/install.sh @@ -13,7 +13,7 @@ export EXTRA_DIR mkdir -p ~/apps ### install packages -sudo apt-get install -y -f python-pip python-dev powerline +sudo apt-get install -y -f python-pip python-dev powerline arandr ## install kryptonite curl https://krypt.co/kr | sh @@ -33,7 +33,9 @@ ln -sfv ~/.vim/bundle/vimspectr/shell ~/.vimspectr-shell ln -sfv "$DOTFILES_DIR/run/.profile" ~ ln -sfv "$DOTFILES_DIR/run/.xprofile" ~ ln -sfv "$DOTFILES_DIR/run/.bashrc" ~ +mkdir ~/bin ln -sfv "$DOTFILES_DIR/system/.bruise" ~/bin/bruise +ln -sfv "$DOTFILES_DIR/.screenlayout" ~ ln -sfv "$DOTFILES_DIR/system/.keybrightness" ~/bin/keybrightness ln -sfv "$DOTFILES_DIR/git/.gitconfig" ~ ln -sfv "$DOTFILES_DIR/system/.vimrc" ~ diff --git a/run/.bashrc b/run/.bashrc index 55d831b..09c8d0e 100755 --- a/run/.bashrc +++ b/run/.bashrc @@ -183,11 +183,11 @@ setxkbmap dvorak export PYENV_ROOT="$HOME/.pyenv" export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" -source ~/apps/bruise +source ~/bin/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' eval `dircolors ~/.vimspectr-shell/dircolors` -[ -n "$PS1" ] && sh ~/.vimspectr-shell/vimspectr90wflat-dark +[ -n "$PS1" ] && sh ~/.vimspectr-shell/vimspectr90-dark diff --git a/system/.vimrc b/system/.vimrc index f38774f..794e613 100755 --- a/system/.vimrc +++ b/system/.vimrc @@ -17,7 +17,7 @@ Plugin 'nightsense/vimspectr' call vundle#end() " Themes from https://github.com/nightsense/vimspectr -colorscheme vimspectr90wflat-dark +colorscheme vimspectr90-dark "let g:vimspectr60flat_dark_StatusLine = 'orange' "execute pathogen#infect('bundle/{}') From 70a1bf78b50797379c38806f4252e36e9d8a5fb3 Mon Sep 17 00:00:00 2001 From: Alexander Hosking Date: Tue, 29 May 2018 16:01:49 -0400 Subject: [PATCH 4/4] Update login sequence --- .i3/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.i3/config b/.i3/config index c96b81e..5f539fb 100755 --- a/.i3/config +++ b/.i3/config @@ -11,8 +11,8 @@ ## Set Dvorak, because, SMRT exec "setxkbmap dvorak" +exec /home/ahosking/.screenlayout/lyrical.sh exec --no-startup-id ~/.fehbg -exec /home/ahosking/.screenlayout/home_desktop.sh exec --no-startup-id nm-applet exec --no-startup-id nextcloud exec --no-startup-id insync start