aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-22 22:40:22 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-22 22:40:22 +1300
commit57fcf8d48b08652bf167b96bbefbe61d066b2506 (patch)
tree69c3c0f7dd8492e712bae567b300e8a2de67c20b
parent31c3ff858c6f49394ded453b082edaa05bb491bc (diff)
parent2de1d87fd6a8a4032fb5af26a84b0f312cafc6ec (diff)
downloaddotfiles-1.75.0.tar.gz
Merge branch 'release/v1.75.0'v1.75.0
* release/v1.75.0: Bump VERSION Remove alignment spaces from Newsboat config Remove mpdlrc setup from Xinitrc.d Apply some logic to choose a GUI browser Remove colon alignment from .Xresources subfiles Remove font settings
-rw-r--r--README.md7
-rw-r--r--VERSION4
-rw-r--r--X/Xresources.d/URxvt67
-rw-r--r--X/Xresources.d/Xft6
-rw-r--r--X/Xresources.d/xterm15
-rw-r--r--X/xinitrc.d/browser.sh26
-rw-r--r--X/xinitrc.d/mpdlrc.sh3
-rw-r--r--dunst/dunstrc1
-rw-r--r--i3/config4
-rw-r--r--newsboat/config32
-rw-r--r--vim/gvimrc7
11 files changed, 81 insertions, 91 deletions
diff --git a/README.md b/README.md
index c9241cb8..33f535ed 100644
--- a/README.md
+++ b/README.md
@@ -329,13 +329,6 @@ The included `.Xresources` file assumes that `urxvt` can use 256 colors and
Perl extensions. If you're missing functionality, try changing
`perl-ext-common` to `default`.
-My choice of font is [Ubuntu Mono](http://font.ubuntu.com/), but the file
-should allow falling back to the more common [Deja Vu Sans
-Mono](https://dejavu-fonts.github.io/). I've found
-[Terminus](http://terminus-font.sourceforge.net/) works well too, but bitmap
-fonts are not really my cup of tea. The Lohit Kannada font bit is purely to
-make ಠ\_ಠ work correctly. ( ͡° ͜ʖ ͡°) seems to work out of the box.
-
### tmux
These are just generally vi-friendly settings, not much out of the ordinary.
diff --git a/VERSION b/VERSION
index de1c659b..8bfe5a2e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.74.0
-Thu Nov 22 07:45:15 UTC 2018
+tejr dotfiles v1.75.0
+Thu Nov 22 09:40:22 UTC 2018
diff --git a/X/Xresources.d/URxvt b/X/Xresources.d/URxvt
index a8061f64..30c659fb 100644
--- a/X/Xresources.d/URxvt
+++ b/X/Xresources.d/URxvt
@@ -1,35 +1,34 @@
! URxvt
-URxvt.buffered : false
-URxvt.cursorBlink : on
-URxvt.cutchars : <>│
-URxvt.depth : 32
-URxvt.font : xft:Ubuntu Mono:size=12,xft:Deja Vu Sans Mono,xft:Lohit Kannada
-URxvt.internalBorder : 0
-URxvt.iso14755 : false
-URxvt.iso14755_52 : false
-URxvt.perl-ext-common : select
-URxvt.pointerBlank : true
-URxvt.saveLines : 10000
-URxvt.scrollBar : false
-URxvt.scrollTTyKeypress : true
-URxvt.scrollTTyOutput : false
-URxvt.secondaryScroll : true
-URxvt.urgentOnBell : true
-URxvt.background : #030303
-URxvt.foreground : #E0E0E0
-URxvt.color0 : #030303
-URxvt.color1 : #CC0000
-URxvt.color2 : #3EAA06
-URxvt.color3 : #C4A000
-URxvt.color4 : #3465A4
-URxvt.color5 : #75507B
-URxvt.color6 : #06989A
-URxvt.color7 : #D3D7CF
-URxvt.color8 : #303030
-URxvt.color9 : #EF2929
-URxvt.color10 : #7AF234
-URxvt.color11 : #FCE94F
-URxvt.color12 : #729FCF
-URxvt.color13 : #AD7FA8
-URxvt.color14 : #34E2E2
-URxvt.color15 : #EEEEEC
+URxvt.buffered: false
+URxvt.cursorBlink: on
+URxvt.cutchars: <>│
+URxvt.depth: 32
+URxvt.internalBorder: 0
+URxvt.iso14755: false
+URxvt.iso14755_52: false
+URxvt.perl-ext-common: select
+URxvt.pointerBlank: true
+URxvt.saveLines: 10000
+URxvt.scrollBar: false
+URxvt.scrollTTyKeypress: true
+URxvt.scrollTTyOutput: false
+URxvt.secondaryScroll: true
+URxvt.urgentOnBell: true
+URxvt.background: #030303
+URxvt.foreground: #E0E0E0
+URxvt.color0: #030303
+URxvt.color1: #CC0000
+URxvt.color2: #3EAA06
+URxvt.color3: #C4A000
+URxvt.color4: #3465A4
+URxvt.color5: #75507B
+URxvt.color6: #06989A
+URxvt.color7: #D3D7CF
+URxvt.color8: #303030
+URxvt.color9: #EF2929
+URxvt.color10: #7AF234
+URxvt.color11: #FCE94F
+URxvt.color12: #729FCF
+URxvt.color13: #AD7FA8
+URxvt.color14: #34E2E2
+URxvt.color15: #EEEEEC
diff --git a/X/Xresources.d/Xft b/X/Xresources.d/Xft
deleted file mode 100644
index dd28d4ee..00000000
--- a/X/Xresources.d/Xft
+++ /dev/null
@@ -1,6 +0,0 @@
-! Fonts
-Xft.antialias : 1
-Xft.dpi : 96
-Xft.hinting : -1
-Xft.hintstyle : hintnone
-Xft.rgba : none
diff --git a/X/Xresources.d/xterm b/X/Xresources.d/xterm
index ffa29689..06ec95c1 100644
--- a/X/Xresources.d/xterm
+++ b/X/Xresources.d/xterm
@@ -1,9 +1,8 @@
! XTerm
-xterm*bellIsUrgent : true
-xterm*internalBorder : 0
-xterm*colorMode : false
-xterm*eightBitInput : false
-xterm*faceName : Ubuntu Mono:size=12
-xterm*locale : true
-xterm*metaSendsEscape : true
-xterm*termName : xterm-mono
+xterm*bellIsUrgent: true
+xterm*internalBorder: 0
+xterm*colorMode: false
+xterm*eightBitInput: false
+xterm*locale: true
+xterm*metaSendsEscape: true
+xterm*termName: xterm-mono
diff --git a/X/xinitrc.d/browser.sh b/X/xinitrc.d/browser.sh
index cdb9b8c0..0153fba9 100644
--- a/X/xinitrc.d/browser.sh
+++ b/X/xinitrc.d/browser.sh
@@ -1,4 +1,24 @@
-# Browser within X is Firefox
-command -v firefox >/dev/null 2>&1 || return
-BROWSER=firefox
+# Choose a GUI browser with some rough heuristics
+
+# If Firefox is available, start by assuming that
+if command -v firefox >/dev/null 2>&1 ; then
+ BROWSER=firefox
+fi
+
+# Consider a switch to Dillo...
+if (
+ # No output, please
+ exec >/dev/null 2>&1
+ # Don't switch if it's not there
+ command -v dillo || exit
+ # Switch if Firefox isn't there
+ command -v firefox || exit 0
+ # Switch if procfs says we have less than 2GB of RAM
+ awk '$1=="MemTotal:"&&$2<2^20{m++}END{exit!m}' < /proc/meminfo
+) ; then
+ BROWSER=dillo
+fi
+
+# Export our choice of browser, if it isn't empty
+[ -n "$BROWSER" ] || return
export BROWSER
diff --git a/X/xinitrc.d/mpdlrc.sh b/X/xinitrc.d/mpdlrc.sh
deleted file mode 100644
index 98f2d92a..00000000
--- a/X/xinitrc.d/mpdlrc.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Start mpdlrc-notify-send <https://sanctum.geek.nz/cgit/mpdlrc.git/about/>
-command -v mpdlrc-notify-send >/dev/null 2>&1 || return
-mpdlrc-notify-send &
diff --git a/dunst/dunstrc b/dunst/dunstrc
index ea4a6392..a957b2c6 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -4,7 +4,6 @@
bounce_freq = 0
dmenu = dmenu -p dunst:
follow = mouse
- font = Verdana 11 Bold
format = "%s %b"
geometry = "350x5-0-17"
history_length = 20
diff --git a/i3/config b/i3/config
index 3c063c94..6fa0a0de 100644
--- a/i3/config
+++ b/i3/config
@@ -1,9 +1,6 @@
# Use Mod4 as modifier
set $mod Mod4
-# Use Verdana as the system font
-font pango:Verdana 7
-
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
@@ -87,7 +84,6 @@ mode "resize" {
# i3bar at bottom of screen
bar {
- font pango:Verdana 7
position bottom
status_command i3status --config ~/.i3/status
workspace_buttons yes
diff --git a/newsboat/config b/newsboat/config
index affbaa43..d7caf12d 100644
--- a/newsboat/config
+++ b/newsboat/config
@@ -1,18 +1,18 @@
-auto-reload yes
-confirm-exit yes
-keep-articles-days 180
-reload-threads 5
-reload-time 30
+auto-reload yes
+confirm-exit yes
+keep-articles-days 180
+reload-threads 5
+reload-time 30
-bind-key j next
-bind-key k prev
-bind-key J next-feed
-bind-key K prev-feed
+bind-key j next
+bind-key k prev
+bind-key J next-feed
+bind-key K prev-feed
-color article default default
-color background default default
-color info white color52
-color listfocus default default reverse
-color listfocus_unread default default reverse
-color listnormal default default
-color listnormal_unread default default
+color article default default
+color background default default
+color info white color52
+color listfocus default default reverse
+color listfocus_unread default default reverse
+color listnormal default default
+color listnormal_unread default default
diff --git a/vim/gvimrc b/vim/gvimrc
index 33301da8..52ccf192 100644
--- a/vim/gvimrc
+++ b/vim/gvimrc
@@ -1,10 +1,3 @@
-" Ubuntu Mono on Unix, Consolas on Windows
-if has('unix')
- set guifont=Ubuntu\ Mono\ 12
-elseif has('win32') || has('win64')
- set guifont=Consolas:h11,Courier\ New:h11
-endif
-
" Reset GUI options
set guioptions=
set guioptions+=a " Use the system GUI clipboard