Skip to content

Commit 904da6c

Browse files
committed
Remove flake dependency on other nixos configs
1 parent fcd118c commit 904da6c

File tree

8 files changed

+97
-620
lines changed

8 files changed

+97
-620
lines changed

flake.lock

Lines changed: 2 additions & 594 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
uv2nix.inputs.pyproject-nix.follows = "pyproject-nix";
2828
uv2nix.inputs.nixpkgs.follows = "nixpkgs";
2929

30-
staging.url = "github:jhh/nixos-configs";
31-
staging.inputs.nixpkgs.follows = "nixpkgs";
32-
3330
pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs";
3431
pyproject-build-systems.inputs.pyproject-nix.follows = "pyproject-nix";
3532
pyproject-build-systems.inputs.uv2nix.follows = "uv2nix";

justfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test: (manage "test --keepdb")
2828

2929
_check_nixos:
3030
@if ! command -v nixos-rebuild &> /dev/null; then \
31-
echo "Not on NixOS, skipping deploy to staging"; \
31+
echo "Not on NixOS, skipping deploy..."; \
3232
exit 1; \
3333
fi
3434

@@ -41,8 +41,6 @@ stage how="switch": (_deploy_to "pallas" "" how)
4141
# deploy to production server
4242
deploy how="dry-activate": (_deploy_to "mercury" "--use-substitutes" how)
4343

44-
45-
4644
# push packages to cachix
4745
push:
4846
nix build --json .#venv | jq -r '.[].outputs | to_entries[].value' | cachix push strykeforce

nix/hosts/pallas/aws_secret.age

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
age-encryption.org/v1
2-
-> ssh-ed25519 R4OZVw 61NZ1+OedexMb6o742bb25IAZct7QcE8G8fao6HN/lw
3-
geNjTh9CvdW7WzaCtsE6shuAo8dRCZo/WFTfPHJkUbQ
4-
-> ssh-ed25519 eLi0pQ +QH6ECUF6Eg8vmjbd3vXmhQOi4x0lbSwH1f2uGn05k0
5-
+fM/aBydvXsmmFG/U+5M/6jC5lDHIanaBQFfcCRERgM
6-
--- wgKhE7EpNvF+Tok3ZMZHTLCHya3vmHqa45Y6p3JmT1k
7-
7z�t^����rУ~%���p�G8�(A~
8-
Å'G�mR�0O�s�߹����De�H�{=�nq�K'b���q����Wj��6�BN�<�U��#߆����^Y�����Z�8�x���()��M������jx\��7�{Ʈ��6g
2+
-> ssh-ed25519 R4OZVw +q4nzKdduxZh9cO9jOLNwhrNsbt+7ASp8Kqzc5SJUV8
3+
KVxoVczfI+PCUPDQbyf8oPGXGJMpJU0NZ1pJ+qrGMfM
4+
-> ssh-ed25519 eLi0pQ OaRBXFf/0KF1e8zBYv+OTHGFsyg0WcIssRQ0xFRjRHY
5+
+iJbmJVY6C8qHcAeBKJOyk75p5mj9ElvHWolKF1nLpk
6+
--- lfLXpDgPmHJPhTs73Gv6fGTOWE/T/dD0V7PU29oEJ5Y
7+
Ɣm�Ŗrd�����zP��tҲHx�L��'�^��ۍ1&ς�/�'H.G)�H�2���I��G:Ľn�D����������z��1ٽ(�/u��MII8oN�� �*�Y��+X}�����L�b1�Ԭ[���56-���

nix/hosts/pallas/configuration.nix

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,93 @@
11
{
2+
config,
23
flake,
34
inputs,
5+
modulesPath,
46
pkgs,
5-
perSystem,
67
...
78
}:
89
{
910
imports = [
10-
inputs.staging.nixosModules.hardware-proxmox-lxc
11-
inputs.staging.nixosModules.server-j3ff
11+
(modulesPath + "/virtualisation/proxmox-lxc.nix")
12+
inputs.srvos.nixosModules.server
1213
flake.nixosModules.strykeforce-website
14+
inputs.agenix.nixosModules.default
1315
./postgresql.nix
1416
./strykeforce-sync.nix
1517
./strykeforce-website.nix
1618
];
1719

1820
networking.hostName = "pallas";
1921
nixpkgs.hostPlatform = "x86_64-linux";
22+
proxmoxLXC.manageHostName = true;
23+
nix.optimise.automatic = true;
24+
25+
services = {
26+
fstrim.enable = true;
27+
getty.autologinUser = "root";
28+
prometheus = {
29+
exporters = {
30+
node = {
31+
enable = true;
32+
enabledCollectors = [ "systemd" ];
33+
port = 9002;
34+
openFirewall = true;
35+
};
36+
};
37+
};
38+
};
39+
40+
environment.systemPackages = with pkgs; [
41+
ghostty.terminfo
42+
mailutils
43+
];
44+
45+
networking = {
46+
domain = "lan.j3ff.io";
47+
search = [ "lan.j3ff.io" ];
48+
49+
nameservers = [
50+
"1.1.1.1"
51+
"1.0.0.1"
52+
"8.8.8.8"
53+
"8.8.4.4"
54+
];
55+
};
56+
57+
services.tailscale.enable = true;
58+
services.tailscale.openFirewall = true;
59+
60+
age.secrets.sasl_passwd = {
61+
file = ./sasl_passwd.age;
62+
};
63+
64+
systemd.services.postfix.preStart = ''
65+
ln -sf ${config.age.secrets.sasl_passwd.path} /etc/postfix/sasl_passwd
66+
${pkgs.postfix}/bin/postmap /etc/postfix/sasl_passwd
67+
'';
68+
69+
services.postfix = {
70+
enable = true;
71+
config = {
72+
"append_dot_mydomain" = "yes";
73+
"smtp_sasl_auth_enable" = "yes";
74+
"smtp_sasl_password_maps" = "hash:/etc/postfix/sasl_passwd";
75+
"smtp_sasl_security_options" = "noanonymous";
76+
"inet_protocols" = "ipv4";
77+
};
78+
domain = config.networking.domain;
79+
relayHost = "smtp.fastmail.com";
80+
relayPort = 587;
81+
rootAlias = "[email protected]";
82+
};
83+
84+
users.users.root = {
85+
# https://start.1password.com/open/i?a=7Z533SZAYZCNVL764G5INOV75Q&v=lwpxghrefna57cr6nw7mr3bybm&i=v6cyausjzre6hjypvdsfhlkbty&h=my.1password.com
86+
hashedPassword = "$y$j9T$6B8V0Z9VkFiU0fMwSuLrA0$z3YHuwwAZro3N7TopVIsNltIJ5BXt3TQj1wQqt5HSuD";
87+
openssh.authorizedKeys.keys = [
88+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqpWpNJzfzioGYyR9q4wLwPkBrnmc/Gdl6JsO+SUpel [email protected]"
89+
];
90+
};
2091

2192
system.stateVersion = "21.11";
2293
}

nix/hosts/pallas/sasl_passwd.age

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
age-encryption.org/v1
2+
-> ssh-ed25519 R4OZVw 8RfovSn56R3O9D8uhHpH+hmq1JZ4eQrABS4McTnrDTA
3+
hbBPzaqf0is6LrBJs5Gz2leHHGQDoHX7n2QpjeRoY3Q
4+
-> ssh-ed25519 eLi0pQ XDzoMxlXGbBuTTx7WzBCSvc1nozGYiy0QjFF0TyIKEs
5+
rep2BkZodTmqhXFAFWtIKwu7pCXSGePnXscxreB84gk
6+
--- l7Zh0Hkk3TDR/bOqvMs0IRMJ5X2SBtQ3YrCC+pIcmjk
7+
�H\o�i.9�n��� \��%j����"���Q4ƃ���t�_�s-ҠN��氦z?�����k��&�bp1�\�-NY�~W` ��]}?�

nix/hosts/pallas/secrets.nix

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
let
2-
jeff = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqpWpNJzfzioGYyR9q4wLwPkBrnmc/Gdl6JsO+SUpel";
3-
42
# ssh-keyscan <host>
3+
jeff = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPqpWpNJzfzioGYyR9q4wLwPkBrnmc/Gdl6JsO+SUpel";
54
pallas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBeB+n+G1c6c2VZvPlfllS/Hnw7u6S8mn7ILWMK29iwe";
6-
7-
in
8-
{
9-
"aws_secret.age".publicKeys = [
10-
jeff
11-
pallas
12-
];
13-
"strykeforce_website_secrets.age".publicKeys = [
5+
keys = [
146
jeff
157
pallas
168
];
9+
in
10+
{
11+
"aws_secret.age".publicKeys = keys;
12+
"sasl_passwd.age".publicKeys = keys;
13+
"strykeforce_website_secrets.age".publicKeys = keys;
1714
}
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)