diff options
| author | Alan Pearce | 2024-10-31 16:49:01 +0100 |
|---|---|---|
| committer | Alan Pearce | 2024-11-02 13:39:34 +0100 |
| commit | c0384c43821474d28af1d9696ceb473a0d769292 (patch) | |
| tree | 4fed9f5175f02d36e0e58c4e93469c3705b085de /system | |
| parent | 365c0df92f6e8c59a0e0c38eabae1ba6f35d129d (diff) | |
| download | nixfiles-c0384c43821474d28af1d9696ceb473a0d769292.tar.lz nixfiles-c0384c43821474d28af1d9696ceb473a0d769292.tar.zst nixfiles-c0384c43821474d28af1d9696ceb473a0d769292.zip | |
Switch back to flakes
This reverts commits: - 66e56cb0e1c95202133733c0812b794171dc73c5. - 3fae7d35d9b32ab3c4f7293c418167a52aff8717. - 417a1ce6481adfc713d8d0d6ad03e211a3d0eb22. - 6b4469a98d7b2d88a3442b1051174000538199f0.
Diffstat (limited to 'system')
| -rw-r--r-- | system/linde.nix | 10 | ||||
| -rw-r--r-- | system/mba.nix | 1 | ||||
| -rw-r--r-- | system/prefect.nix | 5 | ||||
| -rw-r--r-- | system/settings/configuration/nix.nix | 1 | ||||
| -rw-r--r-- | system/settings/pin.nix | 12 |
5 files changed, 0 insertions, 29 deletions
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 <golink>)).nixosModules.default; in { imports = [ - <personal/modules/nixos/laminar.nix> - <home-manager/nixos> - <agenix/modules/age.nix> - <searchix/nix/modules> - 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 - <personal/modules/darwin/caddy> ]; 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 - <nixos-hardware/common/cpu/amd> - <nixos-hardware/common/cpu/amd/pstate.nix> - <nixos-hardware/common/pc/ssd> - <nixos-hardware/common/pc> - <nixos-hardware/common/gpu/nvidia> ]; 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; - }; - }; -} |