aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Son Struschka <me@peter-struschka.com>2020-05-16 23:46:46 +0800
committerPeter Son Struschka <me@peter-struschka.com>2020-05-16 23:50:24 +0800
commit9f7d41ac7c4716e73e3f848ccadb80be483d875b (patch)
treee88bd5e0fdeddb88ba1f46f7ee4eec61c301041e
parent31bfa429f186e81c40b0f377ef9b9849ce45b4f9 (diff)
downloaddotfiles-9f7d41ac7c4716e73e3f848ccadb80be483d875b.tar.gz
dotfiles-9f7d41ac7c4716e73e3f848ccadb80be483d875b.tar.bz2
dotfiles-9f7d41ac7c4716e73e3f848ccadb80be483d875b.tar.lz
dotfiles-9f7d41ac7c4716e73e3f848ccadb80be483d875b.tar.xz
dotfiles-9f7d41ac7c4716e73e3f848ccadb80be483d875b.tar.zst
dotfiles-9f7d41ac7c4716e73e3f848ccadb80be483d875b.zip
x: use xwallpaper
-rw-r--r--Makefile4
-rw-r--r--i3wm/.local/share/images/wallpaper.jpgbin651668 -> 0 bytes
-rw-r--r--meta/x_deps1
-rw-r--r--x/.local/share/images/wallpaper.jgp (renamed from bspwm/.local/share/images/wallpaper.jpg)bin651668 -> 651668 bytes
-rwxr-xr-xx/.xinitrc8
-rwxr-xr-xx/.xprofile4
6 files changed, 17 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 31bfcef..349f2bf 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,10 @@ basics: yay
yay -Q - < meta/basic_deps || yay -S --needed - < meta/basic_deps
stow -t ~ $@
+x: yay
+ pacman -Q - < meta/x_deps || yay -S --needed - < meta/x_deps
+ stow -t ~ $@
+
git:
pacman -Q git || sudo pacman -S git
stow -t ~ $@
diff --git a/i3wm/.local/share/images/wallpaper.jpg b/i3wm/.local/share/images/wallpaper.jpg
deleted file mode 100644
index cc1ff0e..0000000
--- a/i3wm/.local/share/images/wallpaper.jpg
+++ /dev/null
Binary files differ
diff --git a/meta/x_deps b/meta/x_deps
new file mode 100644
index 0000000..8e2a68d
--- /dev/null
+++ b/meta/x_deps
@@ -0,0 +1 @@
+xwallpaper
diff --git a/bspwm/.local/share/images/wallpaper.jpg b/x/.local/share/images/wallpaper.jgp
index cc1ff0e..cc1ff0e 100644
--- a/bspwm/.local/share/images/wallpaper.jpg
+++ b/x/.local/share/images/wallpaper.jgp
Binary files differ
diff --git a/x/.xinitrc b/x/.xinitrc
index 8444ae5..b77a2bd 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,3 +1,11 @@
+#!/bin/sh
+
+[ -f ~/.xprofile ] && . ~/.xprofile
+
+userresources=$HOME/.Xresources
+
+[ -f $userresources ] && xrdb -merge $userresources
+
# set keyboard
setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle
diff --git a/x/.xprofile b/x/.xprofile
new file mode 100755
index 0000000..f79cc58
--- /dev/null
+++ b/x/.xprofile
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xwallpaper --zoom ~/.local/share/images/wallpaper.jpg
+