Skip to content

Commit cffc20a

Browse files
committed
update
1 parent aeb6af7 commit cffc20a

File tree

4 files changed

+42
-19
lines changed

4 files changed

+42
-19
lines changed

flake.nix

+7-19
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
11
{
22
description = "nixos infra";
33
inputs = {
4-
# ONLINE
5-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
6-
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
4+
# ONLINE URLs
75
disko.url = "github:nix-community/disko/master";
86
home-manager.url = "github:nix-community/home-manager/master";
9-
#
10-
# OFFLINE
11-
# nixpkgs-release.url = "http://git.localnet/nixos/nixpkgs";
12-
# disko.url = "http://git.localnet/nix-community/disko";
13-
# home-manager.url = "http://git.localnet/nix-community/home-manager";
14-
#
15-
# CONFIG
7+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
8+
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
9+
# GLOBAL
1610
disko.inputs.nixpkgs.follows = "nixpkgs";
1711
home-manager.inputs.nixpkgs.follows = "nixpkgs";
1812
};
1913
outputs = {
2014
self,
2115
disko,
16+
home-manager,
2217
nixpkgs,
2318
nixpkgs-unstable,
24-
home-manager,
2519
}: let
26-
# global var
20+
# GLOBAL
2721
nix-iso-target-hostname = "nixos";
2822
overlay-unstable = final: prev: {unstable = nixpkgs-unstable.legacyPackages.${prev.system};};
2923
in {
@@ -80,6 +74,7 @@
8074
./role/client-desktop.nix
8175
./person/mpaepcke_luks.nix
8276
./person/desktop/mpaepcke.nix
77+
./hosts/nixos-srv-mp.nix
8378
# ./modules/wg-client-adm.nix
8479
# ./server/virtual.nix
8580
# ./server/unifi.nix
@@ -93,13 +88,6 @@
9388
# ./server/opnborg-complex.nix
9489
# ./server/opnborg-docker-complex.nix
9590
# ./server/webserver-nginx.nix
96-
{networking.hostName = "nixos-srv-mp";}
97-
{
98-
networking.wg-quick.interfaces."wg-pvz-adm" = {
99-
address = ["10.0.8.201/24"];
100-
privateKey = nixpkgs.lib.mkForce "8CFstz9PNB/wxoJKW2Dk5nzgd/slMUkItBcnumUB5GE=";
101-
};
102-
}
10391
];
10492
};
10593
};

hosts/nixos-srv-mp-wg.nix

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
config,
3+
pkgs,
4+
lib,
5+
...
6+
}: {
7+
#################
8+
#-=# IMPORTS #=-#
9+
#################
10+
imports = [
11+
../network/wg-client-adm.nix
12+
];
13+
14+
####################
15+
#-=# NETWORKING #=-#
16+
####################
17+
networking = {
18+
hostName = "nixos-srv-mp-adm";
19+
wg-quick.interfaces."wg-pvz-adm" = {
20+
address = ["10.0.8.201/24"];
21+
privateKey = nixpkgs.lib.mkForce "8CFstz9PNB/wxoJKW2Dk5nzgd/slMUkItBcnumUB5GE=";
22+
};
23+
};
24+
}

hosts/nixos-srv-mp.nix

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
config,
3+
pkgs,
4+
lib,
5+
...
6+
}: {
7+
####################
8+
#-=# NETWORKING #=-#
9+
####################
10+
networking.hostName = "nixos-srv-mp";
11+
}
File renamed without changes.

0 commit comments

Comments
 (0)