From 5dbd999795d38446cd19589ee013b5085b777bfb Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 08:03:22 -0200 Subject: Prune containers in gc.sh. --- scripts/gc.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/gc.sh b/scripts/gc.sh index 2d7a8f3..e6a1d0d 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -37,6 +37,7 @@ docker stop $(docker ps -a -q) docker rm $(docker ps -a -q) echo y | docker volume prune +echo y | docker container prune after=$(disk_space) -- cgit v1.2.3 From bd103263fa07eabc05c63f60129d86b48e904f72 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 21:57:15 -0200 Subject: Unify crontab and alias command under scripts/mail.sh. --- bash/aliases.sh | 1 - nixos/configuration.nix | 3 ++- scripts/mail.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100755 scripts/mail.sh (limited to 'scripts') diff --git a/bash/aliases.sh b/bash/aliases.sh index f9649a2..142b6a9 100644 --- a/bash/aliases.sh +++ b/bash/aliases.sh @@ -14,7 +14,6 @@ alias watch="watch " alias mr="mr -s" alias sbcl="rlwrap sbcl" alias du="ncdu --color dark" -alias mail="mbsync -a && notmuch new" alias fim="play $DOTFILES/bash/Positive.ogg &> /dev/null" diff --git a/nixos/configuration.nix b/nixos/configuration.nix index edd764b..7bfab11 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -290,7 +290,8 @@ services = { cron.enable = true; - cron.systemCronJobs = ["* * * * * andreh mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log"]; + # We can see the actual generated crontab at /etc/crontab + cron.systemCronJobs = ["* * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh"]; xserver = { enable = true; diff --git a/scripts/mail.sh b/scripts/mail.sh new file mode 100755 index 0000000..e9f14d8 --- /dev/null +++ b/scripts/mail.sh @@ -0,0 +1 @@ +mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log -- cgit v1.2.3 From 8aa714eb5cb459647b92e979f553b1756397bb34 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 21:57:48 -0200 Subject: Reenable Guix in NixOS. --- bash/env.sh | 6 +++--- nixos/configuration.nix | 26 +++++++++++++------------- scripts/gc.sh | 6 ++++++ scripts/guix | 1 + 4 files changed, 23 insertions(+), 16 deletions(-) create mode 120000 scripts/guix (limited to 'scripts') diff --git a/bash/env.sh b/bash/env.sh index c537b4e..c81cba2 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -68,9 +68,9 @@ isLinux && { # export GUIX_PROFILE="$HOME/.guix-profile/etc/profile" -# isLinux && { -# source "$GUIX_PROFILE" -# } +isLinux && { + source "$GUIX_PROFILE" +} export PATH="$HOME/.guix-profile/bin${PATH:+:}$PATH" export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" # after running guix package -i glibc-utf8-locales diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 7bfab11..0432380 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -411,19 +411,19 @@ services = { # Derived from Guix guix-daemon.service.in # https://git.savannah.gnu.org/cgit/guix.git/tree/etc/guix-daemon.service.in?id=00c86a888488b16ce30634d3a3a9d871ed6734a2 -# guix-daemon = { -# enable = true; -# description = "Build daemon for GNU Guix"; -# serviceConfig = { -# ExecStart = "/var/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild"; -# Environment="GUIX_LOCPATH=/root/.guix-profile/lib/locale"; -# RemainAfterExit="yes"; -# StandardOutput="syslog"; -# StandardError="syslog"; -# TaskMax= "8192"; -# }; -# wantedBy = [ "multi-user.target" ]; -# }; + guix-daemon = { + enable = true; + description = "Build daemon for GNU Guix"; + serviceConfig = { + ExecStart = "/var/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild"; + Environment="GUIX_LOCPATH=/root/.guix-profile/lib/locale"; + RemainAfterExit="yes"; + StandardOutput="syslog"; + StandardError="syslog"; + TaskMax= "8192"; + }; + wantedBy = [ "multi-user.target" ]; + }; }; }; diff --git a/scripts/gc.sh b/scripts/gc.sh index e6a1d0d..9b98123 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -5,6 +5,7 @@ disk_space() { } before=$(disk_space) + yellow "Cleaning up the NixOS store" profiles=(per-user/root/channels per-user/andreh/profile per-user/andreh/channels system) @@ -20,6 +21,11 @@ nix-store --gc nix-collect-garbage -d +yellow "Cleaning up Guix store" + +guix gc + + yellow "Cleaning up up the Trash and /tmp folders" rm -rf ~/.local/share/Trash/files/* diff --git a/scripts/guix b/scripts/guix new file mode 120000 index 0000000..96901ae --- /dev/null +++ b/scripts/guix @@ -0,0 +1 @@ +/var/guix/profiles/per-user/root/guix-profile/bin/guix \ No newline at end of file -- cgit v1.2.3 From cebd9537d0671f6f71371ed1a955f89ec6457c95 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 23 Nov 2018 22:19:08 -0200 Subject: Fetch mail once an hour. Adapt mail.sh to be called on-demand. --- nixos/configuration.nix | 2 +- scripts/mail.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d754f7b..8db07ea 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -298,7 +298,7 @@ services = { cron.enable = true; # We can see the actual generated crontab at /etc/crontab - cron.systemCronJobs = ["* * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh"]; + cron.systemCronJobs = ["0 * * * * andreh /home/andreh/annex/dev/code/dotfiles/scripts/mail.sh -s"]; xserver = { enable = true; diff --git a/scripts/mail.sh b/scripts/mail.sh index e9f14d8..c8f6522 100755 --- a/scripts/mail.sh +++ b/scripts/mail.sh @@ -1 +1,5 @@ -mbsync -aV &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log +if [ "$1" = "-s" ]; then + mbsync -a &>> /tmp/mbsync.log && notmuch new &>> /tmp/notmuch.log +else + mbsync -aV && notmuch new +fi -- cgit v1.2.3