diff --git a/x/Xresources b/x/Xdefaults.symlink similarity index 86% rename from x/Xresources rename to x/Xdefaults.symlink index 244bfec..e8f7ea1 100644 --- a/x/Xresources +++ b/x/Xdefaults.symlink @@ -40,10 +40,11 @@ ! ! URxvt*background: S_base03 -*background: S_base03 +*background: [85]#002b36 +! S_base03 *foreground: S_base0 *fading: 10 -*fadeColor: [80]#002b36 +*fadeColor: [70]#002b36 *cursorColor: S_base1 *pointerColorBackground: S_base01 *pointerColorForeground: S_base1 @@ -56,7 +57,7 @@ *color5: S_magenta *color6: S_cyan *color7: S_base2 -*color8: S_base03 +*color8: S_base01 *color9: S_orange *color10: S_base01 *color11: S_base00 @@ -76,11 +77,12 @@ URxvt.urgentOnBell: True URxvt.depth: 32 ! URxvt.background: [95]#202020 -URxvt.font: xft:Inconsolata:pixelsize=12:antialias=true:hinting=true -URxvt.boldFont: xft:Inconsolata:bold:pixelsize=12:antialias=true:hinting=true +URxvt.font: xft:SourceCodePro:pixelsize=12:antialias=true:hinting=true +! URxvt.boldFont: xft:SourceCodePro:bold:pixelsize=12:antialias=true:hinting=true URxvt.geometry: 100x30 URxvt.scrollColor: S_base0 +dzen2.background: #002b36 ! xclock settings diff --git a/x/dot.json b/x/dot.json index 4669f87..b4d2b79 100644 --- a/x/dot.json +++ b/x/dot.json @@ -1,12 +1,16 @@ { "symlinks": [ { - "source": "xinitrc.symlink", - "target": "~/.xinitrc" + "source": "xsession.symlink", + "target": "~/.xsession" }, { "source": "XCompose.symlink", "target": "~/.XCompose" + }, + { + "source": "Xdefaults.symlink", + "target": "~/.Xdefaults" } ] } \ No newline at end of file diff --git a/x/xinitrc.symlink b/x/xinitrc.symlink deleted file mode 100755 index 1edd58e..0000000 --- a/x/xinitrc.symlink +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -xset fp+ /usr/share/fonts/local -xset fp rehash -# QGtkStyle does *not* like includes. -export GTK2_RC_FILES="$HOME/dotfiles/gtk/gtkrc.mine" -# compose led - not working -# export _XKB_OPTIONS_ENABLE=1 -# export _XKB_COMP_LED=1 - -# workaround for gtk3 focus -export GDK_CORE_DEVICE_EVENTS=1 - -xrdb ~/dotfiles/x/Xresources -source /etc/profile.d/infinality-settings.sh -~/dotfiles/bin/docked.sh -pulseaudio --start -volnoti -dropbox start & -syndaemon -t -k -i 1 -d & -redshift -l 52.2:5.16 -t 6500:5500 & -# inverted scrolling -synclient HorizScrollDelta=-107 VertScrollDelta=-107 -# compositing, start after awesome -(sleep 2s; compton --config ~/dotfiles/x/compton.conf -b) & -exec awesome -c ~/dotfiles/awesome/rc.lua diff --git a/x/xsession.symlink b/x/xsession.symlink new file mode 100755 index 0000000..7795d1c --- /dev/null +++ b/x/xsession.symlink @@ -0,0 +1,24 @@ +#!/bin/sh +#xset fp+ /usr/share/fonts/local +#xset fp rehash +# QGtkStyle does *not* like includes. +#export GTK2_RC_FILES="$HOME/dotfiles/gtk/gtkrc.mine" +# compose led - not working +# export _XKB_OPTIONS_ENABLE=1 +# export _XKB_COMP_LED=1 + +# nix xsession does this when symlinked correctly +#xrdb ~/dotfiles/x/Xresources + +feh --bg-fill ~/dotfiles/awesome/wallpaper.jpg +#source /etc/profile.d/infinality-settings.sh +~/dotfiles/bin/docked.sh +#pulseaudio --start +#volnoti +#dropbox start & +#syndaemon -t -k -i 1 -d & +# compositing, start after awesome +(sleep 2s; compton --config ~/dotfiles/x/compton.conf -b) & +#builds/TagTime/tagtimed.pl & +exec awesome -c ~/dotfiles/awesome/rc.lua +