diff --git a/Makefile b/Makefile index 423c752..cabd932 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,12 @@ SUDO ?= sudo TOP_SOURCES := $(shell git ls-files | grep -vE 'README|Makefile|^config|^\.git|^\.travis' | grep -v /) CONFIG_SOURCES := $(shell git ls-files config) LOCAL_BIN_SOURCES := $(shell git ls-files local/bin) +LOCAL_BG_SOURCES := $(shell git ls-files local/share/backgrounds) TARGETS := \ $(patsubst %,$(HOME)/.%,$(TOP_SOURCES)) \ $(patsubst %,$(HOME)/.%,$(CONFIG_SOURCES)) \ $(patsubst %,$(HOME)/.%,$(LOCAL_BIN_SOURCES)) \ + $(patsubst %,$(HOME)/.%,$(LOCAL_BG_SOURCES)) \ $(HOME)/.config/i3/config \ /etc/udev/rules.d/90-trackman-marble.rules \ /usr/local/bin/handle-trackman-marble @@ -15,7 +17,7 @@ $(HOME)/.%: % $(RM) '$@' && mkdir -p $(dir $@) && ln -svf '$(PWD)/$^' '$@' .PHONY: all -all: $(HOME)/.config $(HOME)/.local/bin $(TARGETS) +all: $(HOME)/.config $(HOME)/.local/bin $(HOME)/.local/share/backgrounds $(TARGETS) $(HOME)/.config: mkdir -p $@ @@ -23,6 +25,9 @@ $(HOME)/.config: $(HOME)/.local/bin: mkdir -p $@ +$(HOME)/.local/share/backgrounds: + mkdir -p $@ + /etc/udev/rules.d/90-trackman-marble.rules: udev/rules.d/90-trackman-marble.rules $(SUDO) install -m 0644 -v udev/rules.d/90-trackman-marble.rules $@ diff --git a/config/sway/config b/config/sway/config index 2e027b8..0e05684 100644 --- a/config/sway/config +++ b/config/sway/config @@ -8,7 +8,7 @@ set $right l set $menu wofi --show=run -output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +output * bg ~/.local/share/backgrounds/hubble-extreme-deep-field-1214a-1920x1675.jpg fill # Start a terminal bindsym $mod+Return exec $term @@ -143,8 +143,7 @@ exec swayidle -w \ before-sleep 'swaylock -f -c 000000' input "type:keyboard" { - xkb_layout us - xkb_variant dvorak + xkb_layout us(dvorak),us } input "type:touchpad" { diff --git a/local/share/backgrounds/hubble-extreme-deep-field-1214a-1920x1675.jpg b/local/share/backgrounds/hubble-extreme-deep-field-1214a-1920x1675.jpg new file mode 100644 index 0000000..5480d2e Binary files /dev/null and b/local/share/backgrounds/hubble-extreme-deep-field-1214a-1920x1675.jpg differ