From 1d0143fcdc230e55f7151ead14f9f5abaee5e2bd Mon Sep 17 00:00:00 2001 From: Bad Date: Tue, 10 May 2022 21:16:20 +0200 Subject: [PATCH] Add cachix --- flake.lock | 75 ++++++++++++++------------------------- profiles/core/default.nix | 12 +++++++ profiles/ssh/default.nix | 8 ----- 3 files changed, 38 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 9466612..a2acb64 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1650976225, - "narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=", + "lastModified": 1651916036, + "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0", + "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba", "type": "github" }, "original": { @@ -57,7 +57,10 @@ }, "darwin_2": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "digga", + "nixpkgs" + ] }, "locked": { "lastModified": 1650976225, @@ -101,7 +104,10 @@ "devshell": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "digga", + "nixpkgs" + ] }, "locked": { "lastModified": 1650389807, @@ -165,11 +171,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1651732109, - "narHash": "sha256-W3GuTyMxswHGfaYTQ4Ajev6GxfDef8YyxyYbFgrfwNk=", + "lastModified": 1652077709, + "narHash": "sha256-tvpHXGtgopAV+DkCFNDa1FIgz3ByKX/kzsL8Eypzq2E=", "owner": "nix-community", "repo": "fenix", - "rev": "4b6dda7529e6d1d8d2ce43b7cb18efdefd5c4c3c", + "rev": "4fd8f4e9ccc72d82b1f79ab2ab00a95adb12169c", "type": "github" }, "original": { @@ -296,11 +302,11 @@ ] }, "locked": { - "lastModified": 1651652192, - "narHash": "sha256-3FUsIJ81p57rOxODRVZ+anhnVav96VWbgNA1H3Np+TY=", + "lastModified": 1652167840, + "narHash": "sha256-Qx//y33FkhUun+en60SakO9iQPPLu18fUpr3kKTkif8=", "owner": "nix-community", "repo": "home-manager", - "rev": "267462dfb36d447421c789a3adf9d460cd09c147", + "rev": "4293902b64990d43847fe90e50ef7908f7dc1e30", "type": "github" }, "original": { @@ -312,11 +318,11 @@ }, "latest": { "locked": { - "lastModified": 1651558728, - "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=", + "lastModified": 1652082323, + "narHash": "sha256-7GSVLvfCJtH9dJ3om9Lg4fsi9UKvoxxR69gUTcx0ol8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cbe587c735b734405f56803e267820ee1559e6c1", + "rev": "2a3aac479caeba0a65b2ad755fe5f284f1fde74d", "type": "github" }, "original": { @@ -348,11 +354,11 @@ }, "nixos": { "locked": { - "lastModified": 1651662302, - "narHash": "sha256-utlTjLa1s4ezdQIUvnBtmA9TBYFrPlXpAJnCXEiZFZI=", + "lastModified": 1652020977, + "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dff5496b12817e3d019983827c4b7ba7beb96580", + "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", "type": "github" }, "original": { @@ -377,35 +383,6 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1651571855, - "narHash": "sha256-KZie6c2J2DUPLjG2PkYSwGLvD6RygA3TxZSPQpctbNI=", - "path": "/nix/store/mn9i3n9xnfqbw66780mv4rmlcc764z43-source", - "rev": "fd43ce017d4c95f47166d28664a004f57458a0b1", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1651690927, - "narHash": "sha256-ejcIWou5r+0d84IYWgiPJrNPEGaszP9ZNu2/+JdXPx4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b4cc9cd38f05f1a764e21bfb1b14e89be76068b0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvfetcher": { "inputs": { "flake-compat": "flake-compat_3", @@ -449,11 +426,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1651656737, - "narHash": "sha256-+nc9Rrc1PBGAx2jXV57Af8WL4nQTTNGX2fp63YD7ynU=", + "lastModified": 1651933512, + "narHash": "sha256-dM1vc+dZ/xZ1XSOFnutXjpJnnzu6xs9qikZnLmrFi7Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "1f709d54463972b189a3120be4073c507f2fbc00", + "rev": "5d5bbec9b60010dd7389a084c56693baf6bda780", "type": "github" }, "original": { diff --git a/profiles/core/default.nix b/profiles/core/default.nix index dc0f5f6..0d960b4 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -2,6 +2,18 @@ let inherit (lib) fileContents; in { + + # Cachix + nix = { + binaryCaches = [ + "https://cache.nixos.org/" + "https://nix-community.cachix.org" + ]; + binaryCachePublicKeys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; + # For rage encryption, all hosts need a ssh key pair services.openssh = { enable = true; diff --git a/profiles/ssh/default.nix b/profiles/ssh/default.nix index cbf44e6..233bc11 100644 --- a/profiles/ssh/default.nix +++ b/profiles/ssh/default.nix @@ -7,14 +7,6 @@ openFirewall = true; passwordAuthentication = false; }; - nix.sshServe.enable = true; - nix.sshServe.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID29iFz1dBQmbCbVkclFEn4I9dY2uf3u7bbKs2obEIl/ mae@teapot" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKGYGAlEHbg4fqLk+KgpqVtCCbUnUq1Z/IF0xPPJqJT8 justabanana@tesco" - ]; - #nix.binaryCaches = [ - # "ssh://nix-ssh@192.168.0.18" - #]; nix.allowedUsers = [ "nix-ssh" ];