Merge branch 'master' of https://github.com/dopefishh/dotfiles

diff --git a/cal/.config/tudu/config b/cal/.config/tudu/config
index 971b3e4..379d804 100644 (file)
--- a/cal/.config/tudu/config
+++ b/cal/.config/tudu/config
@@ -1,2 +1,6 @@
 [ general ]
 visual_tree = yes
+loop_move = yes
+sort_order = Dt
+editor = 'vi %s'
+tudu_file = /home/mrl/.local/share/tudu/tudu.xml

diff --git a/cal/.local/bin/unical.bash b/cal/.local/bin/unical.bash
index a7047c8..a095cdd 100755 (executable)
--- a/cal/.local/bin/unical.bash
+++ b/cal/.local/bin/unical.bash
@@ -1,4 +1,8 @@
 #!/bin/bash
 URL='http://persoonlijkrooster.ru.nl/ical?5f3a4d37&group=false&deduplicate=true&eu=dTUzMTE1OA==&t=9c210088-e219-427c-bbcc-256fddc28c30'
-rm /home/mrl/.local/share/vdirsyncer/cal/uni/*
+rm -f /home/mrl/.local/share/vdirsyncer/cal/uni/*
 curl -sSL "$URL" | khal import --batch -a uni -
+
+URL='https://wasteapi.ximmio.com/api/CallIcal?cn=Gemeente%20Almere&x=53d8db94-7945-42fd-9742-9bbc71dbe4c1&ty=null&ua=11219&sd=2020-12-21&ed=2024-01-09&path=https://wasteapi.ximmio.com&ln=nl&nt=1130'
+rm -f /home/mrl/.local/share/vdirsyncer/cal/vuilnis/*
+curl -sSL "$URL" | khal import --batch -a vuilnis -

diff --git a/config.h/slstatus/sigusr.patch b/config.h/slstatus/sigusr.patch
deleted file mode 100644 (file)
index 410cf57..0000000
--- a/config.h/slstatus/sigusr.patch
+++ /dev/null
@@ -1,30 +0,0 @@
----
- slstatus.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/slstatus.c b/slstatus.c
-index 96fa5b6..499cd30 100644
---- a/slstatus.c
-+++ b/slstatus.c
-@@ -26,9 +26,8 @@ static Display *dpy;
- static void
- terminate(const int signo)
- {
--       (void)signo;
--
--       done = 1;
-+       if (signo != SIGUSR1)
-+               done = 1;
- }
-
- static void
-@@ -72,6 +71,7 @@ main(int argc, char *argv[])
-        act.sa_handler = terminate;
-        sigaction(SIGINT,  &act, NULL);
-        sigaction(SIGTERM, &act, NULL);
-+       sigaction(SIGUSR1, &act, NULL);
-
-        if (!sflag && !(dpy = XOpenDisplay(NULL))) {
-                die("XOpenDisplay: Failed to open display");
---
-2.20.1

diff --git a/config.h/slstatus/slstatus b/config.h/slstatus/slstatus
index b14e039..84a2f11 160000 (submodule)
--- a/config.h/slstatus/slstatus
+++ b/config.h/slstatus/slstatus
@@ -1 +1 @@
-Subproject commit b14e039639ed28005fbb8bddeb5b5fa0c93475ac
+Subproject commit 84a2f117a32f0796045941260cdc4b69852b41e0

diff --git a/shell/.bashrc b/shell/.bashrc
index 68cd256..0b597e4 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -1,5 +1,6 @@
 shopt -s checkwinsize histappend globstar
 
+export MESA_LOADER_DRIVER_OVERRIDE=i965
 export HISTCONTROL=erasedups
 export HISTFILESIZE=NOTHING
 export HISTSIZE=NOTHING
@@ -16,14 +17,14 @@ export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
 # XDG fixes
 alias svn="svn --config-dir \"${XDG_CONFIG_HOME:-$HOME/.config}\"/subversion"
 alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
-alias tudu="tudu -f \"${XDG_DATA_HOME:-$HOME/.local/share}\"/tudu/tudu.xml -c \"${XDG_CONFIG_HOME:-$HOME/.config}/tudu/config\""
+alias tudu="tudu -c \"${XDG_CONFIG_HOME:-$HOME/.config}/tudu/config\""
 export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"/notmuch/config
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}"/pass
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 
 export CLEAN_HOME=/opt/clean-x64
 
-export PATH=~/.local/bin:$CLEAN_HOME/bin:$PATH
+export PATH=$CLEAN_HOME/bin:~/.local/bin:$PATH
 export PATH=/opt/texlive/2020/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin:/opt/firefox:$PATH
 
 export MANPATH=~/.local/share/man:/opt/texlive/2020/texmf-dist/doc/man:/opt/arduino/java/man:$MANPATH