erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:513d5ad981eab75916c8a8789ec5e19ad66fd74d
Branches Tags
erwin:main
...
compare: erwin:8b79e92442c6fb61dca9d7f3137b6b6b5f93b775
Branches Tags
erwin:main

7 commits
513d5ad981 ... 8b79e92442

Author SHA1 Message Date
Erwin Boskma
8b79e92442
home: Add vial 2024-01-06 13:45:57 +01:00
Erwin Boskma
0f6d55acbb
loki: Minor restructuring of systemd config 2024-01-06 13:45:30 +01:00
Erwin Boskma
4495a65881
Add odin to machines, add tag to heimdall 2024-01-06 13:45:01 +01:00
Erwin Boskma
b1b96df511
ssh: Update git.datarift.nl 2024-01-06 13:44:40 +01:00
Erwin Boskma
d9eda04704
ssh: Add hass 2024-01-06 13:44:22 +01:00
Erwin Boskma
5f8e3728ce
flake.lock: Update 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/9206a7acdc0dd951d5d229b09405c7c6205bcef4' (2024-01-04)
  → 'github:nix-community/emacs-overlay/85ac1bf8543d2e179d7748f3788d58b06eacc758' (2024-01-06)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/2d2ea8eab9e400618748ab1a6a108255233b602c' (2024-01-01)
  → 'github:NixOS/nixpkgs/b0b2c5445c64191fd8d0b31f2b1a34e45a64547d' (2024-01-03)
• Updated input 'home-manager':
    'github:nix-community/home-manager/26b8adb300e50efceb51fff6859a1a6ba1ade4f7' (2024-01-04)
  → 'github:nix-community/home-manager/51e44a13acea71b36245e8bd8c7db53e0a3e61ee' (2024-01-05)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/8e34f33464d77bea2d5cf7dc1066647b1ad2b324' (2024-01-03)
  → 'github:NixOS/nixos-hardware/172385318068519900a7d71c1024242fa6af75f0' (2024-01-05)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/a0df72e106322b67e9c6e591fe870380bd0da0d5' (2024-01-01)
  → 'github:oxalica/rust-overlay/a127cccf7943beae944953963ba118d643299c3b' (2024-01-06)
 2024-01-06 13:03:03 +01:00
Erwin Boskma
63af113001
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/59f915b45a38cb0ec0e97a713237877a06b43386' (2024-01-01)
  → 'github:nix-community/disko/aef9a509db64a081186af2dc185654d78dc8e344' (2024-01-03)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/e3fb072d0225fee400a7d0f8106dd555f950a6bd' (2024-01-02)
  → 'github:nix-community/emacs-overlay/9206a7acdc0dd951d5d229b09405c7c6205bcef4' (2024-01-04)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/32f63574c85fbc80e4ba1fbb932cde9619bad25e' (2023-12-31)
  → 'github:NixOS/nixpkgs/2d2ea8eab9e400618748ab1a6a108255233b602c' (2024-01-01)
• Updated input 'home-manager':
    'github:nix-community/home-manager/6e91c5df192395753d8e6d55a0352109cb559790' (2024-01-01)
  → 'github:nix-community/home-manager/26b8adb300e50efceb51fff6859a1a6ba1ade4f7' (2024-01-04)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/5bf829d72ccdc05be3343afd81bd922d5748ef4e' (2024-01-02)
  → 'github:NixOS/nixos-hardware/8e34f33464d77bea2d5cf7dc1066647b1ad2b324' (2024-01-03)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9' (2023-12-30)
  → 'github:nixos/nixpkgs/bd645e8668ec6612439a9ee7e71f7eac4099d4f6' (2024-01-02)
 2024-01-04 23:29:43 +01:00
5 changed files with 128 additions and 108 deletions
Show stats Expand all files Collapse all files

42
flake.lock
View file

@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704072400, "lastModified": 1704318910,
"narHash": "sha256-Es4zcFoCJ+Pa9TN46VoqgNlYznuhc6s50LRcDqQEATs=", "narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "59f915b45a38cb0ec0e97a713237877a06b43386", "rev": "aef9a509db64a081186af2dc185654d78dc8e344",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,11 +105,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1704212238, "lastModified": 1704530953,
"narHash": "sha256-/SqnUe8tLLUo93VEe0bveFMwo95n6ozBzPK7a1MycmI=", "narHash": "sha256-hfllh8Dd/XhbyxNensq2PAdnvJtPXJmxUQqWrKUdUCk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e3fb072d0225fee400a7d0f8106dd555f950a6bd", "rev": "85ac1bf8543d2e179d7748f3788d58b06eacc758",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704100519, "lastModified": 1704498488,
"narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e91c5df192395753d8e6d55a0352109cb559790", "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -467,11 +467,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1704228290, "lastModified": 1704458188,
"narHash": "sha256-M3y1ADeFVdPTV/bJXvO5QHDYFujzpJNblkfIgECTxGc=", "narHash": "sha256-f6BYEuIqnbrs6J/9m1/1VdkJ6d63hO9kUC09kTPuOqE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "5bf829d72ccdc05be3343afd81bd922d5748ef4e", "rev": "172385318068519900a7d71c1024242fa6af75f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -482,11 +482,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1703961334, "lastModified": 1704194953,
"narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +516,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1703992652, "lastModified": 1704295289,
"narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", "narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", "rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +676,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704075545, "lastModified": 1704507282,
"narHash": "sha256-L3zgOuVKhPjKsVLc3yTm2YJ6+BATyZBury7wnhyc8QU=", "narHash": "sha256-PDfS8fj40mm2QWpbd/aiocgwcI/WHzqLKERRJkoEvXU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a0df72e106322b67e9c6e591fe870380bd0da0d5", "rev": "a127cccf7943beae944953963ba118d643299c3b",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
home-manager/modules/ssh/default.nix
View file

@ -54,11 +54,19 @@ in
}; };
"git.datarift.nl" = { "git.datarift.nl" = {
hostname = "gitea.barn-beaver.ts.net"; # hostname = "gitea.barn-beaver.ts.net";
port = 2222; # port = 2222;
hostname = "10.0.0.203";
identityFile = personalKey; identityFile = personalKey;
}; };
hass =
{
hostname = "10.0.0.254";
user = "root";
identityFile = "~/.ssh/id_ed25519";
};
horus-vpn = { horus-vpn = {
hostname = "192.168.4.202"; hostname = "192.168.4.202";
identityFile = horusKey; identityFile = horusKey;

8
machines/default.nix
View file

@ -40,6 +40,7 @@ inputs: {
sshUser = "erwin"; sshUser = "erwin";
buildOn = "local"; buildOn = "local";
substituteOnTarget = true; substituteOnTarget = true;
tags = [ "metal" ];
}; };
}; };
loki = { loki = {
@ -61,6 +62,13 @@ inputs: {
}; };
odin = { odin = {
config = import ./odin/configuration.nix inputs; config = import ./odin/configuration.nix inputs;
deploy = {
# host = "10.0.0.252";
host = "odin.barn-beaver.ts.net";
buildOn = "local";
substituteOnTarget = true;
tags = [ "metal" ];
};
}; };
proxy = { proxy = {
config = import ./proxy/configuration.nix inputs; config = import ./proxy/configuration.nix inputs;

173
machines/loki/configuration.nix
View file

@ -199,107 +199,110 @@
sudo.enable = false; sudo.enable = false;
}; };
systemd.network = { systemd = {
enable = true;
wait-online = { network = {
anyInterface = true; enable = true;
};
netdevs = { wait-online = {
"10-wghorus" = { anyInterface = true;
netdevConfig = {
Kind = "wireguard";
MTUBytes = "1420";
Name = "wghorus";
};
wireguardConfig = {
PrivateKeyFile = config.sops.secrets.wireguard-horus-privkey.path;
ListenPort = 51820;
};
wireguardPeers = [
{
wireguardPeerConfig = {
PublicKey = "6faxlUG8+F7uVrKk/OJqqy5k2+OzrhXc/cV6Zsfbl0c=";
AllowedIPs = [ "192.168.4.0/23" "192.168.6.0/24" "192.168.7.0/24" "192.168.8.0/24" ];
Endpoint = "212.45.34.195:51820";
PersistentKeepalive = 25;
};
}
];
}; };
};
networks = { netdevs = {
"40-enp4s0" = { "10-wghorus" = {
matchConfig = { netdevConfig = {
Name = "enp4s0"; Kind = "wireguard";
}; MTUBytes = "1420";
Name = "wghorus";
};
networkConfig = { wireguardConfig = {
DHCP = "yes"; PrivateKeyFile = config.sops.secrets.wireguard-horus-privkey.path;
ListenPort = 51820;
};
wireguardPeers = [
{
wireguardPeerConfig = {
PublicKey = "6faxlUG8+F7uVrKk/OJqqy5k2+OzrhXc/cV6Zsfbl0c=";
AllowedIPs = [ "192.168.4.0/23" "192.168.6.0/24" "192.168.7.0/24" "192.168.8.0/24" ];
Endpoint = "212.45.34.195:51820";
PersistentKeepalive = 25;
};
}
];
}; };
}; };
"40-wghorus" = {
matchConfig = { networks = {
Name = "wghorus"; "40-enp4s0" = {
matchConfig = {
Name = "enp4s0";
};
networkConfig = {
DHCP = "yes";
};
}; };
"40-wghorus" = {
matchConfig = {
Name = "wghorus";
};
linkConfig = { linkConfig = {
ActivationPolicy = "manual"; ActivationPolicy = "manual";
}; };
networkConfig = { networkConfig = {
DHCP = "no"; DHCP = "no";
DNS = "192.168.4.1"; DNS = "192.168.4.1";
Domains = [ "bedum.horus.nu" "internal.horus.nu" ]; Domains = [ "bedum.horus.nu" "internal.horus.nu" ];
}; };
address = [ address = [
"10.10.4.2/24" "10.10.4.2/24"
]; ];
routes = [ routes = [
{ {
routeConfig = routeConfig =
{ {
Destination = "192.168.4.0/23"; Destination = "192.168.4.0/23";
Scope = "link";
};
}
{
routeConfig = {
Destination = "192.168.6.0/24";
Scope = "link"; Scope = "link";
}; };
} }
{ {
routeConfig = { routeConfig =
Destination = "192.168.6.0/24"; {
Scope = "link"; Destination = "192.168.7.0/24";
}; Scope = "link";
} };
{ }
routeConfig = {
{ routeConfig =
Destination = "192.168.7.0/24"; {
Scope = "link"; Destination = "192.168.8.0/24";
}; Scope = "link";
} };
{ }
routeConfig = ];
{ };
Destination = "192.168.8.0/24";
Scope = "link";
};
}
];
}; };
};
links = { links = {
"40-enp4s0" = { "40-enp4s0" = {
matchConfig = { matchConfig = {
OriginalName = "enp4s0"; OriginalName = "enp4s0";
}; };
linkConfig = { linkConfig = {
WakeOnLan = "magic"; WakeOnLan = "magic";
};
}; };
}; };
}; };

1
users/erwin/home.nix
View file

@ -206,6 +206,7 @@ in
# super-slicer-latest # super-slicer-latest
units units
unzip unzip
vial
xdg-utils xdg-utils
wl-clipboard wl-clipboard
zeal zeal