From 833636c0d2eb9a6d80f5edd603e999ad73453e3a Mon Sep 17 00:00:00 2001 From: Salt Date: Sat, 20 Oct 2018 14:09:54 -0500 Subject: [PATCH] i3, .xinitrc: Polish Also update Concesssion --- .concession | 2 +- .config/i3/config | 7 +++--- .config/nitrogen/bg-saved.cfg | 4 ++++ .config/nitrogen/nitrogen.cfg | 12 ++++++++++ .../xrdb/00-colors-gruvbox-dark.xresources | 2 ++ .xinitrc | 22 +++++++++++++++++++ 6 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 .config/nitrogen/bg-saved.cfg create mode 100644 .config/nitrogen/nitrogen.cfg create mode 100755 .xinitrc diff --git a/.concession b/.concession index 333633f4..e01812c8 160000 --- a/.concession +++ b/.concession @@ -1 +1 @@ -Subproject commit 333633f47bc7083f6bd7851f66a854f5f257a4f5 +Subproject commit e01812c85c8bad26980ac19e4492b237842fcc2e diff --git a/.config/i3/config b/.config/i3/config index 14b88fd5..76e0965e 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -4,7 +4,7 @@ # ################### -# DO NOT RUN PROGRAMS HERE +# DO NOT START DAEMONS HERE ################### # This script leverages Concession for startup scripts # gitlab.com/rehashedsalt/concession @@ -83,8 +83,8 @@ gaps outer 0 # Apply colors to i3 # client.focused $blue2 $blue2 $bg $bgm $blue2 - client.focused_inactive $blue $blue $bg $bgm $bg - client.unfocused $bgm $bg $blue $bg $bg + client.focused_inactive $blue $blue $bg $bgm $bgm + client.unfocused $bgm $bg $blue $bg $bgm client.urgent $yellow2 $bg $yellow2 $yellow $bg client.placeholder $purple2 $bg $purple2 $purple $bg client.background $bg @@ -124,6 +124,7 @@ bindsym $mod+p exec --no-startup-id "~/.local/bin/tubetop2" bindsym $mod+$shift+p exec --no-startup-id "pkill xwinwrap" # Miscellaneous non-movement hotkeys +bindsym $ctl+$mod+l exec --no-startup-id "~/.local/bin/i3lock-custom" bindsym $mod+$shift+c reload bindsym $mod+$shift+r restart #bindsym $mod+$shift+e exit diff --git a/.config/nitrogen/bg-saved.cfg b/.config/nitrogen/bg-saved.cfg new file mode 100644 index 00000000..a14aa8f5 --- /dev/null +++ b/.config/nitrogen/bg-saved.cfg @@ -0,0 +1,4 @@ +[xin_-1] +file=/home/salt/Pictures/Wallpapers/w/1428350489332.png +mode=0 +bgcolor=#282828 diff --git a/.config/nitrogen/nitrogen.cfg b/.config/nitrogen/nitrogen.cfg new file mode 100644 index 00000000..9124b608 --- /dev/null +++ b/.config/nitrogen/nitrogen.cfg @@ -0,0 +1,12 @@ +[geometry] +posx=964 +posy=8 +sizex=944 +sizey=1026 + +[nitrogen] +view=icon +recurse=true +sort=alpha +icon_caps=false +dirs=/home/salt/Pictures/Wallpapers; diff --git a/.config/xrdb/00-colors-gruvbox-dark.xresources b/.config/xrdb/00-colors-gruvbox-dark.xresources index 1ec91eb9..34b016ea 100644 --- a/.config/xrdb/00-colors-gruvbox-dark.xresources +++ b/.config/xrdb/00-colors-gruvbox-dark.xresources @@ -24,6 +24,8 @@ ! Color declarations *background: G_base03 +*bg2: G_base02 +*bg3: G_base01 *foreground: G_base3 *cursorColor: G_base1 *pointerColorBackground: G_base01 diff --git a/.xinitrc b/.xinitrc new file mode 100755 index 00000000..b8870225 --- /dev/null +++ b/.xinitrc @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Salt's .xinitrc +# Copyright (C) 2018 salt +# +# Distributed under terms of the MIT license. +# + +# Set up our session target +which i3 > /dev/null 2>&1 && export STARTUP="i3" +which bspwm > /dev/null 2>&1 && export STARTUP="bspwm" +[ -x "$HOME/.concession/conspiracy" ] && export STARTUP="$HOME/.concession/conspiracy" + +# Execute Xsession stuff +[ -r /etc/X11/Xsession ] && . /etc/X11/Xsession + +# Do the do +[ -z "${STARTUP+x}" ] || exec "$STARTUP" + +# Or maybe just die, I guess +echo "Failed to start Concession!" >&2 +exit 1