Skip to content

Commit f1d8ea6

Browse files
committed
feat(deploy): update mirai hostname and add tako deployment config
The commit updates the hostname for the mirai node to include the full domain name and adds a new deployment configuration for a tako node. It also includes changes to the tako configuration file such as updating secret paths, user configuration, timezone, and disk layout settings. Additionally, several services are commented out in the tako configuration.
1 parent b5399c5 commit f1d8ea6

4 files changed

Lines changed: 22 additions & 14 deletions

File tree

deploy.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
}: {
66
nodes = {
77
mirai = {
8-
hostname = "mirai";
8+
hostname = "mirai.darksailor.dev";
99
profiles.system = {
1010
sshUser = "fs0c131y";
1111
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mirai;
@@ -28,6 +28,14 @@
2828
user = "root";
2929
};
3030
};
31+
tako = {
32+
hostname = "tako.darksailor.dev";
33+
profiles.system = {
34+
sshUser = "root";
35+
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.tako;
36+
user = "root";
37+
};
38+
};
3139
# kuro = {
3240
# hostname = "kuro";
3341
# interactiveSudo = true;

nixos/tako/configuration.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
security.sudo.wheelNeedsPassword = false;
2626
sops = {
27-
secrets."builder/tako/cache/private" = {};
27+
secrets."builder/mirai/cache/private" = {};
2828
secrets.users = {
2929
sopsFile = ../../secrets/users.yaml;
3030
format = "yaml";
@@ -58,7 +58,7 @@
5858
build-users-group = nixbld
5959
extra-nix-path = nixpkgs=flake:nixpkgs
6060
builders-use-substitutes = true
61-
secret-key-files = ${config.sops.secrets."builder/tako/cache/private".path}
61+
secret-key-files = ${config.sops.secrets."builder/mirai/cache/private".path}
6262
'';
6363
gc = {
6464
automatic = true;
@@ -69,7 +69,7 @@
6969
distributedBuilds = true;
7070
};
7171

72-
users.users.fs0c131y = {
72+
users.users.${device.user} = {
7373
isNormalUser = true;
7474
extraGroups = ["wheel" "docker" "media"];
7575
openssh.authorizedKeys.keyFiles = [
@@ -92,7 +92,7 @@
9292
# networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
9393

9494
# Set your time zone.
95-
time.timeZone = "Europe/Helsinki";
95+
time.timeZone = "Asia/Singapore";
9696

9797
# Configure network proxy if necessary
9898
# networking.proxy.default = "http://user:password@proxy:port/";

nixos/tako/disk-config.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
disk = {
44
one = {
55
type = "disk";
6-
device = "/dev/nvme0n1";
6+
device = "/dev/sda";
77
content = {
88
type = "gpt";
99
partitions = {
@@ -31,7 +31,7 @@
3131
};
3232
two = {
3333
type = "disk";
34-
device = "/dev/nvme1n1";
34+
device = "/dev/sdb";
3535
content = {
3636
type = "gpt";
3737
partitions = {
@@ -51,7 +51,7 @@
5151
type = "lvm_vg";
5252
lvs = {
5353
root = {
54-
size = "64G";
54+
size = "128G";
5555
lvm_type = "mirror";
5656
content = {
5757
type = "filesystem";
@@ -72,7 +72,7 @@
7272
};
7373
};
7474
home = {
75-
size = "256G";
75+
size = "64G";
7676
lvm_type = "raid0";
7777
content = {
7878
type = "filesystem";

nixos/tako/services/default.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
./excalidraw.nix
77
./fail2ban.nix
88
./flaresolverr.nix
9-
./games
9+
# ./games
1010
./gitea.nix
1111
./homepage.nix
1212
# ./immich.nix
1313
./immich.nix
1414
# ./llama.nix
1515
./lldap.nix
16-
./monitoring.nix
17-
./nextcloud.nix
16+
# ./monitoring.nix
17+
# ./nextcloud.nix
1818
# ./paperless.nix
1919
./prowlarr.nix
2020
./resolved.nix
2121
./searxng.nix
2222
./tailscale.nix
23-
./headscale.nix
24-
./shitpost.nix
23+
# ./headscale.nix
24+
# ./shitpost.nix
2525
];
2626
services = {
2727
nix-serve = {

0 commit comments

Comments
 (0)