From e88b04d5445bdfd2ef19378f5dfc21e92268170d Mon Sep 17 00:00:00 2001 From: Andre Date: Tue, 28 May 2024 12:14:40 -0400 Subject: [PATCH] Fighting with automatic updates and some other stuff --- flake.nix | 4 ++-- hosts/Haven/default.nix | 1 - modules/base/system.nix | 1 + modules/services/forgejo.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index f534246..9b7b06a 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ # Hardware configurations #nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master"; - nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master"; + nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master"; # Home-manager home-manager = { @@ -99,7 +99,7 @@ system = "x86_64-linux"; modules = defaultModules ++ [ nixos-hardware.nixosModules.common-cpu-intel - nixos-hardware.nixosModules.common-gpu-intel + nixos-hardware.nixosModules.common-gpu-intel ./hosts/Dimaga ]; }; diff --git a/hosts/Haven/default.nix b/hosts/Haven/default.nix index 1b9e004..70faef8 100644 --- a/hosts/Haven/default.nix +++ b/hosts/Haven/default.nix @@ -19,7 +19,6 @@ in imports = [ ./hardware-configuration.nix ]; system.stateVersion = "24.05"; - system.autoUpgrade.enable = lib.mkForce false; host = { role = "server"; diff --git a/modules/base/system.nix b/modules/base/system.nix index 35df0b1..c54461c 100644 --- a/modules/base/system.nix +++ b/modules/base/system.nix @@ -33,6 +33,7 @@ dates = "daily"; allowReboot = false; operation = "switch"; + flags = [ "--commit-lock-file" ]; }; services = { diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index e0a8ec8..74cdf75 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -72,7 +72,7 @@ in labels = [ "nix:docker://nixos/nix" # Shoutout to Icewind 1991 for this syntax: https://icewind.nl/entry/gitea-actions-nix/ "debian:docker://node:20-bullseye" - "ubuntu-latest:docker://ubuntu:latest" + "ubuntu-latest:docker://ubuntu:latest" ]; settings = { # For an example of configuring in Nix: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix