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

fix issues

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2026-01-06 20:39:24 -06:00
parent f8f93a97dc
commit f83697c726
4 changed files with 51 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

45
flakes/common/hm_modules/ssh.nix
View file

@ -4,11 +4,10 @@
...
}:
let
inherit (osConfig) age;
hasSecret =
secret:
let
secrets = age.secrets or { };
secrets = osConfig.age.secrets or { };
in
secrets ? ${secret} && secrets.${secret} != null;
in
@ -39,39 +38,39 @@ in
# EXTERNAL
"github.com" = lib.mkIf (hasSecret "nix2github") {
identityFile = age.secrets.nix2github.path;
identityFile = osConfig.age.secrets.nix2github.path;
};
"bitbucket.org" = lib.mkIf (hasSecret "nix2bitbucket") {
identityFile = age.secrets.nix2bitbucket.path;
identityFile = osConfig.age.secrets.nix2bitbucket.path;
};
"git.joshuabell.xyz" = {
identityFile = lib.mkIf (hasSecret "nix2gitforgejo") age.secrets.nix2gitforgejo.path;
identityFile = lib.mkIf (hasSecret "nix2gitforgejo") osConfig.age.secrets.nix2gitforgejo.path;
user = "git";
};
# PERSONAL DEVICES
"lio" = {
identityFile = lib.mkIf (hasSecret "nix2lio") age.secrets.nix2lio.path;
identityFile = lib.mkIf (hasSecret "nix2lio") osConfig.age.secrets.nix2lio.path;
user = "josh";
};
"lio_" = {
identityFile = lib.mkIf (hasSecret "nix2lio") age.secrets.nix2lio.path;
identityFile = lib.mkIf (hasSecret "nix2lio") osConfig.age.secrets.nix2lio.path;
hostname = "10.12.14.116";
user = "josh";
};
"oren" = {
identityFile = lib.mkIf (hasSecret "nix2oren") age.secrets.nix2oren.path;
identityFile = lib.mkIf (hasSecret "nix2oren") osConfig.age.secrets.nix2oren.path;
user = "josh";
};
"juni" = {
identityFile = lib.mkIf (hasSecret "nix2nix") age.secrets.nix2nix.path;
identityFile = lib.mkIf (hasSecret "nix2nix") osConfig.age.secrets.nix2nix.path;
user = "josh";
};
"gp3" = {
identityFile = lib.mkIf (hasSecret "nix2gpdPocket3") age.secrets.nix2gpdPocket3.path;
identityFile = lib.mkIf (hasSecret "nix2gpdPocket3") osConfig.age.secrets.nix2gpdPocket3.path;
user = "josh";
};
"t" = {
identityFile = lib.mkIf (hasSecret "nix2t") age.secrets.nix2t.path;
identityFile = lib.mkIf (hasSecret "nix2t") osConfig.age.secrets.nix2t.path;
user = "joshua.bell";
localForwards = [
{
@ -85,7 +84,7 @@ in
};
};
"t_" = {
identityFile = lib.mkIf (hasSecret "nix2t") age.secrets.nix2t.path;
identityFile = lib.mkIf (hasSecret "nix2t") osConfig.age.secrets.nix2t.path;
hostname = "10.12.14.181";
user = "joshua.bell";
localForwards = [
@ -101,54 +100,54 @@ in
};
# HOME SERVERS
"h001" = {
identityFile = lib.mkIf (hasSecret "nix2h001") age.secrets.nix2h001.path;
identityFile = lib.mkIf (hasSecret "nix2h001") osConfig.age.secrets.nix2h001.path;
user = "luser";
};
"h001_" = {
identityFile = lib.mkIf (hasSecret "nix2h001") age.secrets.nix2h001.path;
identityFile = lib.mkIf (hasSecret "nix2h001") osConfig.age.secrets.nix2h001.path;
hostname = "10.12.14.10";
user = "luser";
};
"h002" = {
identityFile = lib.mkIf (hasSecret "nix2nix") age.secrets.nix2nix.path;
identityFile = lib.mkIf (hasSecret "nix2nix") osConfig.age.secrets.nix2nix.path;
user = "luser";
};
"h002_" = {
identityFile = lib.mkIf (hasSecret "nix2nix") age.secrets.nix2nix.path;
identityFile = lib.mkIf (hasSecret "nix2nix") osConfig.age.secrets.nix2nix.path;
hostname = "10.12.14.183";
user = "luser";
};
"h003" = {
identityFile = lib.mkIf (hasSecret "nix2h003") age.secrets.nix2h003.path;
identityFile = lib.mkIf (hasSecret "nix2h003") osConfig.age.secrets.nix2h003.path;
hostname = "10.12.14.1";
user = "luser";
};
"h003_" = {
identityFile = lib.mkIf (hasSecret "nix2h003") age.secrets.nix2h003.path;
identityFile = lib.mkIf (hasSecret "nix2h003") osConfig.age.secrets.nix2h003.path;
user = "luser";
};
# LINODE SERVERS
"l001" = {
identityFile = lib.mkIf (hasSecret "nix2linode") age.secrets.nix2linode.path;
identityFile = lib.mkIf (hasSecret "nix2linode") osConfig.age.secrets.nix2linode.path;
hostname = "172.236.111.33"; # Not on the tailscale network it is the primary host
user = "root";
};
"l002_" = {
identityFile = lib.mkIf (hasSecret "nix2linode") age.secrets.nix2linode.path;
identityFile = lib.mkIf (hasSecret "nix2linode") osConfig.age.secrets.nix2linode.path;
hostname = "172.234.26.141";
user = "root";
};
"l002" = {
identityFile = lib.mkIf (hasSecret "nix2linode") age.secrets.nix2linode.path;
identityFile = lib.mkIf (hasSecret "nix2linode") osConfig.age.secrets.nix2linode.path;
user = "root";
};
# ORACLE SERVERS
"o001" = {
identityFile = lib.mkIf (hasSecret "nix2oracle") age.secrets.nix2oracle.path;
identityFile = lib.mkIf (hasSecret "nix2oracle") osConfig.age.secrets.nix2oracle.path;
user = "root";
};
"o001_" = {
identityFile = lib.mkIf (hasSecret "nix2oracle") age.secrets.nix2oracle.path;
identityFile = lib.mkIf (hasSecret "nix2oracle") osConfig.age.secrets.nix2oracle.path;
hostname = "64.181.210.7";
user = "root";
};

10
flakes/common/nix_modules/tailnet.nix
View file

@ -4,6 +4,14 @@
lib,
...
}:
let
hasSecret =
secret:
let
secrets = config.age.secrets or { };
in
secrets ? ${secret} && secrets.${secret} != null;
in
{
environment.systemPackages = with pkgs; [ tailscale ];
boot.kernelModules = [ "tun" ];
@ -12,7 +20,7 @@
enable = true;
openFirewall = true;
useRoutingFeatures = "client";
authKeyFile = config.age.secrets.headscale_auth.path;
authKeyFile = lib.mkIf (hasSecret "headscale_auth") config.age.secrets.headscale_auth.path;
extraUpFlags = [
"--login-server=https://headscale.joshuabell.xyz"
];