tristan/nixinate
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Cleanup Examples #14

Merged
MatthewCroughan merged 2 commits from mc/cleanup into master 2022-03-23 23:55:24 +00:00
Conversation 0 Commits 2 Files changed 4 +73 -69
4 changed files with 73 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
examples/flake.lock generated
View file

@ -1,6 +1,40 @@
{ {
"nodes": { "nodes": {
"examples": {
"inputs": {
"nixinate": "nixinate_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"narHash": "sha256-1iruH96Aame+4NAAwSwVZAbHzfnKxhMLjgoVvJar6ls=",
"path": "./examples",
"type": "path"
},
"original": {
"path": "./examples",
"type": "path"
}
},
"nixinate": { "nixinate": {
"inputs": {
"examples": "examples",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1646587087,
"narHash": "sha256-SwOHL/tte1H8VvftnxtWCr5FIlZaGvNy57P9sMSrZ5Q=",
"owner": "matthewcroughan",
"repo": "nixinate",
"rev": "886c6a2b3bef14cacf6c3021df0a75bb57f9fbc7",
"type": "github"
},
"original": {
"owner": "matthewcroughan",
"repo": "nixinate",
"type": "github"
}
},
"nixinate_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
@ -46,10 +80,42 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1647893727,
"narHash": "sha256-pOi7VdCb+s5Cwh5CS7YEZVRgH9uCmE87J5W7iXv29Ck=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1ec61dd4167f04be8d05c45780818826132eea0d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1641147223,
"narHash": "sha256-eJnmISYGR7LeqEev4bsI/qcU0SgeFKHs3jnL4vMGL+k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "08370e1e271f6fe00d302bebbe510fe0e2c611ca",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nixinate": "nixinate", "nixinate": "nixinate",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_4"
} }
} }
}, },

6
examples/flake.nix
View file

@ -1,7 +1,9 @@
# TODO: use a relative path to nixinate, so that everything is contained within this repo.
# This would rely upon https://github.com/NixOS/nix/pull/5437 being merged.
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
nixinate.url = "path:///etc/nixos/nixinate"; nixinate.url = "github:matthewcroughan/nixinate";
}; };
outputs = { self, nixpkgs, nixinate }: { outputs = { self, nixpkgs, nixinate }: {
@ -10,7 +12,7 @@
myMachine = nixpkgs.lib.nixosSystem { myMachine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ {
_module.args.nixinate = { _module.args.nixinate = {
host = "itchy.scratchy.com"; host = "itchy.scratchy.com";
sshUser = "matthew"; sshUser = "matthew";

64
flake.lock generated
View file

@ -1,67 +1,6 @@
{ {
"nodes": { "nodes": {
"examples": {
"inputs": {
"nixinate": "nixinate",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"narHash": "sha256-OsFQxO7h4YHrRQX8oHIjvgjTbeJx0oIP+pOIpfiwMiU=",
"path": "./examples",
"type": "path"
},
"original": {
"path": "./examples",
"type": "path"
}
},
"nixinate": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"narHash": "sha256-lk8eIWYxtHqDT4ZmSFuXMlG067RdPqLCQocnN+hNE7U=",
"path": "/etc/nixos/nixinate",
"type": "path"
},
"original": {
"path": "/etc/nixos/nixinate",
"type": "path"
}
},
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1640887906,
"narHash": "sha256-Eupk1UlNicCD2UNZuEKt6yhE6kFWAxXM/HyziOjG9CA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8a053bc2255659c5ca52706b9e12e76a8f50dbdd",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1641147223,
"narHash": "sha256-eJnmISYGR7LeqEev4bsI/qcU0SgeFKHs3jnL4vMGL+k=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "08370e1e271f6fe00d302bebbe510fe0e2c611ca",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1643852787, "lastModified": 1643852787,
"narHash": "sha256-RHrvroV61jcfTXfW0Rwc0qu/8lHmfYxSy49adyXkB0I=", "narHash": "sha256-RHrvroV61jcfTXfW0Rwc0qu/8lHmfYxSy49adyXkB0I=",
@ -79,8 +18,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"examples": "examples", "nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_3"
} }
} }
}, },

4
flake.nix
View file

@ -2,9 +2,8 @@
description = "Nixinate your systems 🕶️"; description = "Nixinate your systems 🕶️";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
examples.url = "path:./examples";
}; };
outputs = { self, nixpkgs, examples, ... }: outputs = { self, nixpkgs, ... }:
let let
version = builtins.substring 0 8 self.lastModifiedDate; version = builtins.substring 0 8 self.lastModifiedDate;
supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
@ -71,6 +70,5 @@
}; };
}; };
nixinate = forAllSystems (system: nixpkgsFor.${system}.generateApps); nixinate = forAllSystems (system: nixpkgsFor.${system}.generateApps);
apps = nixinate.x86_64-linux examples;
}; };
} }