ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more things

Browse source
This commit is contained in:
= 2024-03-12 04:11:04 -05:00
parent 2689a3927a
commit c14e0dde4e
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

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

20
systems/_common/ragenix.nix
View file

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

3
users/_common/programs/ssh.nix
View file

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