diff --git a/flake.lock b/flake.lock index c05fb00..bccb28c 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1702378423, - "narHash": "sha256-tuJ8NWjaH/OuZSZukS6T+suia7E1QIPXW2nzkuUCCNA=", + "lastModified": 1702460489, + "narHash": "sha256-H6s6oVLvx7PCjUcvfkB89Bb+kbaiJxTAgWfMjiQTjA0=", "owner": "serokell", "repo": "deploy-rs", - "rev": "2ccd5d9939d41ac797c3ce769a689fdbc76fdebb", + "rev": "915327515f5fd1b7719c06e2f1eb304ee0bdd803", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -138,7 +138,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -156,7 +156,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1685518550, @@ -174,7 +174,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1694529238, @@ -216,11 +216,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1702423270, - "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=", + "lastModified": 1702681677, + "narHash": "sha256-Wa86ehEzoPXb9t1zXfDuKZ4ELQrFicnuuQjgFUCmxLk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db", + "rev": "abdc82d930521448e47574b8ca1a0a450e861cca", "type": "github" }, "original": { @@ -267,11 +267,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1702336390, - "narHash": "sha256-BRO8J8QbmyuS0XMh4UfY11akgTGZj1YhkqNvR83JrsI=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fef05bf9c8e818f4ca1425ef4c18e6680becd072", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702325376, - "narHash": "sha256-biLGx2LzU2+/qPwq+kWwVBgXs3MVYT1gPa0fCwpLplU=", + "lastModified": 1702456155, + "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e1d203c2fa7e2593c777e490213958ef81f71977", + "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", "type": "github" }, "original": { @@ -451,13 +451,31 @@ "type": "github" } }, - "utils": { + "systems_4": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { diff --git a/hosts/aristotle/configuration.nix b/hosts/aristotle/configuration.nix index bdff475..2d50f4d 100644 --- a/hosts/aristotle/configuration.nix +++ b/hosts/aristotle/configuration.nix @@ -5,8 +5,8 @@ # Include the results of the hardware scan. ./hardware-configuration.nix nixos-hardware.nixosModules.raspberry-pi-4 + ../../modules/base/nixos.nix - ../../modules/base ../../modules/ipfs/cluster.nix ../../modules/sops ]; diff --git a/hosts/plato/configuration.nix b/hosts/plato/configuration.nix index f5c5283..a4778b2 100644 --- a/hosts/plato/configuration.nix +++ b/hosts/plato/configuration.nix @@ -8,8 +8,8 @@ in # Include the results of the hardware scan. ./hardware-configuration.nix ../../users + ../../modules/base/nixos.nix - ../../modules/base ../../modules/coredns ../../modules/drone ../../modules/drone/runner-docker.nix @@ -57,7 +57,6 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC5spf4diguK+w7iYLFr565++6DjHukWfvpN2ru9dCRk nixbuild" ]; - system.autoUpgrade.enable = false; environment.systemPackages = with pkgs; [ cifs-utils pinentry weechat ]; fileSystems = { "/mnt/downloads" = { diff --git a/hosts/socrates/configuration.nix b/hosts/socrates/configuration.nix index 83945a7..52d3495 100644 --- a/hosts/socrates/configuration.nix +++ b/hosts/socrates/configuration.nix @@ -3,7 +3,7 @@ ./hardware-configuration.nix ./networking.nix # generated at runtime by nixos-infect ../../users - ../../modules/base + ../../modules/base/nixos.nix ../../modules/akkoma ../../modules/akkoma/nginx.nix @@ -47,7 +47,6 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ0mE4MyMnfd1b2nlBJT7kpZ6Vov+ILuGNfzdp5ZBNQe walkah@walkah.net" ]; - system.autoUpgrade.enable = false; environment.systemPackages = with pkgs; [ ipfs-migrator ]; walkah.coredns = { diff --git a/modules/base/common.nix b/modules/base/common.nix index a83f72b..6866b11 100644 --- a/modules/base/common.nix +++ b/modules/base/common.nix @@ -20,10 +20,12 @@ settings = { substituters = [ "https://walkah.cachix.org" + "https://cache.garnix.io" ]; trusted-public-keys = [ "walkah.cachix.org-1:D8cO78JoJC6UPV1ZMgd1V5znpk3jNUERGIeAKN15hxo=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; }; }; diff --git a/modules/base/default.nix b/modules/base/nixos.nix similarity index 56% rename from modules/base/default.nix rename to modules/base/nixos.nix index f542b86..ba87c63 100644 --- a/modules/base/default.nix +++ b/modules/base/nixos.nix @@ -1,4 +1,4 @@ -_: { +{ config, ... }: { imports = [ ./common.nix ]; @@ -20,5 +20,13 @@ _: { mosh.enable = true; }; - system.stateVersion = "23.05"; + system = { + autoUpgrade = { + enable = true; + flake = "github:walkah/athens#${config.networking.hostName}"; + dates = "daily"; + randomizedDelaySec = "5m"; + }; + stateVersion = "23.05"; + }; }