normalize fonts, fix theme switcher, add dpi thing
parent
2e60402320
commit
882f86ead6
|
@ -0,0 +1,8 @@
|
||||||
|
DPI=$1
|
||||||
|
echo "setting dpi: $DPI"
|
||||||
|
sed -i "s#Xft/DPI [0-9]*#Xft/DPI $((DPI*1024))#" ~/.xsettingsd
|
||||||
|
echo "Xft.dpi: $DPI" | xrdb -merge
|
||||||
|
echo "*dpi: $DPI" | xrdb -merge
|
||||||
|
xrandr --dpi $DPI
|
||||||
|
pkill -HUP xsettingsd
|
||||||
|
pkill -USR1 polybar
|
|
@ -4,10 +4,14 @@ COL=${1:-$(readlink $DIR/alternate)}
|
||||||
if [ $COL == "dark" ]; then
|
if [ $COL == "dark" ]; then
|
||||||
ROFI_THEME=solarized_alternate
|
ROFI_THEME=solarized_alternate
|
||||||
ALTERNATE=light;
|
ALTERNATE=light;
|
||||||
|
GTK_THEME=NumixSolarizedDark
|
||||||
|
nitrogen --set-auto wp/067\ -\ *
|
||||||
fi
|
fi
|
||||||
if [ $COL == "light" ]; then
|
if [ $COL == "light" ]; then
|
||||||
ALTERNATE=dark;
|
ALTERNATE=dark;
|
||||||
ROFI_THEME=Arc
|
ROFI_THEME=Arc
|
||||||
|
GTK_THEME=NumixSolarized
|
||||||
|
nitrogen --set-auto wp/037\ -\ Ducks\ On\ A\ Misty\ Pond.jpg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "changing to solarized_$COL"
|
echo "changing to solarized_$COL"
|
||||||
|
@ -17,6 +21,10 @@ sed -i "s/theme: .*;/theme: \"$ROFI_THEME\";/" ~/dotfiles/rofi/.config/rofi/conf
|
||||||
ln -fs $ALTERNATE $DIR/alternate
|
ln -fs $ALTERNATE $DIR/alternate
|
||||||
ln -fs $COL $DIR/actual
|
ln -fs $COL $DIR/actual
|
||||||
xrdb ~/dotfiles/x/.Xdefaults
|
xrdb ~/dotfiles/x/.Xdefaults
|
||||||
|
#polybar
|
||||||
|
pkill -USR1 polybar
|
||||||
|
#emacs
|
||||||
|
emacsclient -e "(load-theme 'solarized-$COL)"
|
||||||
# urxvt
|
# urxvt
|
||||||
RECOLOR=$(xrdb -query | tr -d ' \t' | sed -n '
|
RECOLOR=$(xrdb -query | tr -d ' \t' | sed -n '
|
||||||
s/.*background:/\x1b]11;/p
|
s/.*background:/\x1b]11;/p
|
||||||
|
@ -27,7 +35,6 @@ s/.*color\([0-9][^:]*\):/\x1b]4;\1;/p
|
||||||
for i in /dev/pts/*; do
|
for i in /dev/pts/*; do
|
||||||
echo -n $RECOLOR > $i
|
echo -n $RECOLOR > $i
|
||||||
done
|
done
|
||||||
#polybar
|
#gtk3
|
||||||
pkill -USR1 polybar
|
sed -i "s#Net/ThemeName \".*\"#Net/ThemeName \"$GTK_THEME\"#" ~/.xsettingsd
|
||||||
#emacs
|
pkill -HUP xsettingsd
|
||||||
emacsclient -e "(load-theme 'solarized-$COL)"
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{writeTextDir, writeScript, lib,
|
{writeTextDir, writeScript, lib,
|
||||||
rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps,
|
rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps,
|
||||||
i3lock-color, xset, alsaUtils, light, screenshot_public, xorg, libinput-gestures,
|
i3lock-color, xset, alsaUtils, light, screenshot_public, xorg, libinput-gestures,
|
||||||
haskellPackages, polybar, rofi-pass,
|
haskellPackages, polybar, rofi-pass, xsettingsd,
|
||||||
with_lock ? true, compton_name ? "default"}:
|
with_lock ? true, compton_name ? "default"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -173,6 +173,7 @@ ${kill-and-then "polybar" "PATH=${polybar}/bin:$PATH /home/yorick/dotfiles/i3/po
|
||||||
${kill-and-restart xss-lock "xss-lock -l -- ${locker}"}
|
${kill-and-restart xss-lock "xss-lock -l -- ${locker}"}
|
||||||
${kill-and-restart libinput-gestures "libinput-gestures"}
|
${kill-and-restart libinput-gestures "libinput-gestures"}
|
||||||
${kill-and-restart haskellPackages.arbtt "arbtt-capture"}
|
${kill-and-restart haskellPackages.arbtt "arbtt-capture"}
|
||||||
|
${kill-and-restart xsettingsd "xsettingsd"}
|
||||||
'') + ''
|
'') + ''
|
||||||
|
|
||||||
bindsym XF86MonBrightnessUp exec ${light}/bin/light -A 5
|
bindsym XF86MonBrightnessUp exec ${light}/bin/light -A 5
|
||||||
|
|
|
@ -20,4 +20,28 @@ in
|
||||||
librarySystemDepends = drv.librarySystemDepends ++ [ self.xorg.libXScrnSaver ];
|
librarySystemDepends = drv.librarySystemDepends ++ [ self.xorg.libXScrnSaver ];
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
# numix-solarized-gtk-theme = super.numix-solarized-gtk-theme.overrideDerivation (attrs: rec {
|
||||||
|
# version = "20180204";
|
||||||
|
# name = "numix-solarized-gtk-theme-${version}";
|
||||||
|
# buildInputs = attrs.buildInputs ++ [ self.python3 self.inkscape ];
|
||||||
|
# src = self.fetchFromGitHub {
|
||||||
|
# owner = "Ferdi265";
|
||||||
|
# repo = "numix-solarized-gtk-theme";
|
||||||
|
# rev = "3da78b0dbe74d0af0e3cc12e18ec1c30c7cf2b16";
|
||||||
|
# sha256 = "0dyqfcs1laff7hr64dg4n5y6qrcki47mdr332yn3yxp3bk7xybc3";
|
||||||
|
# };
|
||||||
|
# postPatch = attrs.postPatch + ''
|
||||||
|
# sed -i s#/usr/bin/inkscape#${self.inkscape}/bin/inkscape# scripts/render-assets.sh
|
||||||
|
# '';
|
||||||
|
# buildPhase = ''
|
||||||
|
# # for i in Solarized*.colors; do
|
||||||
|
# # THEME=`basename $i` make
|
||||||
|
# # done
|
||||||
|
# '';
|
||||||
|
# installPhase = ''
|
||||||
|
# for i in Solarized*.colors; do
|
||||||
|
# HOME=/tmp/inkscape make install THEME=`basename $i .colors`
|
||||||
|
# done
|
||||||
|
# '';
|
||||||
|
# });
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ configuration {
|
||||||
/* run-list-command: "";*/
|
/* run-list-command: "";*/
|
||||||
/* run-shell-command: "{terminal} -e {cmd}";*/
|
/* run-shell-command: "{terminal} -e {cmd}";*/
|
||||||
/* window-command: "xkill -id {window}";*/
|
/* window-command: "xkill -id {window}";*/
|
||||||
/* drun-icon-theme: "solarized_alternate";*/
|
/* drun-icon-theme: "Arc";*/
|
||||||
/* disable-history: false;*/
|
/* disable-history: false;*/
|
||||||
/* sort: false;*/
|
/* sort: false;*/
|
||||||
/* levenshtein-sort: false;*/
|
/* levenshtein-sort: false;*/
|
||||||
|
@ -48,7 +48,7 @@ configuration {
|
||||||
/* window-format: "{w} {i}{c} {t}";*/
|
/* window-format: "{w} {i}{c} {t}";*/
|
||||||
/* click-to-exit: true;*/
|
/* click-to-exit: true;*/
|
||||||
/* show-match: true;*/
|
/* show-match: true;*/
|
||||||
theme: "solarized_alternate";
|
theme: "Arc";
|
||||||
/* color-normal: ;*/
|
/* color-normal: ;*/
|
||||||
/* color-urgent: ;*/
|
/* color-urgent: ;*/
|
||||||
/* color-active: ;*/
|
/* color-active: ;*/
|
||||||
|
|
|
@ -44,14 +44,14 @@ URxvt.urgentOnBell: True
|
||||||
URxvt.depth: 32
|
URxvt.depth: 32
|
||||||
URxvt.borderColor: S_base03
|
URxvt.borderColor: S_base03
|
||||||
! URxvt.background: [95]#202020
|
! URxvt.background: [95]#202020
|
||||||
*font: xft:DejaVu Sans Mono:size=10:antialias=true:hinting=true
|
*font: xft:DejaVu Sans Mono:size=11:antialias=true:hinting=true
|
||||||
polybar.font: DejaVu Sans Mono:size=10:antialias=true:hinting=true;2
|
polybar.font: DejaVu Sans Mono:size=11:antialias=true:hinting=true;2
|
||||||
! URxvt.boldFont: xft:SourceCodePro:bold:size=12:antialias=true:hinting=true
|
! URxvt.boldFont: xft:SourceCodePro:bold:size=12:antialias=true:hinting=true
|
||||||
URxvt.geometry: 100x30
|
URxvt.geometry: 100x30
|
||||||
URxvt.scrollColor: S_base0
|
URxvt.scrollColor: S_base0
|
||||||
|
|
||||||
rofi.font: DejaVu Sans Mono 10
|
rofi.font: DejaVu Sans Mono 11
|
||||||
Emacs.font: DejaVu Sans Mono-10
|
Emacs.font: DejaVu Sans Mono-11
|
||||||
|
|
||||||
URxvt.font-size.step: 4
|
URxvt.font-size.step: 4
|
||||||
URxvt.keysym.C-equal: perl:font-size:increase
|
URxvt.keysym.C-equal: perl:font-size:increase
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
dark
|
light
|
|
@ -1 +1 @@
|
||||||
light
|
dark
|
Loading…
Reference in New Issue