summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-09-12 13:07:56 +0200
committerAlan Pearce2017-09-12 13:07:56 +0200
commit10dfb18b8b2f85cd30f8f5ec75b87d6e418eef4d (patch)
tree66091784a61d7f47c183a9015cbc45539383c4a8
parentbc71ff8dcb18541e37eef2cab290c7a80d48963b (diff)
parent6925290c151f98a6934be466ec7b0b8fac626d43 (diff)
downloadnixfiles-10dfb18b8b2f85cd30f8f5ec75b87d6e418eef4d.tar.lz
nixfiles-10dfb18b8b2f85cd30f8f5ec75b87d6e418eef4d.tar.zst
nixfiles-10dfb18b8b2f85cd30f8f5ec75b87d6e418eef4d.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--i3/.config/i3/config2
-rwxr-xr-xxprofile/.xprofile2
-rw-r--r--xresources/.icons/default/index.theme5
-rw-r--r--xresources/.xresources/main2
4 files changed, 8 insertions, 3 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 341a9fc9..f88dc9e6 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -51,7 +51,7 @@ set $Locker i3lock-color
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:Liberation Mono, Font Awesome 9
+font pango:Monospace, Font Awesome 9
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
diff --git a/xprofile/.xprofile b/xprofile/.xprofile
index 133c0c8c..7ea57551 100755
--- a/xprofile/.xprofile
+++ b/xprofile/.xprofile
@@ -1,8 +1,8 @@
 #!/bin/sh
-sh -c 'sleep 5 && xsetroot -cursor_name left_ptr' &
 xmodmap .xmodmaprc
 gpg-connect-agent /bye
 xrdb -I$HOME/.xresources .xresources/main
+xsetroot -cursor_name left_ptr &
 nm-applet &
 if command -v autorandr
 then
diff --git a/xresources/.icons/default/index.theme b/xresources/.icons/default/index.theme
new file mode 100644
index 00000000..6652f015
--- /dev/null
+++ b/xresources/.icons/default/index.theme
@@ -0,0 +1,5 @@
+# This file is written by LXAppearance. Do not edit.
+[Icon Theme]
+Name=Default
+Comment=Default Cursor Theme
+Inherits=Vanilla-DMZ
diff --git a/xresources/.xresources/main b/xresources/.xresources/main
index 3da2d224..0e1e802d 100644
--- a/xresources/.xresources/main
+++ b/xresources/.xresources/main
@@ -2,7 +2,7 @@
 
 *.background:             #ffffff
 
-Xcursor.theme:            Neutral
+Xcursor.theme:            Vanilla-DMZ
 Xcursor.size:             22
 
 Emacs.ToolBar:            off