diff --git a/flake.lock b/flake.lock index 4b556d6..eda7b83 100644 --- a/flake.lock +++ b/flake.lock @@ -32,6 +32,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1644229661, @@ -49,16 +65,20 @@ }, "home-manager": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" - ] + ], + "nmd": "nmd", + "nmt": "nmt", + "utils": "utils" }, "locked": { - "lastModified": 1654113406, - "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", + "lastModified": 1655578791, + "narHash": "sha256-/7Sj+kdSmAC1Q7jRwYV4gKjlYFTCQMs/DgDAUqFqnV8=", "owner": "nix-community", "repo": "home-manager", - "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", + "rev": "a0e7ffe7aa6c37b33b80fa7ac03a5327b81bd8d8", "type": "github" }, "original": { @@ -93,11 +113,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1654203681, - "narHash": "sha256-J9Z8VL48MqE2ycfe626TJYDY1pJNbamqf5DJ6kD6y5o=", + "lastModified": 1655530982, + "narHash": "sha256-6O6wY22x6navlG+AtugQ4aKN2N1SceAjb0EvMIc6FvM=", "owner": "neovim", "repo": "neovim", - "rev": "9745941ef620da86bf18f965f85e8fc2ce8206b5", + "rev": "966d55effe5cbfc3d779c89591a1bec4e9ac6639", "type": "github" }, "original": { @@ -109,18 +129,18 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "neovim-flake": "neovim-flake", "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1654244107, - "narHash": "sha256-QbpLCnknvWNelWOgjXzxm31A3HuHycDTeRLxdhGQBW8=", + "lastModified": 1655540134, + "narHash": "sha256-w00GmU8gc/O1x/JyJgx2KoDuiMkQHI4M9aoQrbhPtUs=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "8f9e220b4eb1e92950f5f5c92dd9bc29c9e1859a", + "rev": "bac8d9d3fd7694db8b0fb5e059395c924572a1e5", "type": "github" }, "original": { @@ -131,11 +151,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654181793, - "narHash": "sha256-kP4m7ZgFYj8fh7oW2L0uW0sJw/e0k1HY26HYJcvNEKM=", + "lastModified": 1655456688, + "narHash": "sha256-j2trI5gv2fnHdfUQFBy957avCPxxzCqE8R+TOYHPSRE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40e2b1ae0535885507ab01d7a58969934cf2713c", + "rev": "d17a56d90ecbd1b8fc908d49598fb854ef188461", "type": "github" }, "original": { @@ -147,11 +167,11 @@ }, "nixpkgs-21_11": { "locked": { - "lastModified": 1653819578, - "narHash": "sha256-a1vaUl6VZz1NsWxMw0i5lRyHIOVUIuMZdQzV+4s+rY8=", + "lastModified": 1654346688, + "narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "baa82d4b626288c7439eeea073a18aabbe435991", + "rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45", "type": "github" }, "original": { @@ -163,11 +183,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1653822412, - "narHash": "sha256-xZwMDQ8MdNiTwE8dcKAX1h3qCmLtuudNGxmFUX3xIes=", + "lastModified": 1654373220, + "narHash": "sha256-3vKFnZz2oYHo4YcelaNOhO4XQ2jiIEXrp1s4w+e773c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db78278ff296cf21eca7e8c08ee99707387a54fa", + "rev": "d6cb04299ce8964290ae7fdcb87aa50da0500b5c", "type": "github" }, "original": { @@ -177,13 +197,45 @@ "type": "github" } }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1653339422, + "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=", + "owner": "rycee", + "repo": "nmd", + "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nur": { "locked": { - "lastModified": 1654248756, - "narHash": "sha256-LZuhksW59MwklXQPGlnqns07rz91NAqnDM7K5+s5Kro=", + "lastModified": 1655581313, + "narHash": "sha256-ZgtC3bf8C/+kvQMupJA/S+Gv6b8fxbKmuCeFxIKoeIY=", "owner": "nix-community", "repo": "NUR", - "rev": "5473c9e430d69b933cae009b0e686e1316c57718", + "rev": "ca3afd53e11926872a6623bf721333cb86de083d", "type": "github" }, "original": { @@ -209,7 +261,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": "utils_2" }, "locked": { "lastModified": 1653423337, @@ -235,11 +287,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1653827546, - "narHash": "sha256-va51HFf7UwktvriIbe9pjRPMr7p8IaxrwcDlZe7twzI=", + "lastModified": 1654401128, + "narHash": "sha256-uCdQ2fzIPGakHw2TkvOncUvCl7Fo7z/vagpDWYooO7s=", "owner": "Mic92", "repo": "sops-nix", - "rev": "36b5901782e7fbfc191cace910f67f8b8743f678", + "rev": "f075361ecbde21535b38e41dfaa28a28f160855c", "type": "github" }, "original": { @@ -250,11 +302,11 @@ }, "unstable": { "locked": { - "lastModified": 1654019511, - "narHash": "sha256-s3fcwUxa2rV2ZmSbdOtisNmXqeqnF9IFrvhPQL5GCBU=", + "lastModified": 1655400192, + "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9", + "rev": "3d7435c638baffaa826b85459df0fff47f12317d", "type": "github" }, "original": { @@ -265,6 +317,21 @@ } }, "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { "locked": { "lastModified": 1605370193, "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", diff --git a/lib/default.nix b/lib/default.nix index c63b4b4..e514669 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -60,7 +60,7 @@ in mkVPNSubdomain = name: port: { luj.nginx.enable = true; - security.acme.certs."${name}.luj".server = "https://ca.luj:8443/acme/acme/directory"; + security.acme.certs."${name}.luj".server = "https://ca.luj:8444/acme/acme/directory"; services.nginx.virtualHosts."${name}.luj" = { forceSSL = true; enableACME = true; diff --git a/modules/homer/default.nix b/modules/homer/default.nix index 24ebc06..7b24f60 100644 --- a/modules/homer/default.nix +++ b/modules/homer/default.nix @@ -12,7 +12,7 @@ in { luj.nginx.enable = true; - security.acme.certs."home.luj".server = "https://ca.luj:8443/acme/acme/directory"; + security.acme.certs."home.luj".server = "https://ca.luj:8444/acme/acme/directory"; services.nginx.virtualHosts."home.luj" = { enableACME = true;