diff --git a/README.md b/README.md index 7b23ea56..d592ff42 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ # Skeleton Configuration Files -Skeleton configs for ArchLabs user home creation +Skeleton configurations for ArchLabs user home directory creation -Contents of the `home` folder should be copied to `/home/USER/` for existing users -or `/etc/skel/` for new users and/or system builders +The `base/` directory contains generic application configuration +used across all installs, while the `*-home/` directories contain +environment specific configuration. These directories' contents __must__ +be able to be copied over one another into `/etc/skel/` +__without__ overlapping files. diff --git a/home/.Xresources b/base/.Xresources similarity index 100% rename from home/.Xresources rename to base/.Xresources diff --git a/home/.config/compton.conf b/base/.config/compton.conf similarity index 100% rename from home/.config/compton.conf rename to base/.config/compton.conf diff --git a/home/.config/dunst/dunstrc b/base/.config/dunst/dunstrc similarity index 100% rename from home/.config/dunst/dunstrc rename to base/.config/dunst/dunstrc diff --git a/home/.config/fontconfig/fonts.conf b/base/.config/fontconfig/fonts.conf similarity index 100% rename from home/.config/fontconfig/fonts.conf rename to base/.config/fontconfig/fonts.conf diff --git a/home/.config/geany/colorschemes/archlabs-dARK.conf b/base/.config/geany/colorschemes/archlabs-dARK.conf similarity index 100% rename from home/.config/geany/colorschemes/archlabs-dARK.conf rename to base/.config/geany/colorschemes/archlabs-dARK.conf diff --git a/home/.config/geany/colorschemes/archlabs-dark.conf b/base/.config/geany/colorschemes/archlabs-dark.conf similarity index 100% rename from home/.config/geany/colorschemes/archlabs-dark.conf rename to base/.config/geany/colorschemes/archlabs-dark.conf diff --git a/home/.config/geany/colorschemes/archlabs-light.conf b/base/.config/geany/colorschemes/archlabs-light.conf similarity index 100% rename from home/.config/geany/colorschemes/archlabs-light.conf rename to base/.config/geany/colorschemes/archlabs-light.conf diff --git a/home/.config/geany/geany.conf b/base/.config/geany/geany.conf similarity index 100% rename from home/.config/geany/geany.conf rename to base/.config/geany/geany.conf diff --git a/home/.config/gsimplecal/config b/base/.config/gsimplecal/config similarity index 100% rename from home/.config/gsimplecal/config rename to base/.config/gsimplecal/config diff --git a/home/.config/gtk-3.0/settings.ini b/base/.config/gtk-3.0/settings.ini similarity index 100% rename from home/.config/gtk-3.0/settings.ini rename to base/.config/gtk-3.0/settings.ini diff --git a/home/.config/networkmanager-dmenu/config.ini b/base/.config/networkmanager-dmenu/config.ini similarity index 100% rename from home/.config/networkmanager-dmenu/config.ini rename to base/.config/networkmanager-dmenu/config.ini diff --git a/home/.config/nitrogen/bg-saved.cfg b/base/.config/nitrogen/bg-saved.cfg similarity index 100% rename from home/.config/nitrogen/bg-saved.cfg rename to base/.config/nitrogen/bg-saved.cfg diff --git a/home/.config/nitrogen/nitrogen.cfg b/base/.config/nitrogen/nitrogen.cfg similarity index 100% rename from home/.config/nitrogen/nitrogen.cfg rename to base/.config/nitrogen/nitrogen.cfg diff --git a/home/.config/ranger/colorschemes/jinx.py b/base/.config/ranger/colorschemes/jinx.py similarity index 100% rename from home/.config/ranger/colorschemes/jinx.py rename to base/.config/ranger/colorschemes/jinx.py diff --git a/home/.config/ranger/rc.conf b/base/.config/ranger/rc.conf similarity index 100% rename from home/.config/ranger/rc.conf rename to base/.config/ranger/rc.conf diff --git a/home/.config/ranger/rifle.conf b/base/.config/ranger/rifle.conf similarity index 100% rename from home/.config/ranger/rifle.conf rename to base/.config/ranger/rifle.conf diff --git a/home/.config/ranger/scope.sh b/base/.config/ranger/scope.sh similarity index 100% rename from home/.config/ranger/scope.sh rename to base/.config/ranger/scope.sh diff --git a/home/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/base/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from home/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to base/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/home/.gtkrc-2.0 b/base/.gtkrc-2.0 similarity index 100% rename from home/.gtkrc-2.0 rename to base/.gtkrc-2.0 diff --git a/home/.homepage/index.html b/base/.homepage/index.html similarity index 100% rename from home/.homepage/index.html rename to base/.homepage/index.html diff --git a/home/.homepage/res/archlabs02.png b/base/.homepage/res/archlabs02.png similarity index 100% rename from home/.homepage/res/archlabs02.png rename to base/.homepage/res/archlabs02.png diff --git a/home/.homepage/res/light-logo.png b/base/.homepage/res/light-logo.png similarity index 100% rename from home/.homepage/res/light-logo.png rename to base/.homepage/res/light-logo.png diff --git a/home/.homepage/res/logo-dark.png b/base/.homepage/res/logo-dark.png similarity index 100% rename from home/.homepage/res/logo-dark.png rename to base/.homepage/res/logo-dark.png diff --git a/home/.homepage/res/logo.png b/base/.homepage/res/logo.png similarity index 100% rename from home/.homepage/res/logo.png rename to base/.homepage/res/logo.png diff --git a/home/.homepage/script.js b/base/.homepage/script.js similarity index 100% rename from home/.homepage/script.js rename to base/.homepage/script.js diff --git a/home/.homepage/style.css b/base/.homepage/style.css similarity index 100% rename from home/.homepage/style.css rename to base/.homepage/style.css diff --git a/home/.hushlogin b/base/.hushlogin similarity index 100% rename from home/.hushlogin rename to base/.hushlogin diff --git a/home/.vim/colors/jinx.vim b/base/.vim/colors/jinx.vim similarity index 100% rename from home/.vim/colors/jinx.vim rename to base/.vim/colors/jinx.vim diff --git a/home/.vimrc b/base/.vimrc similarity index 100% rename from home/.vimrc rename to base/.vimrc diff --git a/home/.xinitrc b/base/.xinitrc similarity index 100% rename from home/.xinitrc rename to base/.xinitrc diff --git a/home/.xprofile b/base/.xprofile similarity index 100% rename from home/.xprofile rename to base/.xprofile diff --git a/home/bin/check-network b/base/bin/check-network similarity index 100% rename from home/bin/check-network rename to base/bin/check-network diff --git a/home/bin/polybar-trash b/base/bin/polybar-trash similarity index 100% rename from home/bin/polybar-trash rename to base/bin/polybar-trash diff --git a/home/bin/rofi_run b/base/bin/rofi_run similarity index 100% rename from home/bin/rofi_run rename to base/bin/rofi_run diff --git a/home/bin/toggle.sh b/base/bin/toggle.sh similarity index 100% rename from home/bin/toggle.sh rename to base/bin/toggle.sh diff --git a/home/bin/updates.sh b/base/bin/updates.sh similarity index 100% rename from home/bin/updates.sh rename to base/bin/updates.sh diff --git a/home/.config/bspwm/bspwmrc b/bspwm-home/.config/bspwm/bspwmrc similarity index 100% rename from home/.config/bspwm/bspwmrc rename to bspwm-home/.config/bspwm/bspwmrc diff --git a/home/.config/sxhkd/sxhkdrc b/bspwm-home/.config/sxhkd/sxhkdrc similarity index 100% rename from home/.config/sxhkd/sxhkdrc rename to bspwm-home/.config/sxhkd/sxhkdrc diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart deleted file mode 100644 index 80bf7f3e..00000000 --- a/home/.config/openbox/autostart +++ /dev/null @@ -1,20 +0,0 @@ -# compton -al-compositor --start & - -# enable numlock, commented out for laptop users -# numlockx & - -# restore wallpaper -nitrogen --restore & - -# required for xfce settings to work -xfsettingsd & - -# fancy window switcher -skippy-xd --config ~/.config/skippy-xd/skippy-xd.rc --start-daemon & - -# start the panel -al-polybar-session & - -# start conky -al-conky-session --autostart & diff --git a/home/.config/openbox/environment b/home/.config/openbox/environment deleted file mode 100644 index d7a60224..00000000 --- a/home/.config/openbox/environment +++ /dev/null @@ -1,5 +0,0 @@ -# environment -# vim:ft=sh - -# To set your language for displaying messages and time/date formats, use the following: -# LANG=en_US.UTF8 diff --git a/home/.config/openbox/menu.xml b/home/.config/openbox/menu.xml deleted file mode 100644 index d0280371..00000000 --- a/home/.config/openbox/menu.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - exo-open --launch TerminalEmulator - - - - - exo-open --launch WebBrowser - - - - - exo-open --launch FileManager - - - - - - - scrot 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; feh $$(xdg-user-dir PICTURES)/$f' - - - - - scrot -d 5 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; feh $$(xdg-user-dir PICTURES)/$f' - - - - - - - - - - - obconf - - - - - kickshaw - - - - - obkey - - - - - - exo-open ~/.config/openbox/menu.xml - - - - - exo-open ~/.config/openbox/rc.xml - - - - - exo-open ~/.config/openbox/autostart - - - - - - - - - - - - - - - - - al-panel-chooser - - - - - - nitrogen - - - - - xfce4-appearance-settings - - - - - - xfce4-power-manager - - - - - pavucontrol - - - - - xfce4-settings-manager - - - - - - - - - i3lock-fancy -p - - - - - rofi_run -l - - - - - diff --git a/home/.config/openbox/rc.xml b/home/.config/openbox/rc.xml deleted file mode 100644 index dc1e9443..00000000 --- a/home/.config/openbox/rc.xml +++ /dev/null @@ -1,761 +0,0 @@ - - - 10 - 20 - - - yes - no - yes - no - 200 - no - - - Smart -
yes
- Mouse - Mouse - - - ArchLabs-dARK - NLMC - yes - no - - sans - 11 - Normal - Normal - - - sans - 11 - Normal - Italic - - - sans - 11 - Normal - Normal - - - sans - 10 - Normal - Normal - - - sans - 10 - Normal - Normal - - - sans - 10 - Normal - Normal - - - - 4 - 0 - - 1 - 2 - 3 - 4 - - 800 - - - yes - Never - Center - - 10 - 10 - - - - 0 - 0 - 0 - 0 - - - Floating - 0 - 0 - no - Above - Vertical - no - 300 - 300 - Middle - - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - yes - yes - - - - - - - - - yes - - current - - - - - - - - - - 50% - - - - - - - - 50% - - - - - - - - - - - - - - - - - - - - - - - pamixer -i 2 - - - - - pamixer -d 2 - - - - - pamixer -t - - - - - playerctl stop - - - - - playerctl play-pause - - - - - playerctl previous - - - - - playerctl next - - - - - xbacklight +10 - - - - - xbacklight -10 - - - - - scrot 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; gpicview $$(xdg-user-dir PICTURES)/$f' - - - - - scrot -d 5 'ArchLabs_%Y-%m-%d-%S_$wx$h.png' -e 'mv $f $$(xdg-user-dir PICTURES) ; gpicview $$(xdg-user-dir PICTURES)/$f' - - - - - exo-open --launch FileManager - - - - - exo-open --launch TerminalEmulator - - - - - exo-open --launch TerminalEmulator - - - - - exo-open --launch TerminalEmulator - - - - - exo-open --launch WebBrowser - - - - - geany - - - - - xfce4-settings-manager - - - - - audacious - - - - - pavucontrol - - - - - skippy-xd - - - - - rofi_run -r - - - - - rofi_run -r - - - - - rofi_run -l - - - - - rofi_run -l - - - - - - - - - - - - - - xkill - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - root-menu - - - - - client-menu - - - - - - 0 - -0 - 50% - 50% - - - - - - 0 - -0 - 100% - 50% - - - - - - -0 - -0 - 50% - 50% - - - - - - 0 - 0 - 50% - 100% - - - - - - - - - -0 - 0 - 50% - 100% - - - - - - 0 - 0 - 50% - 50% - - - - - - 0 - 0 - 100% - 50% - - - - - - -0 - 0 - 50% - 50% - - - - - - - 50% - - - - - - - - 50% - - - - - - - - - - 80% - 80% - - - - - - - - 0 - 0 - 50% - - - - - - - -0 - 0 - 50% - - - - - 4 - 400 - 600 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - yes - - - - center - current - - - - - - - - - - - - - - no - - - - - - - - - - - yes - - - - - - - - - - - client-menu - - - - - - - - - - - - - - client-menu - - - - - - - - - - - - top - - - - - - - - - - - left - - - - - - - - - - - right - - - - - - - - - - - bottom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - horizontal - - - - - - - - - - - - - - - previous - - - - - next - - - - - - - client-list-combined-menu - - - - - client-list-combined-menu - - - - - root-menu - - - - - - menu.xml - 400 - no - 100 - 200 - no - yes - - - - - 1 - - yes - - - - diff --git a/home/.config/polybar/config b/home/.config/polybar/config deleted file mode 100644 index d5aa312b..00000000 --- a/home/.config/polybar/config +++ /dev/null @@ -1,52 +0,0 @@ -;===================================================== -; File Includes -;===================================================== - -[section/base] -include-file = /root/.config/polybar/master.conf -include-file = /root/.config/polybar/modules.conf - - -;===================================================== -; Openbox Bars -;===================================================== - -[bar/openbox-bar] -inherit = bar/master - -; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1 -monitor = - -modules-left = jgmenu workspaces -modules-center = window_switch clock -modules-right = ${env:POLYBAR_MODULES:temperature pkg network volume} - - -;===================================================== -; i3 Bars -;===================================================== - -[bar/i3-bar] -inherit = bar/master - -; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1 -monitor = - -modules-left = i3 menu -modules-center = clock -modules-right = ${env:POLYBAR_MODULES:coreuse temperature memory pkg network volume} - - -;===================================================== -; Bspwm Bars -;===================================================== - -[bar/bspwm-bar] -inherit = bar/master - -; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1 -monitor = - -modules-left = bspwm menu -modules-center = clock -modules-right = ${env:POLYBAR_MODULES:coreuse temperature memory pkg network volume} diff --git a/home/.config/polybar/master.conf b/home/.config/polybar/master.conf deleted file mode 100644 index e148fef0..00000000 --- a/home/.config/polybar/master.conf +++ /dev/null @@ -1,69 +0,0 @@ -;===================================================== -; Colors & Settings -;===================================================== - -[colors] -background = #1c2023 -foreground = #a4a4a4 -moderate = #ebcb8b -urgent = #bf616a -trim = #919ba0 -blue = #a2d1ec -purple = #b48ead -border = #c0c5ce - - -[settings] -throttle-output = 5 -throttle-output-for = 10 -throttle-input-for = 30 -compositing-background = source -compositing-foreground = source -compositing-overline = source -compositing-underline = source -compositing-border = source -screenchange-reload = true -format-foreground = ${colors.foreground} -format-background = ${colors.background} - -;===================================================== -; Master Bar -;===================================================== - -[bar/master] -width = 100% -height = 24 -border-size = 0 -border-top-size = 0 -border-bottom-size = 1 -radius = 0 -bottom = false -line-size = 3 -font-0 = "monospace:size=10:antialias=false;2" -font-1 = "Font Awesome 5 Brands:pixelsize=11;1" -font-2 = "MaterialIcons:size=10:antialias=false;2" -font-3 = "icomoon:size=10:antialias=false;2" -font-4 = "Ubuntu Mono Nerd Font:size=10:antialias=false;2" -offset-x = 0 -offset-y = 0 -fixed-center = true -border-color = ${colors.border} -background = ${colors.background} -foreground = ${colors.foreground} -module-margin = 0 -padding-right = 0 -padding-left = 0 -separator = │ - -; shows which modules have click actions -cursor-click = pointer - -; with cursor-click = pointer' these cause the entire bar to have click actions -; essentially defeating the purpose, so they are commented out - -; scroll-up = pamixer -i 2 -; scroll-down = pamixer -d 2 -; click-middle = skippy-xd --activate-window-picker -; double-click-left = networkmanager_dmenu -; double-click-middle = skippy-xd --activate-window-picker -; double-click-right = pavucontrol & diff --git a/home/.config/polybar/modules.conf b/home/.config/polybar/modules.conf deleted file mode 100644 index 94415493..00000000 --- a/home/.config/polybar/modules.conf +++ /dev/null @@ -1,502 +0,0 @@ -;===================================================== -; Modules -;===================================================== - -;;;;;;;;;;;;;;; -;; Jgmenu ;; -;;;;;;;;;;;;;;; -[module/jgmenu] -type = custom/script -label = %output% -label-padding = 2 -interval = 10 -exec = echo "" -click-left = "jgmenu_run >/dev/null 2>&1 &" -click-right = exo-open $HOME/.config/jgmenu/jgmenurc - - -;;;;;;;;;;;;;;;;;;;;;;;; -;; Openbox Workspaces ;; -;;;;;;;;;;;;;;;;;;;;;;;; -[module/workspaces] -type = internal/xworkspaces -pin-workspaces = false -enable-click = true -enable-scroll = true -format-padding = 0 -icon-0 = 1; -icon-1 = 2; -icon-2 = 3; -icon-3 = 4; -icon-4 = 5; -icon-5 = 6; -icon-6 = 7; -icon-7 = 8; -icon-8 = 9; -icon-9 = 10; -icon-default = -format = -label-active = %icon% %name% -label-occupied = %icon% %name% -label-urgent = %icon% %name% -label-empty = %icon% %name% -label-occupied-padding = 1 -label-empty-padding = 1 -label-urgent-padding = 1 -label-active-padding = 1 -label-active-foreground = ${colors.blue} -label-active-underline = ${colors.blue} -label-occupied-underline = ${colors.moderate} -label-urgent-foreground = ${colors.urgent} -label-urgent-underline = ${colors.urgent} -label-empty-foreground = ${colors.foreground} - - -;;;;;;;;;;;;;;;;;;; -;; i3 Workspaces ;; -;;;;;;;;;;;;;;;;;;; -[module/i3] -type = internal/i3 -pin-workspaces = true -strip-wsnumbers = true -index-sort = true -enable-click = true -fuzzy-match = true -ws-icon-default =  -format = -label-mode = %mode% -label-mode-padding = 2 -label-focused = %index% %name% -label-focused-padding = 2 -label-unfocused = %index% %name% -label-unfocused-padding = 2 -label-visible = %index% %name% -label-visible-padding = 2 -label-urgent = %index% %name% -label-urgent-padding = 2 -label-mode-underline = ${colors.urgent} -label-focused-underline = ${colors.blue} -label-visible-underline = ${colors.purple} -label-urgent-underline = ${colors.urgent} - - -;;;;;;;;;;;;;;;;;;;; -;;Bspwm Workspaces;; -;;;;;;;;;;;;;;;;;;;; -[module/bspwm] -type = internal/bspwm -pin-workspaces = true -inline-mode = false -enable-click = true -enable-scroll = false -reverse-scroll = false -fuzzy-match = false -; ws-icon-[0-9]+ = label;icon -; Note that the label needs to correspond with the bspwm workspace name -ws-icon-0 = I; -ws-icon-1 = II; -ws-icon-2 = III; -ws-icon-3 = IV; -ws-icon-4 = V; -ws-icon-5 = VI; -ws-icon-6 = VII; -ws-icon-7 = VIII; -ws-icon-8 = IX; -ws-icon-9 = X; -;ws-icon-default = ♟ -format = -label-monitor = %name% -label-mode-padding = 1 -label-focused = %icon% %name% -label-focused-padding = 1 -label-occupied = %icon% %name% -label-occupied-padding = 1 -label-urgent = %icon% %name% -label-urgent-padding = 1 -label-empty = %icon% %name% -label-empty-padding = 1 -label-dimmed-foreground = ${colors.purple} -label-dimmed-underline = ${colors.purple} -label-dimmed-focused-background = ${colors.purple} -label-focused-foreground = ${colors.blue} -label-focused-underline = ${colors.blue} -label-occupied-underline = ${colors.purple} -label-urgent-foreground = ${colors.urgent} -label-urgent-underline = ${colors.urgent} -; The following labels will be used to indicate the layout/mode -; for the focused workspace. Requires -label-monocle =  -label-tiled =  -label-fullscreen =  -label-floating =  -label-pseudotiled = P -label-locked =  -label-sticky =  -label-private =  -label-sticky-foreground = ${colors.purple} -label-locked-foreground = ${colors.moderate} -label-private-foreground = ${colors.urgent} - - -;;;;;;;;;;;;; -;; Network ;; -;;;;;;;;;;;;; -[module/network] -type = custom/script -exec = check-network -click-left = networkmanager_dmenu & -click-right = networkmanager_dmenu & -label-padding = 1 -tail = true - - -;;;;;;;;;;;;;;;;;;; -;; Window Switch ;; -;;;;;;;;;;;;;;;;;;; -[module/window_switch] -type = custom/script -interval = 5 -label = %output% -click-left = skippy-xd -click-right = skippy-xd -exec = echo "  " -format =