From 37dd411698bd6eae8365260dde39b8ae9c7cbd36 Mon Sep 17 00:00:00 2001 From: Peter Son Struschka Date: Sun, 30 Aug 2020 20:56:36 +0800 Subject: all: overhaul, move dotfile specifics to .local/share/dotfiles and more --- x/.config/X11/Xresources | 13 ------------ x/.config/X11/gruvbox-dark.xresources | 36 ------------------------------- x/.config/X11/xprofile | 21 ------------------ x/.config/x/Xresources | 38 +++++++++++++++++++++++++++++++++ x/.config/x/gruvbox-dark.xresources | 40 +++++++++++++++++++++++++++++++++++ x/.config/x/gruvbox-light.xresources | 40 +++++++++++++++++++++++++++++++++++ x/.config/x/xprofile | 22 +++++++++++++++++++ 7 files changed, 140 insertions(+), 70 deletions(-) delete mode 100755 x/.config/X11/Xresources delete mode 100644 x/.config/X11/gruvbox-dark.xresources delete mode 100755 x/.config/X11/xprofile create mode 100755 x/.config/x/Xresources create mode 100644 x/.config/x/gruvbox-dark.xresources create mode 100644 x/.config/x/gruvbox-light.xresources create mode 100755 x/.config/x/xprofile (limited to 'x/.config') diff --git a/x/.config/X11/Xresources b/x/.config/X11/Xresources deleted file mode 100755 index 68f3911..0000000 --- a/x/.config/X11/Xresources +++ /dev/null @@ -1,13 +0,0 @@ -#if __has_include(".extend.Xresources") -#include ".extend.Xresources" -#endif - -! ^ The above lines are no comments! -! Leave them as they are if a file ~/.extend.Xresources is being used on your system. -! config can be added there or also here below. -! For comments use "!" - -#include "gruvbox-dark.xresources" - -*.alpha: 0.8 -*.font: monospace:size=8 diff --git a/x/.config/X11/gruvbox-dark.xresources b/x/.config/X11/gruvbox-dark.xresources deleted file mode 100644 index 5beeba2..0000000 --- a/x/.config/X11/gruvbox-dark.xresources +++ /dev/null @@ -1,36 +0,0 @@ -! ----------------------------------------------------------------------------- -! File: gruvbox-dark.xresources -! Description: Retro groove colorscheme generalized -! Author: morhetz -! Source: https://github.com/morhetz/gruvbox-generalized -! Last Modified: 6 Sep 2014 -! ----------------------------------------------------------------------------- - -! hard contrast: *background: #1d2021 -*background: #282828 -! soft contrast: *background: #32302f -*foreground: #ebdbb2 -! Black + DarkGrey -*color0: #282828 -*color8: #928374 -! DarkRed + Red -*color1: #cc241d -*color9: #fb4934 -! DarkGreen + Green -*color2: #98971a -*color10: #b8bb26 -! DarkYellow + Yellow -*color3: #d79921 -*color11: #fabd2f -! DarkBlue + Blue -*color4: #458588 -*color12: #83a598 -! DarkMagenta + Magenta -*color5: #b16286 -*color13: #d3869b -! DarkCyan + Cyan -*color6: #689d6a -*color14: #8ec07c -! LightGrey + White -*color7: #a89984 -*color15: #ebdbb2 diff --git a/x/.config/X11/xprofile b/x/.config/X11/xprofile deleted file mode 100755 index 273230f..0000000 --- a/x/.config/X11/xprofile +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# set keyboard -setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle -setxkbmap -option caps:swapescape -xset r rate 300 50 - -# set wallpaper -xwallpaper --zoom ${XDG_DATA_HOME}/images/wallpaper.jpg - -# load Xresources -userresources=${XDG_CONFIG_HOME}/X/Xresources -[ -f $userresources ] && xrdb -load $userresources - -# systemd user -systemctl --user import-environment DISPLAY XAUTHORITY - -if command -v dbus-update-activation-environment >/dev/null 2>&1; then - dbus-update-activation-environment DISPLAY XAUTHORITY -fi - diff --git a/x/.config/x/Xresources b/x/.config/x/Xresources new file mode 100755 index 0000000..00fef46 --- /dev/null +++ b/x/.config/x/Xresources @@ -0,0 +1,38 @@ +#if __has_include(".extend.Xresources") +#include ".extend.Xresources" +#endif + +! ^ The above lines are no comments! +! Leave them as they are if a file ~/.extend.Xresources is being used on your system. +! config can be added there or also here below. +! For comments use "!" + +#include "gruvbox-dark.xresources" + +!*.alpha: 0.9 +!*.font: monospace:size=8 +!*.font: xft:FiraCode Nerd Font Mono:size=12 +*.faceName: FiraCode Nerd Font Mono:size=12 + +XTerm.vt100.faceName: FiraCode Nerd Font Mono:size=12 +Xft.autohint: 0 +Xft.lcdfilter: lcddefault +Xft.hintstyle: hintslight +Xft.hinting: 1 +Xft.antialias: 1 +Xft.rgba: rgb + +URxvt.font: xft:FiraCode Nerd Font Mono:size=8 + +!URxvt*transparent: true +!URxvt*shading: 50 +URxvt.depth: 32 +URxvt.background: [75]#32302f + +URxvt.scrollBar: false +URxvt.scrollBar_right: false +URxvt.saveLines: 1000000 +!URxvt.borderLess: 1 ! breaks herbstluftwm +URxvt.scrollTtyOutput: false +URxvt.scrollWithBuffer: true +URxvt.scrollTtyKeypress: true diff --git a/x/.config/x/gruvbox-dark.xresources b/x/.config/x/gruvbox-dark.xresources new file mode 100644 index 0000000..e3feb5f --- /dev/null +++ b/x/.config/x/gruvbox-dark.xresources @@ -0,0 +1,40 @@ +! ----------------------------------------------------------------------------- +! File: gruvbox-dark.xresources +! Description: Retro groove colorscheme generalized +! Author: morhetz +! Source: https://github.com/morhetz/gruvbox-generalized +! Last Modified: 6 Sep 2014 +! ----------------------------------------------------------------------------- + +! hard contrast: +!*background: #1d2021 +! normal contrast: +!*background: #282828 +! soft contrast: +*background: #32302f + +*foreground: #ebdbb2 +! Black + DarkGrey +*color0: #282828 +*color8: #928374 +! DarkRed + Red +*color1: #cc241d +*color9: #fb4934 +! DarkGreen + Green +*color2: #98971a +*color10: #b8bb26 +! DarkYellow + Yellow +*color3: #d79921 +*color11: #fabd2f +! DarkBlue + Blue +*color4: #458588 +*color12: #83a598 +! DarkMagenta + Magenta +*color5: #b16286 +*color13: #d3869b +! DarkCyan + Cyan +*color6: #689d6a +*color14: #8ec07c +! LightGrey + White +*color7: #a89984 +*color15: #ebdbb2 diff --git a/x/.config/x/gruvbox-light.xresources b/x/.config/x/gruvbox-light.xresources new file mode 100644 index 0000000..df92348 --- /dev/null +++ b/x/.config/x/gruvbox-light.xresources @@ -0,0 +1,40 @@ +! ----------------------------------------------------------------------------- +! File: gruvbox-light.xresources +! Description: Retro groove colorscheme generalized +! Author: morhetz +! Source: https://github.com/morhetz/gruvbox-generalized +! Last Modified: 6 Sep 2014 +! ----------------------------------------------------------------------------- + +! hard contrast: +!*background: #f9f5d7 +! normal contrast: +*background: #fbf1c7 +! soft contrast: +!*background: #f2e5bc + +*foreground: #3c3836 +! Black + DarkGrey +*color0: #fdf4c1 +*color8: #928374 +! DarkRed + Red +*color1: #cc241d +*color9: #9d0006 +! DarkGreen + Green +*color2: #98971a +*color10: #79740e +! DarkYellow + Yellow +*color3: #d79921 +*color11: #b57614 +! DarkBlue + Blue +*color4: #458588 +*color12: #076678 +! DarkMagenta + Magenta +*color5: #b16286 +*color13: #8f3f71 +! DarkCyan + Cyan +*color6: #689d6a +*color14: #427b58 +! LightGrey + White +*color7: #7c6f64 +*color15: #3c3836 diff --git a/x/.config/x/xprofile b/x/.config/x/xprofile new file mode 100755 index 0000000..5ed8c5b --- /dev/null +++ b/x/.config/x/xprofile @@ -0,0 +1,22 @@ +#!/bin/sh + +# set keyboard +setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle +setxkbmap -option caps:swapescape +xset r rate 300 50 + +# set wallpaper +xwallpaper --zoom "${XDG_DATA_HOME}/images/wallpaper.jpg" + +# load Xresources +xconfigdir=${XDG_CONFIG_HOME}/x +userresources=${xconfigdir}/Xresources +[ -f $userresources ] && xrdb -I"$xconfigdir" -load "$userresources" + +# systemd user +systemctl --user import-environment DISPLAY XAUTHORITY + +if command -v dbus-update-activation-environment >/dev/null 2>&1; then + dbus-update-activation-environment DISPLAY XAUTHORITY +fi + -- cgit v1.2.3