diff --git a/seattle/flake.lock b/seattle/flake.lock index b144095..0c23f2c 100644 --- a/seattle/flake.lock +++ b/seattle/flake.lock @@ -223,36 +223,45 @@ "niten-doom-config": "niten-doom-config" }, "locked": { - "narHash": "sha256-AHoJKYZ0PSdz3rMuI6KdFQY9Z6YCw56NQIeimb+/QeY=", - "path": "../fudo-home", - "type": "path" + "lastModified": 1633928169, + "narHash": "sha256-0QkeChztxULh/gSpwsWrALEHvPad3mN/VZZDNb7iTCQ=", + "ref": "flake", + "rev": "583d19499094c8dd9acf0c636418e1eeff5b674b", + "revCount": 33, + "type": "git", + "url": "https://git.fudo.org/niten/nix-home.git" }, "original": { - "path": "../fudo-home", - "type": "path" + "ref": "flake", + "type": "git", + "url": "https://git.fudo.org/niten/nix-home.git" } }, "fudo-nixos": { "flake": false, "locked": { - "narHash": "sha256-GKJ6ejLju+qA2sKGWZuqaYIbYzA99L4xf1PpC4J+wTE=", - "path": "../fudo-nixos", + "narHash": "sha256-VhhiCLopW4wu7g2VlmlPfhsWlW1ONaJ3DCCvh6VTJuY=", + "path": "/state/nixops/fudo-nixos", "type": "path" }, "original": { - "path": "../fudo-nixos", + "path": "/state/nixops/fudo-nixos", "type": "path" } }, "fudo-pkgs": { "locked": { + "lastModified": 1633732024, "narHash": "sha256-H1xthHmjvczP+qYQnoLmZjqagHEk5LVsv/0zDlmZoAc=", - "path": "../fudo-pkgs", - "type": "path" + "ref": "master", + "rev": "160807215cf9158605b072c54a9b682522d62989", + "revCount": 10, + "type": "git", + "url": "https://git.fudo.org/fudo-public/fudo-pkgs.git" }, "original": { - "path": "../fudo-pkgs", - "type": "path" + "type": "git", + "url": "https://git.fudo.org/fudo-public/fudo-pkgs.git" } }, "fudo-secrets": { @@ -265,7 +274,7 @@ "ssh-keypairs": "ssh-keypairs" }, "locked": { - "narHash": "sha256-2Oos5WO+NK4LPEvi2gzvfDhgiAyaalj/3YwMDILO6hY=", + "narHash": "sha256-bkhdakhqENnGRUJwEShOwtgRep/gn8UN2oDoeLkJ0bo=", "path": "/state/secrets", "type": "path" }, @@ -369,11 +378,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1633625029, - "narHash": "sha256-Ia3kwnN9DhcskAIElLSKb4u/OK7nZU/P0TkaikAX790=", + "lastModified": 1633853057, + "narHash": "sha256-TUf/NYJlIw7wVMLFt5G4TRwtrnbz+uuXtTEbulxxI8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781b1f8e3a2194e1e233cd62b4f2193e129a07f7", + "rev": "93ca5ab64f78ce778c0bcecf9458263f0f6289b6", "type": "github" }, "original": { diff --git a/seattle/flake.nix b/seattle/flake.nix index 3eaddd9..c633aa2 100644 --- a/seattle/flake.nix +++ b/seattle/flake.nix @@ -4,16 +4,20 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-21.05"; - fudo-home.url = "path:../fudo-home"; + fudo-home = { + url = "git+https://git.fudo.org/niten/nix-home.git?ref=flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; fudo-secrets.url = "path:/state/secrets"; - fudo-pkgs.url = "path:../fudo-pkgs"; + #fudo-pkgs.url = "path:/state/nixops/fudo-pkgs"; - # fudo-pkgs.url = "path:/state/nixos/fudo-pkgs"; + fudo-pkgs.url = "git+https://git.fudo.org/fudo-public/fudo-pkgs.git"; fudo-nixos = { - url = "path:../fudo-nixos"; + #url = "path:/state/nixops/fudo-nixos"; + url = "git+ssh://git.fudo.org/fudosys/NixOS.git?ref=nixops-flake"; # Don't import it as a flake flake = false; }; @@ -42,7 +46,7 @@ ]; }; overlays = [ - fudo-pkgs.overlay + (import (fudo-pkgs + "/overlay.nix")) (import (fudo-nixos + "/lib/overlay.nix")) ]; }; @@ -65,7 +69,7 @@ fudo-home.nixosModule fudo-secrets.nixosModule (initialize-host { - inherit hostname build-timestamp site domain profile config pkgs lib; + inherit hostname build-timestamp site domain profile; }) ];