This commit is contained in:
Sebastian Moser
2023-11-21 21:26:08 +01:00
parent 56fde9df8c
commit 6927775309
6 changed files with 69 additions and 35 deletions

15
flake.lock generated
View File

@@ -451,14 +451,17 @@
}, },
"networkmanager": { "networkmanager": {
"locked": { "locked": {
"lastModified": 1700588409, "lastModified": 1700593965,
"narHash": "sha256-mbQKI5yjy2fkjeJo9+EuEsEuOVu6LPyEDmrP4zsujbA=", "narHash": "sha256-xvzN3iI4OuWx4/LsPxnOy/yMixlb4XD6PMcyTfRqJ38=",
"path": "/home/me/work/config/gitignore/nixos-networkmanager-profiles", "owner": "c2vi",
"type": "path" "repo": "nixos-networkmanager-profiles",
"rev": "1d759f696c237419bf25273c80a8d78e6b2b8da7",
"type": "github"
}, },
"original": { "original": {
"path": "/home/me/work/config/gitignore/nixos-networkmanager-profiles", "owner": "c2vi",
"type": "path" "repo": "nixos-networkmanager-profiles",
"type": "github"
} }
}, },
"nix-doom-emacs": { "nix-doom-emacs": {

View File

@@ -1,8 +1,9 @@
{ pkgs, inputs, ...}: { pkgs, inputs, secretsDir, ...}:
{ {
imports = [ imports = [
inputs.nix-wsl.nixosModules.wsl inputs.nix-wsl.nixosModules.wsl
./users/me/headless.nix ./users/me/headless.nix
./common/all.nix ./common/all.nix
./common/nixos-headless.nix ./common/nixos-headless.nix
]; ];
@@ -18,4 +19,45 @@
}; };
programs.bash.loginShellInit = "nixos-wsl-welcome"; programs.bash.loginShellInit = "nixos-wsl-welcome";
# to build rpi images
boot.binfmt.emulatedSystems = [
"aarch64-linux"
];
######################### networking #####################################
networking.firewall.allowPing = true;
networking.firewall.enable = true;
networking.firewall.allowedUDPPorts = [
3702 # wsdd
51820 # wireguard
];
networking.firewall.allowedTCPPorts = [
2222 # sshd
];
networking.networkmanager.enable = true;
networking.networkmanager.profiles = {
me = {
connection = {
id = "me";
uuid = "fe45d3bc-21c6-41ff-bc06-c936017c6e02";
type = "wireguard";
autoconnect = "true";
interface-name = "me0";
};
wireguard = {
listen-port = "51820";
private-key = builtins.readFile "${secretsDir}/wg-private-acern";
};
ipv4 = {
address1 = "10.1.1.5/24";
method = "manual";
};
} // (import ../common/wg-peers.nix { inherit secretsDir; }) ;
};
} }

View File

@@ -19,6 +19,17 @@
#nixpkgs.hostPlatform.system = "aarch64-linux"; #nixpkgs.hostPlatform.system = "aarch64-linux";
#nixpkgs.buildPlatform.system = "x86_64-linux"; #nixpkgs.buildPlatform.system = "x86_64-linux";
nixpkgs.overlays = [
{
openfortivpn = pkgs.openfortivpn.overrideAttrs (final: prev: {
configureFlags = prev.configureFlags or [] ++ [
"--disable-proc"
"--with-rt_dst=yes"
"--with-pppd=/usr/sbin/pppd"
];
});
}
];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;

View File

@@ -164,6 +164,7 @@
networking.extraHosts = '' networking.extraHosts = ''
192.168.1.6 hpm 192.168.1.6 hpm
192.168.1.2 rpi 192.168.1.2 rpi
192.168.5.5 lush
127.0.0.1 youtube.com 127.0.0.1 youtube.com
127.0.0.1 www.youtube.com 127.0.0.1 www.youtube.com
''; '';

View File

@@ -3,6 +3,7 @@
imports = [ imports = [
"${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
#inputs.nixos-hardware.nixosModules.raspberry-pi-4 #inputs.nixos-hardware.nixosModules.raspberry-pi-4
inputs.networkmanager.nixosModules.networkmanager
../common/all.nix ../common/all.nix
../common/nixos-headless.nix ../common/nixos-headless.nix
@@ -69,30 +70,6 @@
networking.hostName = "rpi"; networking.hostName = "rpi";
networking = {
defaultGateway = {
address = "192.168.1.1";
interface = "eth0";
};
interfaces."eth0" = {
#name = "eth0";
ipv4.addresses = [
{ address = "192.168.1.2"; prefixLength = 24;}
];
};
interfaces."wlan0".useDHCP = true;
wireless = {
interfaces = [ "wlan0" ];
enable = true;
networks = {
seb-phone.psk = "hellogello";
};
};
};
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
5357 # wsdd 5357 # wsdd
8888 # for general usage 8888 # for general usage

View File

@@ -16,10 +16,10 @@
user = "me"; user = "me";
hostname = "192.168.1.2"; hostname = "192.168.1.2";
}; };
lush = { #lush = {
user = "me"; #user = "me";
hostname = "192.168.5.5"; #hostname = "192.168.5.5";
}; #};
phone = { phone = {
user = "u0_a345"; user = "u0_a345";
hostname = "192.168.44.1"; hostname = "192.168.44.1";