From 1c27e2f31818ff9f1ed2bd57f5084931dd273cf2 Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Fri, 4 Apr 2025 00:52:02 -0500 Subject: [PATCH] renamed home-manager module for import --- configuration.nix | 28 ++++++++++++++++++++++++-- home-manager/{home.nix => default.nix} | 0 nixos/services/restic.nix | 8 ++++++-- 3 files changed, 32 insertions(+), 4 deletions(-) rename home-manager/{home.nix => default.nix} (100%) diff --git a/configuration.nix b/configuration.nix index 1ba7b93..5fa9dd4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,7 @@ { pkgs, lib, userSettings, systemSettings, ... }: { imports = [ - (import ./home-manager/home.nix {inherit systemSettings userSettings lib pkgs;}) + (import ./home-manager {inherit systemSettings userSettings lib pkgs;}) ./nixos ./scripts ]; @@ -10,6 +10,7 @@ nix.settings.trusted-users = [ "root" "@wheel" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.download-buffer-size = 524288000; # 500MB programs.nix-ld.enable = true; @@ -40,10 +41,33 @@ services.cron = { enable = true; systemCronJobs = [ - "30 2 * * * /run/current-system/sw/bin/nfs > /etc/nixos/auto_update.log 2>&1" + "30 2 * * * /run/current-system/sw/bin/nfsu > /etc/nixos/auto_update.log 2>&1" ]; }; + # systemd.timers."auto-update" = { + # wantedBy = [ "timers.target" ]; + # timerConfig = { + # OnCalendar="*-*-* 4:00:00"; + # Unit = "auto-update.service"; + # }; + # }; + + # systemd.services."auto-update" = { + # script = '' + # ${pkgs.coreutils}/bin/echo "Running auto-update" + # FLAKE=$(${pkgs.coreutils}/bin/readlink -f /etc/nixos) + # ${pkgs.coreutils}/bin/echo "FLAKE: $FLAKE" + # ${pkgs.nix}/bin/nix flake update --flake $FLAKE --impure + # ${pkgs.git}/bin/git -C $FLAKE add "$FLAKE/flake.lock" > /dev/null 2>&1 + # ${pkgs.sudo}/bin/sudo ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake $FLAKE#${systemSettings.hostName} --impure + # ''; + # serviceConfig = { + # Type = "oneshot"; + # User = "${userSettings.userName}"; + # }; + # }; + # https://nixos.wiki/wiki/Storage_optimization nix.gc = { automatic = true; diff --git a/home-manager/home.nix b/home-manager/default.nix similarity index 100% rename from home-manager/home.nix rename to home-manager/default.nix diff --git a/nixos/services/restic.nix b/nixos/services/restic.nix index d8e7253..8c69f48 100644 --- a/nixos/services/restic.nix +++ b/nixos/services/restic.nix @@ -1,6 +1,10 @@ -{ config, pkgs, ... }: +{ config, pkgs, userSettings, ... }: { - sops.secrets."restic_password" = { }; + + sops.secrets.restic_password = { + owner = config.users.users.${userSettings.userName}.name; + mode = "0440"; + }; environment.systemPackages = with pkgs; [ restic