randoms
This commit is contained in:
parent
5fd49b6456
commit
6d9f7679f0
4 changed files with 18 additions and 10 deletions
|
@ -115,7 +115,7 @@ in
|
||||||
# LINODE SERVERS
|
# LINODE SERVERS
|
||||||
"l001" = {
|
"l001" = {
|
||||||
identityFile = age.secrets.nix2linode.path;
|
identityFile = age.secrets.nix2linode.path;
|
||||||
hostname = "172.236.111.33";
|
hostname = "172.236.111.33"; # Not on the tailscale network it is the primary host
|
||||||
user = "root";
|
user = "root";
|
||||||
};
|
};
|
||||||
"l002_" = {
|
"l002_" = {
|
||||||
|
@ -127,6 +127,16 @@ in
|
||||||
identityFile = age.secrets.nix2linode.path;
|
identityFile = age.secrets.nix2linode.path;
|
||||||
user = "root";
|
user = "root";
|
||||||
};
|
};
|
||||||
|
# ORACLE SERVERS
|
||||||
|
"o001" = {
|
||||||
|
identityFile = age.secrets.nix2oracle.path;
|
||||||
|
user = "root";
|
||||||
|
};
|
||||||
|
"o001_" = {
|
||||||
|
identityFile = age.secrets.nix2oracle.path;
|
||||||
|
hostname = "64.181.210.7";
|
||||||
|
user = "root";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
|
ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
|
||||||
mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
|
mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
|
||||||
mod_common.inputs.nixpkgs.follows = "nixpkgs";
|
mod_common.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# mod_ros_stormd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_stormd";
|
|
||||||
# mod_nebula.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_nebula";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
@ -61,12 +59,10 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
users.users.root.openssh.authorizedKeys.keys = [
|
users.users.root.openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFLBVLiPbhVG+riNNpkvXnNtOioByV3CQwtY9gu8pstp nix2l002"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode"
|
||||||
];
|
];
|
||||||
components = {
|
components = {
|
||||||
# NOTE we manually onboard this machine since it also hosts headscale itself and I don't want to push
|
# NOTE we manually onboard this machine since it has no secrets uploaded to it
|
||||||
# the key in this config.
|
|
||||||
tailscale.useSecretsAuth = false;
|
tailscale.useSecretsAuth = false;
|
||||||
};
|
};
|
||||||
mods = {
|
mods = {
|
||||||
|
@ -84,7 +80,6 @@
|
||||||
];
|
];
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFLBVLiPbhVG+riNNpkvXnNtOioByV3CQwtY9gu8pstp nix2l002"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,11 +96,9 @@
|
||||||
discordo
|
discordo
|
||||||
discord
|
discord
|
||||||
firefox-esr
|
firefox-esr
|
||||||
# freecad
|
|
||||||
openscad
|
openscad
|
||||||
# ladybird
|
|
||||||
# ollama
|
|
||||||
vlc
|
vlc
|
||||||
|
bitwarden
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -54,12 +54,17 @@
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./nginx.nix
|
./nginx.nix
|
||||||
|
../../../components/nix/tailscale.nix
|
||||||
(
|
(
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
users.users.root.openssh.authorizedKeys.keys = [
|
users.users.root.openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG90Gg6dV3yhZ5+X40vICbeBwV9rfD39/8l9QSqluTw8 nix2oracle"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG90Gg6dV3yhZ5+X40vICbeBwV9rfD39/8l9QSqluTw8 nix2oracle"
|
||||||
];
|
];
|
||||||
|
components = {
|
||||||
|
# NOTE we manually onboard this machine since it has no secrets uploaded to it
|
||||||
|
tailscale.useSecretsAuth = false;
|
||||||
|
};
|
||||||
mods = {
|
mods = {
|
||||||
common = {
|
common = {
|
||||||
disableRemoteBuildsOnLio = true;
|
disableRemoteBuildsOnLio = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue