more things

flake.lock

@@ -131,11 +131,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710063049,
-        "narHash": "sha256-cKiaLtaLKHspCnLSweW3YEEwo3XfvTEFTbopLRSVzbc=",
+        "lastModified": 1710226713,
+        "narHash": "sha256-jROwOu7syZpV4wYxOdObrSvoqsCUFiuAim5U3vT8WGk=",
         "owner": "yunfachi",
         "repo": "nypkgs",
-        "rev": "a003afbe194af34a443319619d5f9c074b1f16c7",
+        "rev": "741a305dd037b81d745e5169210d6c0bb0aedd5f",
         "type": "github"
       },
       "original": {

systems/_common/ragenix.nix

@@ -1,8 +1,7 @@
 # TODO check out the by host way this person does: https://github.com/hlissner/dotfiles/blob/089f1a9da9018df9e5fc200c2d7bef70f4546026/modules/agenix.nix
 { settings, lib, ragenix, ... }:
 let
-  # secretsDir = "${settings.secretsDir}";
-  # secretsFile = "${secretsDir}/secrets.nix";
+  # secretsFile = (settings.secretsDir + /secrets.nix);
 in
 {
   imports = [ ragenix.nixosModules.age ];
@@ -10,20 +9,21 @@ in
 
   age = {
     secrets =
-      # if builtins.pathExists secretsFile
-      # then
-      #   builtins.mapAttrs'
-      #     (n: _: lib.nameValuePair (lib.removeSuffix ".age" n) {
-      #       file = "${secretsDir}/${n}";
-      #       owner = lib.mkDefault settings.user.username; # TODO and root? or does that matter...
+      # builtins.mapAttrs
+      #   (name: _value: lib.nameValuePair (lib.removeSuffix ".age" name) {
+      #     file = (settings.secretsDir + "/${name}");
+      #     owner = lib.mkDefault settings.user.username;
       #   })
-      #     (import secretsFile)
-      # else { };
+      #   (import secretsFile);
       {
         nix2github = {
           file = /${settings.secretsDir}/nix2github.age;
           owner = settings.user.username;
         };
+        nix2bitbucket = {
+          file = /${settings.secretsDir}/nix2bitbucket.age;
+          owner = settings.user.username;
+        };
       };
   };
 }

users/_common/programs/ssh.nix

@@ -22,6 +22,9 @@
       "github.com" = {
         identityFile = age.secrets.nix2github.path;
       };
+      "bitbucket.org" = {
+        identityFile = age.secrets.nix2bitbucket.path;
+      };
     };
   };
 }