diff options
| -rw-r--r-- | bash/env.sh | 6 | ||||
| -rw-r--r-- | nixos/configuration.nix | 26 | ||||
| -rwxr-xr-x | scripts/gc.sh | 6 | ||||
| l--------- | scripts/guix | 1 |
4 files changed, 23 insertions, 16 deletions
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 |