diff --git a/flake.lock b/flake.lock index 67359eb1..44910a7f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,14 +3,18 @@ "hydra": { "inputs": { "nix": "nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "hydra", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1593509723, - "narHash": "sha256-ESv86LNnQQy5cYqeC1S4otpvkA8ABgs/zbge8xp35aE=", + "lastModified": 1603366072, + "narHash": "sha256-9dK7Mx9BZHZTeJ/oolS7nMakVnCdXQlsA2ePWNPhQks=", "owner": "NixOS", "repo": "hydra", - "rev": "d0deebc4fc95dbeb0249f7b774b03d366596fbed", + "rev": "be709d450b98a384374228db51c14dc958a3a72a", "type": "github" }, "original": { @@ -18,16 +22,33 @@ "type": "indirect" } }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1598695561, + "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "nix": { "inputs": { + "lowdown-src": "lowdown-src", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1592818267, - "narHash": "sha256-t66Ny6NDA9sQa0U79iqo4w7tEBitUGgio9U/H6z3QpE=", + "lastModified": 1603189103, + "narHash": "sha256-KVS/Z6FzMBOl5XCyOLwfiVoX7G2LQRa9HMGNnJRPCoo=", "owner": "NixOS", "repo": "nix", - "rev": "334e26bfc2ce82912602e8a0f9f9c7e0fb5c3221", + "rev": "e0ca98c2071b815578470e280df8fdb750c7e23b", "type": "github" }, "original": { @@ -37,41 +58,39 @@ }, "nixpkgs": { "locked": { - "lastModified": 1591633336, - "narHash": "sha256-oVXv4xAnDJB03LvZGbC72vSVlIbbJr8tpjEW5o/Fdek=", + "lastModified": 1602702596, + "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70717a337f7ae4e486ba71a500367cad697e5f09", + "rev": "ad0d20345219790533ebe06571f82ed6b034db31", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-20.03-small", + "ref": "nixos-20.09-small", "type": "indirect" } }, "nixpkgs_2": { "locked": { - "lastModified": 1592263354, - "narHash": "sha256-1wHPn5qKfzfG06dZhpXDEg5Zt6HwvfyPPgW1tkYFejg=", - "owner": "NixOS", + "lastModified": 1603722914, + "narHash": "sha256-V3cst4osjvfsrR5Qpk8CYWRFQiGm1Rm4lanjMWooH2o=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "a84b797b28eb104db758b5cb2b61ba8face6744b", + "rev": "e3ce7e1002de96da39e1d59dda97360f456a56ad", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-20.03", - "type": "indirect" + "owner": "nixos", + "ref": "release-20.09", + "repo": "nixpkgs", + "type": "github" } }, "root": { "inputs": { "hydra": "hydra", - "nixpkgs": [ - "hydra", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index 37de9d59..a669c59f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,7 @@ description = "C3D2 NixOS configurations"; inputs = { - nixpkgs.follows = "hydra/nixpkgs"; - # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/release-20.09"; # secrets.url = "git+file:///etc/nixos/secrets"; }; diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix index b4b7a87d..4b7116cd 100644 --- a/hosts/hydra/configuration.nix +++ b/hosts/hydra/configuration.nix @@ -46,7 +46,7 @@ options = "--delete-older-than 14d"; }; sshServe.enable = true; - trustedUsers = [ "root" ]; + trustedUsers = [ "@wheel" ]; }; boot = {