aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-09-20 23:01:12 +1200
committerTom Ryder <tom@sanctum.geek.nz>2022-09-20 23:01:12 +1200
commit798e79aee7267c3528d96413a1b6054732bb9c5f (patch)
treee3b2f8575a97624357c6326153d6896b8f2c0e00
parentMerge branch 'release/v12.22.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-master.tar.gz
dotfiles-master.zip
Merge branch 'release/v12.23.0'HEADv12.23.0master
* release/v12.23.0: Remove picom (X compositor) Disable compositor fading for now Put Git repository template in XDG_DATA_HOME Add target and config for picom Switch from compton to picom
-rw-r--r--Makefile10
-rw-r--r--VERSION4
-rw-r--r--git/config.mi52
-rw-r--r--x/xsession.sh2
4 files changed, 8 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 81464d18..7743d696 100644
--- a/Makefile
+++ b/Makefile
@@ -354,7 +354,7 @@ git/config: git/config.m4
-D NAME=$(NAME) \
-D EMAIL=$(EMAIL) \
-D GPG_KEYID=$(GPG_KEYID) \
- -D XDG_CONFIG_HOME=$(XDG_CONFIG_HOME) \
+ -D XDG_DATA_HOME=$(XDG_DATA_HOME) \
git/config.m4 > $@
less/less: less/lesskey
@@ -449,12 +449,12 @@ install-games-man:
install-git: git/config $(GIT_TEMPLATE_HOOKS)
mkdir -p -- $(XDG_CONFIG_HOME)/git
cp -p -- git/config $(XDG_CONFIG_HOME)/git/config
- mkdir -p -- $(XDG_CONFIG_HOME)/git/template
+ mkdir -p -- $(XDG_DATA_HOME)/git/template
cp -pR -- git/template/description \
- $(XDG_CONFIG_HOME)/git/template/description
- mkdir -p -- $(XDG_CONFIG_HOME)/git/template/hooks
+ $(XDG_DATA_HOME)/git/template/description
+ mkdir -p -- $(XDG_DATA_HOME)/git/template/hooks
cp -pR -- $(GIT_TEMPLATE_HOOKS) \
- $(XDG_CONFIG_HOME)/git/template/hooks
+ $(XDG_DATA_HOME)/git/template/hooks
install-gnupg: gnupg/profile.d/gnupg.sh install-sh
cp -p -- gnupg/profile.d/gnupg.sh $(HOME)/.profile.d
diff --git a/VERSION b/VERSION
index e55b9021..f5b77fed 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v12.22.0
-Sun, 14 Aug 2022 05:26:54 +0000
+tejr dotfiles v12.23.0
+Tue, 20 Sep 2022 11:01:07 +0000
diff --git a/git/config.mi5 b/git/config.mi5
index 6ae7f8ef..efdbc277 100644
--- a/git/config.mi5
+++ b/git/config.mi5
@@ -9,7 +9,7 @@
[init]
defaultBranch = master
- templateDir = <% XDG_CONFIG_HOME %>/git/template
+ templateDir = <% XDG_DATA_HOME %>/git/template
[log]
date = local
diff --git a/x/xsession.sh b/x/xsession.sh
index 3e2e468d..9cf4a99a 100644
--- a/x/xsession.sh
+++ b/x/xsession.sh
@@ -46,8 +46,6 @@ xset \
# log the failed attempt to start them to the errors file, as a hint that
# I might want to install them.
#
-## Display compositor
-compton &
## Message display (libnotify)
dunst &
## PulseAudio system tray tool