From 4135d53c14dbef6ca2563d6467c83dec0fad32ee Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Sat, 13 Apr 2024 18:32:38 -0700 Subject: [PATCH] Add autoupgrade option, enable in onizuka --- flake.lock | 40 +++++++++++------------- nixosModules/services/system/default.nix | 16 ++++++++++ systems/onizuka/default.nix | 1 + 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b45cc4b..78a1d41 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1712635734, - "narHash": "sha256-x4vfyFFVh8X2Y84gKkhUqeM92u/2hpkD8lx9RAscqFw=", + "lastModified": 1713050186, + "narHash": "sha256-AKdzVa0Zz5PQ1ptQgD0jj8J+UZUW9OeKGZ0mNVnkyI4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d0d1ba5918206f16128e56988dd4db5d6d143338", + "rev": "0634aaeac6cca12e4f72174c431c2db9da9c0072", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1712437997, - "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", + "lastModified": 1712867921, + "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", + "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe", "type": "github" }, "original": { @@ -236,20 +236,18 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "lastModified": 1712935342, + "narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "type": "github" } }, "xdph": { diff --git a/nixosModules/services/system/default.nix b/nixosModules/services/system/default.nix index bde5bda..d6b8a47 100644 --- a/nixosModules/services/system/default.nix +++ b/nixosModules/services/system/default.nix @@ -5,6 +5,7 @@ user.name = lib.mkOption { default = "pan"; }; user.timezone = lib.mkOption { default = "America/Los_Angeles"; }; system.extraFonts = lib.mkOption { default = []; }; + system.doAutoUpgrade = lib.mkEnableOption "Enable auto upgrading system"; }; config = { @@ -58,5 +59,20 @@ source-han-sans # Pan-CJK font ] ++ config.system.extraFonts; }; + + system.autoUpgrade = lib.mkIf config.system.doAutoUpgrade { + enable = true; + flake = inputs.self.outPath; + flags = [ + "--update-input" + "nixpkgs" + "--commit-lock-file" + "-L" + ]; + operation = "boot"; + dates = "22:30"; + randomizedDelaySec = "30min"; + }; + }; } diff --git a/systems/onizuka/default.nix b/systems/onizuka/default.nix index 978f277..1a7191d 100644 --- a/systems/onizuka/default.nix +++ b/systems/onizuka/default.nix @@ -15,6 +15,7 @@ user.name = "pan"; user.timezone = "America/Los_Angeles"; + system.doAutoUpgrade = true; tuigreet.enable = true; hyprland.enable = true;