3 files changed, 105 insertions, 99 deletions
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 771fa0d..8a0fe8a 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -9,99 +9,99 @@
   documentation.dev.enable = true;
   documentation.man.enable = true;
 
-  environment.systemPackages = with pkgs; [
-    acl
-    age
-    bash
-    bc
-    bind
-    binutils
-    bpftools
-    bpftrace
-    bzip2
-    colordiff
-    conntrack-tools
-    coreutils
-    cpio
-    curl
-    diceware
-    diffutils
-    dig
-    dmidecode
-    elinks
-    ethtool
-    file
-    findutils
-    fping
-    git
-    gnugrep
-    gnupatch
-    gnused
-    gnutar
-    gptfdisk
-    gzip
-    htop
-    iproute2
-    iputils
-    jq
-    less
-    lshw
-    lsof
-    lvm2
-    lynx
-    moreutils
-    nano
-    ncurses
-    netcat-openbsd
-    nettools
-    nix-index
-    nmap
-    ntfs3g
-    nvd
-    oath-toolkit
-    openldap
-    openssl
-    p7zip
-    parted
-    patchelf
-    pciutils
-    procps
-    progress
-    psmisc
-    pv
-    pwgen
-    qemu_kvm
-    recode
-    rsync
-    sg3_utils
-    smartmontools
-    socat
-    sops
-    sqlite
-    ssh-to-age
-    ssh-to-pgp
-    stoken
-    strace
-    sysstat
-    tcpdump
-    tftp-hpa
-    traceroute
-    tree
-    tshark
-    unixtools.xxd
-    unrar
-    unzip
-    usbutils
-    util-linux
-    vim
-    wdiff
-    wget
-    whois
-    wireguard-tools
-    xkcdpass
-    xz
-    zip
-    zstd
+  environment.systemPackages = [
+    pkgs.acl
+    pkgs.age
+    pkgs.bash
+    pkgs.bc
+    pkgs.bind
+    pkgs.binutils
+    pkgs.bpftools
+    pkgs.bpftrace
+    pkgs.bzip2
+    pkgs.colordiff
+    pkgs.conntrack-tools
+    pkgs.coreutils
+    pkgs.cpio
+    pkgs.curl
+    pkgs.diceware
+    pkgs.diffutils
+    pkgs.dig
+    pkgs.dmidecode
+    pkgs.elinks
+    pkgs.ethtool
+    pkgs.file
+    pkgs.findutils
+    pkgs.fping
+    pkgs.git
+    pkgs.gnugrep
+    pkgs.gnupatch
+    pkgs.gnused
+    pkgs.gnutar
+    pkgs.gptfdisk
+    pkgs.gzip
+    pkgs.htop
+    pkgs.iproute2
+    pkgs.iputils
+    pkgs.jq
+    pkgs.less
+    pkgs.lshw
+    pkgs.lsof
+    pkgs.lvm2
+    pkgs.lynx
+    pkgs.moreutils
+    pkgs.nano
+    pkgs.ncurses
+    pkgs.netcat-openbsd
+    pkgs.nettools
+    pkgs.nix-index
+    pkgs.nmap
+    pkgs.ntfs3g
+    pkgs.nvd
+    pkgs.oath-toolkit
+    pkgs.openldap
+    pkgs.openssl
+    pkgs.p7zip
+    pkgs.parted
+    pkgs.patchelf
+    pkgs.pciutils
+    pkgs.procps
+    pkgs.progress
+    pkgs.psmisc
+    pkgs.pv
+    pkgs.pwgen
+    pkgs.qemu_kvm
+    pkgs.recode
+    pkgs.rsync
+    pkgs.sg3_utils
+    pkgs.smartmontools
+    pkgs.socat
+    pkgs.sops
+    pkgs.sqlite
+    pkgs.ssh-to-age
+    pkgs.ssh-to-pgp
+    pkgs.stoken
+    pkgs.strace
+    pkgs.sysstat
+    pkgs.tcpdump
+    pkgs.tftp-hpa
+    pkgs.traceroute
+    pkgs.tree
+    pkgs.tshark
+    pkgs.unixtools.xxd
+    pkgs.unrar
+    pkgs.unzip
+    pkgs.usbutils
+    pkgs.util-linux
+    pkgs.vim
+    pkgs.wdiff
+    pkgs.wget
+    pkgs.whois
+    pkgs.wireguard-tools
+    pkgs.xkcdpass
+    pkgs.xz
+    pkgs.zip
+    pkgs.zstd
   ];
 
   hardware.enableRedistributableFirmware = true;
diff --git a/hosts/common/core/nix.nix b/hosts/common/core/nix.nix
index 14252d8..c6279dc 100644
--- a/hosts/common/core/nix.nix
+++ b/hosts/common/core/nix.nix
@@ -24,6 +24,13 @@ in {
 
   };
 
-  systemd.services."nix-daemon".environment.TMPDIR = build-tmp;
+  systemd = {
+    services."nix-daemon".environment.TMPDIR = build-tmp;
+    user.services."nix-gc" = {
+      description = "Garbage collection for user profiles";
+      script = "/run/current-system/sw/bin/nix-collect-garbage --delete-older-than 30d";
+      startAt = "daily";
+    };
+  };
 
 }
diff --git a/hosts/common/core/shells.nix b/hosts/common/core/shells.nix
index 0469b8c..f02ec63 100644
--- a/hosts/common/core/shells.nix
+++ b/hosts/common/core/shells.nix
@@ -1,8 +1,7 @@
 { pkgs, ... }:
 {
-  environment.systemPackages = builtins.attrValues {
-    inherit (pkgs)
-      bash
-      zsh;
-  };
+  environment.systemPackages = [
+    pkgs.bash
+    pkgs.zsh
+  ];
 }