From 8d0d33611fb23894bd441ec150751593b23e509c Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 3 Apr 2017 13:06:06 -0500 Subject: [PATCH 1/7] Changes to provisioning scripts --- de/xresources | 6 +++--- os-specific/arch-linux/provisioning/1-pacaur.bash | 4 ++-- os-specific/arch-linux/provisioning/2-essentials.bash | 2 +- os-specific/arch-linux/provisioning/3-extras.bash | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/de/xresources b/de/xresources index bebf3a6..2fd34d4 100755 --- a/de/xresources +++ b/de/xresources @@ -1,6 +1,6 @@ -*font: xft:artwiz lemon-10 -*faceName: xft:artwiz lemon-10 -*boldFont: xft:artwiz lemon-10 +*font: xft:xos4 Terminus-12 +*faceName: xft:xos4 Terminus-12 +*boldFont: xft:xos4 Terminus-12 *letterSpace: 0 *scrollBar: false *cursorUnderline: true diff --git a/os-specific/arch-linux/provisioning/1-pacaur.bash b/os-specific/arch-linux/provisioning/1-pacaur.bash index 2b5c932..60ce362 100755 --- a/os-specific/arch-linux/provisioning/1-pacaur.bash +++ b/os-specific/arch-linux/provisioning/1-pacaur.bash @@ -16,12 +16,12 @@ git clone https://aur.archlinux.org/pacaur.git "$REPOSITORY_PATH/pacaur" # build and install cower cd "$REPOSITORY_PATH/cower" -makepkg -i --noconfirm --noedit +makepkg -i --noconfirm cd - # build and install pacaur cd "$REPOSITORY_PATH/pacaur" -makepkg -i --noconfirm --noedit +makepkg -i --noconfirm cd - # once installed, let the package manager manage itself and its dependencies diff --git a/os-specific/arch-linux/provisioning/2-essentials.bash b/os-specific/arch-linux/provisioning/2-essentials.bash index abb8fbf..2b544d9 100755 --- a/os-specific/arch-linux/provisioning/2-essentials.bash +++ b/os-specific/arch-linux/provisioning/2-essentials.bash @@ -35,7 +35,7 @@ pacaur -S \ samba \ pulseaudio-ctl \ alsa-plugins \ - unclutter-xfixes-git gtk-theme-arc gtk-engine-murrine xorg-server-devel \ + unclutter-xfixes-git gtk-engine-murrine xorg-server-devel \ bspwm-git sxhkd-git xdo-git \ siji-git terminus-font ttf-monaco gohufont artwiz-fonts phallus-fonts-git \ --noconfirm --noedit diff --git a/os-specific/arch-linux/provisioning/3-extras.bash b/os-specific/arch-linux/provisioning/3-extras.bash index e623c40..05ee5b3 100755 --- a/os-specific/arch-linux/provisioning/3-extras.bash +++ b/os-specific/arch-linux/provisioning/3-extras.bash @@ -1,11 +1,11 @@ #!/usr/bin/env bash pacaur -S \ - gtk-theme-arc \ + gtk-theme-arc-git \ + xorg-drivers \ elementary-icon-theme \ lemonbar-xft-git \ thunar thunar-volman gvfs \ - thunar-shares-plugin \ gvfs-smb \ ttf-opensans ttf-dejavu \ avr-libc avr-gcc dfu-programmer dfu-util \ From 9d23ba7ac1c3cd5d288802d580fc1e6732b8158c Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 3 Apr 2017 13:16:26 -0500 Subject: [PATCH 2/7] Modify app launcher --- de/app-launcher | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/de/app-launcher b/de/app-launcher index a82d485..5342962 100755 --- a/de/app-launcher +++ b/de/app-launcher @@ -1,9 +1,9 @@ #!/usr/bin/env bash -LAUNCHER_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\(.*\)\-.*$/\1/p' | head -n 1) -LAUNCHER_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\(.*\)$/\1/p' | head -n 1) -HIGHLIGHT_COLOR=$(xrdb -query | sed -ne 's/.*color1*:\s*\(.*\)$/\1/p' | head -n 1) -BACKGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1/p' | head -n 1) -FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*foreground:\s*\(.*\)$/\1/p' | head -n 1) +LAUNCHER_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\(.*\)\-.*$/\1/p' | head -n 1) +LAUNCHER_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\(.*\)$/\1/p' | head -n 1) +HIGHLIGHT_COLOR=$(xrdb -query | sed -ne 's/.*color1*:\s*\(.*\)$/\1/p' | head -n 1) +BACKGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1/p' | head -n 1) +FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*foreground:\s*\(.*\)$/\1/p' | head -n 1) -rofi -show run -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -lines 16 -width 10 -padding 8 -fuzzy -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR" -separator-style none -hide-scrollbar +rofi -show run -font "$LAUNCHER_FONT $LAUNCHER_FONT_SIZE" -lines 16 -width 25 -padding 8 -fuzzy -bw "$BORDER_WIDTH" -color-enabled -color-window "$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$HIGHLIGHT_COLOR","$BACKGROUND_COLOR" -color-normal "$BACKGROUND_COLOR","$FOREGROUND_COLOR","$BACKGROUND_COLOR","$HIGHLIGHT_COLOR","$FOREGROUND_COLOR" -separator-style none -hide-scrollbar From ae1c8a567efc640c13ae7a9ba8cec1511f8ad48e Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 3 Apr 2017 14:38:53 -0500 Subject: [PATCH 3/7] Adding DE functionality --- de/xprofile | 4 ++ .../arch-linux/provisioning/3-extras.bash | 6 ++- setup | 46 ++++++++++--------- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/de/xprofile b/de/xprofile index a534dac..106680b 100644 --- a/de/xprofile +++ b/de/xprofile @@ -21,6 +21,10 @@ xset r rate 250 80 & # xset s noblank & # xset s off & +# if command -v xss-lock >/dev/null 2>&1; then +# xss-lock -- dm-tool switch-to-greeter & +# fi + if [ -d "/usr/lib/nvidia" ]; then export LD_LIBRARY_PATH=/usr/lib/nvidia fi diff --git a/os-specific/arch-linux/provisioning/3-extras.bash b/os-specific/arch-linux/provisioning/3-extras.bash index 05ee5b3..e5883e3 100755 --- a/os-specific/arch-linux/provisioning/3-extras.bash +++ b/os-specific/arch-linux/provisioning/3-extras.bash @@ -13,7 +13,9 @@ pacaur -S \ gimp \ audacity \ reptyr \ - cmake python2 python2-pip \ - lightdm \ + cmake python python2-pip \ + accountsservice \ + xss-lock \ + lightdm lightdm-gtk-greeter \ polybar-git \ --noconfirm --noedit diff --git a/setup b/setup index db527cd..84c463c 100755 --- a/setup +++ b/setup @@ -31,37 +31,41 @@ fi # TODO: make sure we have an even number, here links=( # desktop environment files - "$dfp/de/bspwmrc" "$XDG_CONFIG_HOME/bspwm/bspwmrc" - "$dfp/de/sxhkdrc" "$XDG_CONFIG_HOME/sxhkd/sxhkdrc" - "$dfp/de/xresources" "$HOME/.Xresources" - "$dfp/de/xinitrc" "$HOME/.xinitrc" - "$dfp/de/xprofile" "$HOME/.xprofile" - "$dfp/common/colors/xresources" "$HOME/.Xresources.colors" - - # bar files - "$dfp/de/bar/polybar-config" "$XDG_CONFIG_HOME/polybar/config" + "$dfp/de/bspwmrc" "$XDG_CONFIG_HOME/bspwm/bspwmrc" + "$dfp/de/sxhkdrc" "$XDG_CONFIG_HOME/sxhkd/sxhkdrc" + "$dfp/de/xresources" "$HOME/.Xresources" + "$dfp/de/xinitrc" "$HOME/.xinitrc" + "$dfp/de/xprofile" "$HOME/.xprofile" + "$dfp/common/colors/xresources" "$HOME/.Xresources.colors" # shell files - "$dfp/shell/bashrc" "$HOME/.bashrc" - "$dfp/shell/bash_profile" "$HOME/.bash_profile" - "$dfp/shell/tmux.conf" "$HOME/.tmux.conf" - "$dfp/shell/tmux-layouts" "$HOME/.tmux/layouts" + "$dfp/shell/bashrc" "$HOME/.bashrc" + "$dfp/shell/bash_profile" "$HOME/.bash_profile" + "$dfp/shell/tmux.conf" "$HOME/.tmux.conf" + "$dfp/shell/tmux-layouts" "$HOME/.tmux/layouts" # text editor files - "$dfp/text-editor/neovim/" "$XDG_CONFIG_HOME/nvim" - "$dfp/text-editor/neovim/" "$HOME/.vim" - "$dfp/text-editor/neovim/init.vim" "$HOME/.vimrc" - "$dfp/common/colors/vim" "$XDG_CONFIG_HOME/nvim/colors/base16-donokai.vim" + "$dfp/text-editor/neovim/" "$XDG_CONFIG_HOME/nvim" + "$dfp/text-editor/neovim/" "$HOME/.vim" + "$dfp/text-editor/neovim/init.vim" "$HOME/.vimrc" + "$dfp/common/colors/vim" "$XDG_CONFIG_HOME/nvim/colors/base16-donokai.vim" # irc files - "$dfp/misc/irssi/" "$HOME/.irssi" - "$dfp/misc/weechat/" "$HOME/.weechat" + "$dfp/misc/irssi/" "$HOME/.irssi" + "$dfp/misc/weechat/" "$HOME/.weechat" + + # gtk configuration files + "$dfp/de/gtk2rs" "$HOME/.gtkrc-2.0" + "$dfp/de/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini" + + # bar files + "$dfp/de/bar/polybar-config" "$XDG_CONFIG_HOME/polybar/config" # neofetch config - "$dfp/misc/neofetch/config" "$HOME/.config/neofetch/config" + "$dfp/misc/neofetch/config" "$HOME/.config/neofetch/config" # git config - "$dfp/misc/git/config" "$HOME/.gitconfig" + "$dfp/misc/git/config" "$HOME/.gitconfig" ) source="" From 20c956e611be87c1d0bd67a18e39fbbf2d097c84 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 3 Apr 2017 14:40:07 -0500 Subject: [PATCH 4/7] Fix lock key shortcut --- de/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/sxhkdrc b/de/sxhkdrc index 66e658e..62cc8b6 100755 --- a/de/sxhkdrc +++ b/de/sxhkdrc @@ -170,7 +170,7 @@ super + space # lock the desktop super + ctrl + shift + l - dm-tool lock + dm-tool switch-to-greeter # $SHELL -c '$DOTFILES_PATH/env/x/screensaver/lock.sh' # spawn gui file explorer From ef7ab70eaa58f7c0bcf44e006d46d557c42a2bb7 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 3 Apr 2017 15:32:36 -0500 Subject: [PATCH 5/7] Lock on suspend --- de/xprofile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/xprofile b/de/xprofile index 106680b..6f686ba 100644 --- a/de/xprofile +++ b/de/xprofile @@ -21,9 +21,9 @@ xset r rate 250 80 & # xset s noblank & # xset s off & -# if command -v xss-lock >/dev/null 2>&1; then -# xss-lock -- dm-tool switch-to-greeter & -# fi +if command -v xss-lock >/dev/null 2>&1; then + xss-lock -- dm-tool switch-to-greeter & +fi if [ -d "/usr/lib/nvidia" ]; then export LD_LIBRARY_PATH=/usr/lib/nvidia From 19511774ee267bffb962bf43949b505c54870f5a Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 3 Apr 2017 15:45:21 -0500 Subject: [PATCH 6/7] Fix GTK theme not working --- de/gtk3settings.ini | 1 + setup | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/de/gtk3settings.ini b/de/gtk3settings.ini index 79142c0..e1271f4 100644 --- a/de/gtk3settings.ini +++ b/de/gtk3settings.ini @@ -2,3 +2,4 @@ gtk-icon-theme-name = elementary gtk-theme-name = Arc-Dark gtk-font-name = Monaco 9 +gtk-application-prefer-dark-theme = true diff --git a/setup b/setup index 84c463c..7ef5ff9 100755 --- a/setup +++ b/setup @@ -50,14 +50,15 @@ links=( "$dfp/text-editor/neovim/init.vim" "$HOME/.vimrc" "$dfp/common/colors/vim" "$XDG_CONFIG_HOME/nvim/colors/base16-donokai.vim" + # gtk configuration files + "$dfp/de/gtk2rc" "$HOME/.gtkrc-2.0" + "$dfp/de/gtk2rc" "$HOME/.gtkrc" + "$dfp/de/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini" + # irc files "$dfp/misc/irssi/" "$HOME/.irssi" "$dfp/misc/weechat/" "$HOME/.weechat" - # gtk configuration files - "$dfp/de/gtk2rs" "$HOME/.gtkrc-2.0" - "$dfp/de/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini" - # bar files "$dfp/de/bar/polybar-config" "$XDG_CONFIG_HOME/polybar/config" From 691dca10c7e789ac52444f58cab77b463209f490 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 3 Apr 2017 15:46:45 -0500 Subject: [PATCH 7/7] Change tmux dev layout to set right column 90 characters wide --- shell/tmux-layouts/dev.tmux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/tmux-layouts/dev.tmux b/shell/tmux-layouts/dev.tmux index bc44a9e..e2a7b87 100644 --- a/shell/tmux-layouts/dev.tmux +++ b/shell/tmux-layouts/dev.tmux @@ -1,5 +1,5 @@ splitw -h -p 50 splitw -v -p 67 splitw -v -p 50 -resize-pane -x 100 +resize-pane -x 90 selectp -L