Revert "Switch back to flakes"

This reverts commit c0384c43821474d28af1d9696ceb473a0d769292.

5 files changed, 38 insertions, 12 deletions

diff --git a/system/linde.nix b/system/linde.nix
index 5bf67cda..596cac19 100644
--- a/system/linde.nix
+++ b/system/linde.nix
@@ -17,14 +17,21 @@ 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/configuration/nix-linux.nix
+      ./settings/pin.nix
       ./settings/services/git-server.nix
     ];
   age.secrets = {
@@ -290,6 +297,9 @@ in
       "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJVREjPey2TOIPzfYJoG9yIR4Rui7tNJK2QIKa+pbgsyXg31hhPIw37LRRIic+l53mW8eahHxX3Y1IeTjcMw8IU= alan@secretive.marvin"
     ];
   };
+  home-manager = {
+    users.alan = import ../user/server.nix;
+  };
 
   users.users.nixremote = {
     shell = "/bin/sh";
diff --git a/system/marvin.nix b/system/marvin.nix
index 44c1e9a5..2e88e0d2 100644
--- a/system/marvin.nix
+++ b/system/marvin.nix
@@ -1,8 +1,14 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+let
+  srvos = import <srvos>;
+in
+{
   imports = [
     ./settings/darwin.nix
     ./settings/dev.nix
     ./settings/programs/shell.nix
+    <personal/modules/darwin/caddy>
+    srvos.modules.darwin.desktop
   ];
 
   services.caddy = {
@@ -24,6 +30,7 @@
     "/Users/alan/.local/state/nix/profile/bin/fish"
   ];
 
+  environment.darwinConfig = "/etc/nix-darwin/configuration.nix";
   environment.variables.LANG = "en_GB.UTF-8";
 
   launchd.user.envVariables = {
diff --git a/system/prefect.nix b/system/prefect.nix
index 662c0144..e145c304 100644
--- a/system/prefect.nix
+++ b/system/prefect.nix
@@ -25,6 +25,11 @@
     ./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 5a9b4996..48c6b4ef 100644
--- a/system/settings/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
@@ -3,6 +3,7 @@
 , lib
 , ...
 }: {
+  imports = [ ../pin.nix ];
   nix = {
     package = pkgs.lix;
     settings = {
@@ -30,16 +31,5 @@
       automatic = lib.mkDefault true;
       options = lib.mkDefault "--delete-older-than 14d";
     };
-
-    registry =
-      if pkgs.stdenv.isDarwin
-      then {
-        nixpkgs.flake = inputs.nixpkgs;
-      } else {
-        nixpkgs.to = {
-          type = "path";
-          path = pkgs.path;
-        };
-      };
   };
 }
diff --git a/system/settings/pin.nix b/system/settings/pin.nix
new file mode 100644
index 00000000..2ff2e773
--- /dev/null
+++ b/system/settings/pin.nix
@@ -0,0 +1,14 @@
+let
+  inherit (import ../../sources.nix) sources;
+in
+{
+  nix = {
+    nixPath = [
+      "nixpkgs=flake:nixpkgs"
+    ];
+    registry.nixpkgs.to = {
+      type = "path";
+      path = sources.nixpkgs;
+    };
+  };
+}