fudosys
/
nixops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Carry this to plato to see if that works

This commit is contained in:
niten 2021-10-12 12:10:14 -07:00
parent 289ab1599c
commit 34b7a93e2a
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
seattle/flake.lock
View File

@ -223,36 +223,45 @@
"niten-doom-config": "niten-doom-config" "niten-doom-config": "niten-doom-config"
}, },
"locked": { "locked": {
"narHash": "sha256-AHoJKYZ0PSdz3rMuI6KdFQY9Z6YCw56NQIeimb+/QeY=", "lastModified": 1633928169,
"path": "../fudo-home", "narHash": "sha256-0QkeChztxULh/gSpwsWrALEHvPad3mN/VZZDNb7iTCQ=",
"type": "path" "ref": "flake",
"rev": "583d19499094c8dd9acf0c636418e1eeff5b674b",
"revCount": 33,
"type": "git",
"url": "https://git.fudo.org/niten/nix-home.git"
}, },
"original": { "original": {
"path": "../fudo-home", "ref": "flake",
"type": "path" "type": "git",
"url": "https://git.fudo.org/niten/nix-home.git"
} }
}, },
"fudo-nixos": { "fudo-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-GKJ6ejLju+qA2sKGWZuqaYIbYzA99L4xf1PpC4J+wTE=", "narHash": "sha256-VhhiCLopW4wu7g2VlmlPfhsWlW1ONaJ3DCCvh6VTJuY=",
"path": "../fudo-nixos", "path": "/state/nixops/fudo-nixos",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "../fudo-nixos", "path": "/state/nixops/fudo-nixos",
"type": "path" "type": "path"
} }
}, },
"fudo-pkgs": { "fudo-pkgs": {
"locked": { "locked": {
"lastModified": 1633732024,
"narHash": "sha256-H1xthHmjvczP+qYQnoLmZjqagHEk5LVsv/0zDlmZoAc=", "narHash": "sha256-H1xthHmjvczP+qYQnoLmZjqagHEk5LVsv/0zDlmZoAc=",
"path": "../fudo-pkgs", "ref": "master",
"type": "path" "rev": "160807215cf9158605b072c54a9b682522d62989",
"revCount": 10,
"type": "git",
"url": "https://git.fudo.org/fudo-public/fudo-pkgs.git"
}, },
"original": { "original": {
"path": "../fudo-pkgs", "type": "git",
"type": "path" "url": "https://git.fudo.org/fudo-public/fudo-pkgs.git"
} }
}, },
"fudo-secrets": { "fudo-secrets": {
@ -265,7 +274,7 @@
"ssh-keypairs": "ssh-keypairs" "ssh-keypairs": "ssh-keypairs"
}, },
"locked": { "locked": {
"narHash": "sha256-2Oos5WO+NK4LPEvi2gzvfDhgiAyaalj/3YwMDILO6hY=", "narHash": "sha256-bkhdakhqENnGRUJwEShOwtgRep/gn8UN2oDoeLkJ0bo=",
"path": "/state/secrets", "path": "/state/secrets",
"type": "path" "type": "path"
}, },
@ -369,11 +378,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1633625029, "lastModified": 1633853057,
"narHash": "sha256-Ia3kwnN9DhcskAIElLSKb4u/OK7nZU/P0TkaikAX790=", "narHash": "sha256-TUf/NYJlIw7wVMLFt5G4TRwtrnbz+uuXtTEbulxxI8Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "781b1f8e3a2194e1e233cd62b4f2193e129a07f7", "rev": "93ca5ab64f78ce778c0bcecf9458263f0f6289b6",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
seattle/flake.nix
View File

@ -4,16 +4,20 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-21.05"; 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-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 = { 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 # Don't import it as a flake
flake = false; flake = false;
}; };
@ -42,7 +46,7 @@
]; ];
}; };
overlays = [ overlays = [
fudo-pkgs.overlay (import (fudo-pkgs + "/overlay.nix"))
(import (fudo-nixos + "/lib/overlay.nix")) (import (fudo-nixos + "/lib/overlay.nix"))
]; ];
}; };
@ -65,7 +69,7 @@
fudo-home.nixosModule fudo-home.nixosModule
fudo-secrets.nixosModule fudo-secrets.nixosModule
(initialize-host { (initialize-host {
inherit hostname build-timestamp site domain profile config pkgs lib; inherit hostname build-timestamp site domain profile;
}) })
]; ];