From c0384c43821474d28af1d9696ceb473a0d769292 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 31 Oct 2024 16:49:01 +0100 Subject: Switch back to flakes This reverts commits: - 66e56cb0e1c95202133733c0812b794171dc73c5. - 3fae7d35d9b32ab3c4f7293c418167a52aff8717. - 417a1ce6481adfc713d8d0d6ad03e211a3d0eb22. - 6b4469a98d7b2d88a3442b1051174000538199f0. --- system/linde.nix | 10 ---------- system/mba.nix | 1 - system/prefect.nix | 5 ----- system/settings/configuration/nix.nix | 1 - system/settings/pin.nix | 12 ------------ 5 files changed, 29 deletions(-) delete mode 100644 system/settings/pin.nix (limited to 'system') diff --git a/system/linde.nix b/system/linde.nix index 730e0a14..db061e6d 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -18,20 +18,13 @@ let net-gw6 = "fe80::1"; domain = "alanpearce.eu"; ts-domain = "hydra-pinecone.ts.net"; - golink = (builtins.getFlake (toString )).nixosModules.default; in { imports = [ - - - - - golink # Include the results of the hardware scan. ./linde-hardware.nix - ./settings/pin.nix ./settings/services/git-server.nix ]; age.secrets = { @@ -323,9 +316,6 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII8VIII+598QOBxi/52O1Kb19RdUdX0aZmS1/dNoyqc5 alan@hetzner.strongbox" ]; }; - home-manager = { - users.alan = import ../user/server.nix; - }; users.users.nixremote = { shell = "/bin/sh"; diff --git a/system/mba.nix b/system/mba.nix index b1a17922..ede4542d 100644 --- a/system/mba.nix +++ b/system/mba.nix @@ -3,7 +3,6 @@ ./settings/darwin.nix ./settings/dev.nix ./settings/programs/shell.nix - ]; services.caddy = { diff --git a/system/prefect.nix b/system/prefect.nix index e145c304..662c0144 100644 --- a/system/prefect.nix +++ b/system/prefect.nix @@ -25,11 +25,6 @@ ./settings/programs/docker.nix ./settings/dev.nix ./settings/gaming.nix - - - - - ]; virtualisation.vmVariant = { diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix index b28fde18..105efaae 100644 --- a/system/settings/configuration/nix.nix +++ b/system/settings/configuration/nix.nix @@ -3,7 +3,6 @@ , pkgs , ... }: { - imports = [ ../pin.nix ]; nix = { settings = { cores = lib.mkDefault 0; diff --git a/system/settings/pin.nix b/system/settings/pin.nix deleted file mode 100644 index 533149fe..00000000 --- a/system/settings/pin.nix +++ /dev/null @@ -1,12 +0,0 @@ -let - inherit (import ../../sources.nix) nixPath sources; -in -{ - nix = { - inherit nixPath; - registry.nixpkgs.to = { - type = "path"; - path = sources.nixpkgs; - }; - }; -} -- cgit 1.4.1