From 882f86ead65176212ae600417ff18331315e259e Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sat, 7 Apr 2018 20:03:15 +0200 Subject: [PATCH] normalize fonts, fix theme switcher, add dpi thing --- bin/setdpi.sh | 8 +++++++ bin/toggle_solarized.sh | 15 ++++++++---- i3/i3.nix | 3 ++- nix/.config/nixpkgs/overlays/01-backports.nix | 24 +++++++++++++++++++ rofi/.config/rofi/config.rasi | 4 ++-- x/.Xdefaults | 8 +++---- x/solarized/actual | 2 +- x/solarized/alternate | 2 +- 8 files changed, 53 insertions(+), 13 deletions(-) create mode 100755 bin/setdpi.sh diff --git a/bin/setdpi.sh b/bin/setdpi.sh new file mode 100755 index 0000000..7d64474 --- /dev/null +++ b/bin/setdpi.sh @@ -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 diff --git a/bin/toggle_solarized.sh b/bin/toggle_solarized.sh index 01cf83a..4c3ea6e 100755 --- a/bin/toggle_solarized.sh +++ b/bin/toggle_solarized.sh @@ -4,10 +4,14 @@ COL=${1:-$(readlink $DIR/alternate)} if [ $COL == "dark" ]; then ROFI_THEME=solarized_alternate ALTERNATE=light; + GTK_THEME=NumixSolarizedDark + nitrogen --set-auto wp/067\ -\ * fi if [ $COL == "light" ]; then ALTERNATE=dark; ROFI_THEME=Arc + GTK_THEME=NumixSolarized + nitrogen --set-auto wp/037\ -\ Ducks\ On\ A\ Misty\ Pond.jpg fi 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 $COL $DIR/actual xrdb ~/dotfiles/x/.Xdefaults +#polybar +pkill -USR1 polybar +#emacs +emacsclient -e "(load-theme 'solarized-$COL)" # urxvt RECOLOR=$(xrdb -query | tr -d ' \t' | sed -n ' s/.*background:/\x1b]11;/p @@ -27,7 +35,6 @@ s/.*color\([0-9][^:]*\):/\x1b]4;\1;/p for i in /dev/pts/*; do echo -n $RECOLOR > $i done -#polybar -pkill -USR1 polybar -#emacs -emacsclient -e "(load-theme 'solarized-$COL)" +#gtk3 +sed -i "s#Net/ThemeName \".*\"#Net/ThemeName \"$GTK_THEME\"#" ~/.xsettingsd +pkill -HUP xsettingsd diff --git a/i3/i3.nix b/i3/i3.nix index 89b4aea..16d8688 100644 --- a/i3/i3.nix +++ b/i3/i3.nix @@ -1,7 +1,7 @@ {writeTextDir, writeScript, lib, rofi, xss-lock, nitrogen, compton-git, i3status, i3-gaps, 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"}: 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 libinput-gestures "libinput-gestures"} ${kill-and-restart haskellPackages.arbtt "arbtt-capture"} +${kill-and-restart xsettingsd "xsettingsd"} '') + '' bindsym XF86MonBrightnessUp exec ${light}/bin/light -A 5 diff --git a/nix/.config/nixpkgs/overlays/01-backports.nix b/nix/.config/nixpkgs/overlays/01-backports.nix index 8961214..9f73d3c 100644 --- a/nix/.config/nixpkgs/overlays/01-backports.nix +++ b/nix/.config/nixpkgs/overlays/01-backports.nix @@ -20,4 +20,28 @@ in 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 + # ''; + # }); } diff --git a/rofi/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi index bb8669b..e73cf2b 100644 --- a/rofi/.config/rofi/config.rasi +++ b/rofi/.config/rofi/config.rasi @@ -18,7 +18,7 @@ configuration { /* run-list-command: "";*/ /* run-shell-command: "{terminal} -e {cmd}";*/ /* window-command: "xkill -id {window}";*/ -/* drun-icon-theme: "solarized_alternate";*/ +/* drun-icon-theme: "Arc";*/ /* disable-history: false;*/ /* sort: false;*/ /* levenshtein-sort: false;*/ @@ -48,7 +48,7 @@ configuration { /* window-format: "{w} {i}{c} {t}";*/ /* click-to-exit: true;*/ /* show-match: true;*/ - theme: "solarized_alternate"; + theme: "Arc"; /* color-normal: ;*/ /* color-urgent: ;*/ /* color-active: ;*/ diff --git a/x/.Xdefaults b/x/.Xdefaults index 455a162..e948ae3 100644 --- a/x/.Xdefaults +++ b/x/.Xdefaults @@ -44,14 +44,14 @@ URxvt.urgentOnBell: True URxvt.depth: 32 URxvt.borderColor: S_base03 ! URxvt.background: [95]#202020 -*font: xft:DejaVu Sans Mono:size=10:antialias=true:hinting=true -polybar.font: DejaVu Sans Mono:size=10:antialias=true:hinting=true;2 +*font: xft:DejaVu Sans Mono:size=11:antialias=true:hinting=true +polybar.font: DejaVu Sans Mono:size=11:antialias=true:hinting=true;2 ! URxvt.boldFont: xft:SourceCodePro:bold:size=12:antialias=true:hinting=true URxvt.geometry: 100x30 URxvt.scrollColor: S_base0 -rofi.font: DejaVu Sans Mono 10 -Emacs.font: DejaVu Sans Mono-10 +rofi.font: DejaVu Sans Mono 11 +Emacs.font: DejaVu Sans Mono-11 URxvt.font-size.step: 4 URxvt.keysym.C-equal: perl:font-size:increase diff --git a/x/solarized/actual b/x/solarized/actual index df9f911..b8b4ecb 120000 --- a/x/solarized/actual +++ b/x/solarized/actual @@ -1 +1 @@ -dark \ No newline at end of file +light \ No newline at end of file diff --git a/x/solarized/alternate b/x/solarized/alternate index b8b4ecb..df9f911 120000 --- a/x/solarized/alternate +++ b/x/solarized/alternate @@ -1 +1 @@ -light \ No newline at end of file +dark \ No newline at end of file