Merge branch 'main' into teutat3s-init-fae

README.md

@@ -58,14 +58,15 @@ following giants][giants]:
 - [devshell](https://github.com/numtide/devshell)
 
 ## Divnix
-The divnix org is an open space that spontaniously formed out of "the Nix".
+The divnix org is an open space that spontaneously formed out of "the Nix".
-It is really just a place where otherwise unrelated people a) get
+It is really just a place where otherwise unrelated people work
-together and b) stuff done.
+together and get stuff done.
 
-It's a place to stop "geeking out in isolation" (or within company boundaries),
+It's a place to stop "geeking out in isolation" (or within company boundaries).
-experiment and learn together and iterate quickly on best practices. That's what it is.
+A place to experiment, learn together, and iterate quickly on best practices.
+That's what it is.
 
-It might eventually become a non-profit if that's not too complicated or if those
+It might eventually become a non-profit if that's not too complicated or, if those
 goals are sufficiently upstreamed into "the Nix", dissolved.
 
 # License

doc/secrets.md

@@ -14,7 +14,7 @@ to easily setup those secret files declaratively.
 [agenix][agenix] encrypts secrets and stores them as .age files in your repository.
 Age files are encrypted with multiple ssh public keys, so any host or user with a
 matching ssh private key can read the data. The [age module][age module] will add those
-encrypted files to the nix store and decrypt them on activation to `/run/secrets`.
+encrypted files to the nix store and decrypt them on activation to `/run/agenix`.
 
 ### Setup
 All hosts must have openssh enabled, this is done by default in the core profile.

flake.lock

@@ -102,7 +102,6 @@
     },
     "deploy": {
       "inputs": {
-        "fenix": "fenix",
         "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixos"
@@ -110,15 +109,15 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1639771334,
+        "lastModified": 1643787431,
-        "narHash": "sha256-4hgZmsCPaL5QlcEijHmzaYYrEwHtUFqraCUrCqLGJOo=",
+        "narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=",
-        "owner": "input-output-hk",
+        "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "7267eab9139ca4476fd8ed49e2e8652bba4c037f",
+        "rev": "4154ba1aaaf7333a916384c348d867d03b6f1409",
         "type": "github"
       },
       "original": {
-        "owner": "input-output-hk",
+        "owner": "serokell",
         "repo": "deploy-rs",
         "type": "github"
       }
@@ -172,25 +171,6 @@
         "type": "github"
       }
     },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1639117493,
-        "narHash": "sha256-67H9uXUdauaqMfkcKzpgHR3GeOKPAwOs6G3C1VpT67o=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "94b5686cad2ed210da106b0b7e1e212dab43fbf2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -524,16 +504,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1638986258,
+        "lastModified": 1644972330,
-        "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=",
+        "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
+        "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -626,23 +606,6 @@
         "nvfetcher": "nvfetcher"
       }
     },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1639071661,
-        "narHash": "sha256-4YySLORuK0qGGIEJj78S7CZ4jy4GIHJ5ks17k5AWblo=",
-        "owner": "rust-analyzer",
-        "repo": "rust-analyzer",
-        "rev": "2534b7db1a093543d5bd759b3a1ca9e34418fa31",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-analyzer",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "utils": {
       "locked": {
         "lastModified": 1637014545,

flake.nix

@@ -27,7 +27,7 @@
       darwin.url = "github:LnL7/nix-darwin";
       darwin.inputs.nixpkgs.follows = "nixos";
 
-      deploy.url = "github:input-output-hk/deploy-rs";
+      deploy.url = "github:serokell/deploy-rs";
       deploy.inputs.nixpkgs.follows = "nixos";
 
       agenix.url = "github:ryantm/agenix";