diff options
| author | zachir <zachir@librem.one> | 2025-07-26 20:37:50 -0500 |
|---|---|---|
| committer | zachir <zachir@librem.one> | 2025-07-26 20:37:50 -0500 |
| commit | 89ec5cb8efc0ccad2c3ffef1b69209644674cc67 (patch) | |
| tree | 0b2838ed9ad03e43bda071e96ac29a507a509ea0 | |
| parent | 0b674f2b2a60146b09786d93f5fd38f4721765b9 (diff) | |
| parent | 83f2189e7234cad9054795b77b07d24ca0a7c742 (diff) | |
Merge branch 'master' into cla
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | scroll/config | 3 |
3 files changed, 6 insertions, 8 deletions
@@ -237,7 +237,7 @@ RVXX EXEX.settings RVXX v2/ RVXX v2.settings SchildiChat/ -scroll/user.conf +scroll/config.d/user.conf Serenity/ Session/ Shibalba EXEX.settings @@ -29,14 +29,11 @@ install-hyprland-plugins: @hyprpm enable hyprscrolling @echo "Done." -install-scrollconf: scroll/user.conf - @echo "Installing user.conf..." - @sudo ln -sf `pwd`/scroll/user.conf /etc/scroll/config.d/user.conf - @echo "Done." +install-scrollconf: scroll/config.d/user.conf -scroll/user.conf: +scroll/config.d/user.conf: @echo "Generating user.conf..." - @echo 'set $$home' $(shell echo $(HOME)) > scroll/user.conf + @echo 'set $$home' $(shell echo $(HOME)) > scroll/config.d/user.conf @echo "Done." install-bashconfigs: $(BCONFS) install-shconfigs diff --git a/scroll/config b/scroll/config index 04ed34f..13add04 100644 --- a/scroll/config +++ b/scroll/config @@ -6,7 +6,7 @@ # # Read `man 5 scroll` for a complete reference. -include /etc/scroll/config.d/* +include ~/.config/scroll/config.d/* ### Variables # @@ -575,3 +575,4 @@ bar { #} } # +include /etc/scroll/config.d/* |