patrick/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Wiki Activity

Compare commits

base: patrick:063a6d9f24254daed98ff1f4e6b4a101f9e2d5ac
Branches Tags
patrick:master
...
compare: patrick:46613eee4dc9b8d7c4ecd429e96eea4d6b211ada
Branches Tags
patrick:master

2 commits
063a6d9f24 ... 46613eee4d

Author SHA1 Message Date
Patrick 46613eee4d
fix: less eval time 2024-11-21 20:37:07 +01:00
Patrick 906a3ed803
chore: switch smb to domain/remove wireguard 2024-11-21 19:58:15 +01:00
8 changed files with 11 additions and 22 deletions
Show stats Expand all files Collapse all files

1
config/basic/default.nix
View file

@ -38,4 +38,5 @@
]; ];
age.identityPaths = [ "/state/etc/ssh/ssh_host_ed25519_key" ]; age.identityPaths = [ "/state/etc/ssh/ssh_host_ed25519_key" ];
boot.mode = lib.mkDefault "efi"; boot.mode = lib.mkDefault "efi";
documentation.enable = lib.mkDefault false;
} }

13
config/services/samba.nix
View file

@ -39,19 +39,6 @@ in
##]; ##];
}; };
}; };
wireguard.samba-patrick.server = {
host = config.secrets.secrets.global.domains.web;
port = 51830;
reservedAddresses = [
"10.43.0.0/20"
"fd00:1765::/112"
];
openFirewall = true;
};
networking.nftables.firewall.zones.untrusted.interfaces = [
"samba-patrick"
];
services.samba = { services.samba = {
enable = true; enable = true;

6
flake.lock
View file

@ -1371,11 +1371,11 @@
"pre-commit-hooks": "pre-commit-hooks_3" "pre-commit-hooks": "pre-commit-hooks_3"
}, },
"locked": { "locked": {
"lastModified": 1730662453, "lastModified": 1732215218,
"narHash": "sha256-gfHjVmhsbsp0O61RSBxtrg4xEsYwQ5BZwyQTwIfFl9s=", "narHash": "sha256-/iaKjsFlCbbyDQSJeeCkcgq1+fiVTnJZNyyOO9aaMRM=",
"owner": "oddlama", "owner": "oddlama",
"repo": "nixos-extra-modules", "repo": "nixos-extra-modules",
"rev": "ba53e1a0becde25b0644fbf886234669c9b285e3", "rev": "90c0b018de0465bffe35fee0f86dadfab35b878f",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
hosts/desktopnix/net.nix
View file

@ -26,7 +26,6 @@
}; };
}; };
networking.nftables.firewall.zones.untrusted.interfaces = [ "lan01" ]; networking.nftables.firewall.zones.untrusted.interfaces = [ "lan01" ];
wireguard.samba-patrick.client.via = "elisabeth-samba";
services.mullvad-vpn = { services.mullvad-vpn = {
enable = true; enable = true;
package = pkgs.mullvad-vpn; package = pkgs.mullvad-vpn;
@ -35,7 +34,7 @@
"/etc/mullvad-vpn" "/etc/mullvad-vpn"
{ {
directory = "/var/lib/netbird-main"; directory = "/var/lib/netbird-main";
owner = "netbird-main"; user = "netbird-main";
} }
]; ];
services.netbird = { services.netbird = {

1
hosts/elisabeth/default.nix
View file

@ -27,5 +27,4 @@
}; };
}; };
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
documentation.enable = false;
} }

1
hosts/patricknix/net.nix
View file

@ -14,7 +14,6 @@
devoloog-sae19.rekeyFile = ./secrets/iwd/devoloog-sae19.age; devoloog-sae19.rekeyFile = ./secrets/iwd/devoloog-sae19.age;
devoloog-sae20.rekeyFile = ./secrets/iwd/devoloog-sae20.age; devoloog-sae20.rekeyFile = ./secrets/iwd/devoloog-sae20.age;
}; };
wireguard.samba-patrick.client.via = "elisabeth-samba";
networking.nftables.firewall.zones.untrusted.interfaces = [ networking.nftables.firewall.zones.untrusted.interfaces = [
"lan01" "lan01"
"lan02" "lan02"

4
nix/hosts.nix
View file

@ -85,5 +85,9 @@
# All nixosSystem instanciations are collected here, so that we can refer # All nixosSystem instanciations are collected here, so that we can refer
# to any system via nodes.<name> # to any system via nodes.<name>
nodes = config.nixosConfigurations // config.guestConfigurations; nodes = config.nixosConfigurations // config.guestConfigurations;
wireguardEvalCache = config.pkgs.x86_64-linux.lib.wireguard.createEvalCache inputs [
"scrtiny-patrick"
"elisabeth"
];
}; };
} }

4
users/patrick/smb.nix
View file

@ -1,8 +1,8 @@
{ config, nodes, ... }: { config, ... }:
{ {
hm.home.smb = hm.home.smb =
let let
address = nodes.elisabeth-samba.config.wireguard.samba-patrick.ipv4; address = "smb.${config.secrets.secrets.global.domains.web}";
credentials = config.age.secrets.smb-creds.path; credentials = config.age.secrets.smb-creds.path;
in in
[ [