sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.bitlab21.com:sam/nixos

This commit is contained in:
Sam 2025-01-19 12:31:03 +00:00
parent dd3d73f0a3 ba181205c4
commit 1187131524
6 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -538,11 +538,11 @@
}, },
"nix-secrets": { "nix-secrets": {
"locked": { "locked": {
"lastModified": 1737285182, "lastModified": 1737289135,
"narHash": "sha256-ZnKYk0PIkmi6bT602bM+nwho+p5d67OU1YAy47ljeX0=", "narHash": "sha256-gyRNbWriRKU+2ISw0IU+IyN6tPLFVpKHlUMu9XJnlaA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d92a47388c617d90d127f154cfc4507ce0b390b2", "rev": "66732e26abe33ba633c157837b24701635866199",
"revCount": 214, "revCount": 215,
"type": "git", "type": "git",
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
}, },

9
hosts/citadel/default.nix
View File

@ -49,9 +49,9 @@ in {
../common/optional/openssh.nix ../common/optional/openssh.nix
../common/optional/dwm.nix ../common/optional/dwm.nix
# ../common/optional/fileserver/media.nix ../common/optional/fileserver/nfs-client/media.nix
# ../common/optional/fileserver/homeshare.nix ../common/optional/fileserver/nfs-client/photos.nix
# ../common/optional/fileserver/photos.nix ../common/optional/fileserver/nfs-client/personal.nix
../common/optional/printing.nix ../common/optional/printing.nix
../common/optional/backlight.nix ../common/optional/backlight.nix
@ -69,9 +69,10 @@ in {
]; ];
boot = { boot = {
supportedFilesystems = ["nfs"];
blacklistedKernelModules = ["snd_hda_intel" "snd_soc_skl"]; blacklistedKernelModules = ["snd_hda_intel" "snd_soc_skl"];
kernelModules = ["iwlwifi"]; kernelModules = ["iwlwifi"];
initrd.kernelModules = ["thinkpad-acpi" "acpi-call"]; initrd.kernelModules = ["thinkpad-acpi" "acpi-call" "nfs"];
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest; kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
extraModulePackages = [ extraModulePackages = [
config.boot.kernelPackages.acpi_call config.boot.kernelPackages.acpi_call

27
hosts/common/optional/fileserver-nfs-mount.nix
View File

@ -1,27 +0,0 @@
{...}:
{
fileSystems."/exports" = {
device = "/dev/vdb1";
fsType = "ext4";
};
services.nfs.server = {
enable = true;
# fixed rpc.statd port; for firewall
lockdPort = 4001;
mountdPort = 4002;
statdPort = 4000;
extraNfsdConfig = '''';
exports = ''
/exports *(rw,insecure,all_squash)
'';
};
# open nfs ports
networking.firewall = {
enable = true;
# for NFSv3; view with `rpcinfo -p`
allowedTCPPorts = [ 111 2049 4000 4001 4002 20048 ];
allowedUDPPorts = [ 111 2049 4000 4001 4002 20048 ];
};
}

3
hosts/common/optional/fileserver/nfs-client/media.nix
View File

@ -1,6 +1,7 @@
{configVars, ...}: let {configVars, pkgs, ...}: let
fileserverIp = configVars.networking.addresses.fileserver.ip; fileserverIp = configVars.networking.addresses.fileserver.ip;
in { in {
environment.systemPackages = [pkgs.nfs-utils];
fileSystems."/media/media" = { fileSystems."/media/media" = {
device = "${fileserverIp}:/srv/export/media"; device = "${fileserverIp}:/srv/export/media";
fsType = "nfs"; fsType = "nfs";

3
hosts/common/optional/fileserver/nfs-client/personal.nix
View File

@ -1,6 +1,7 @@
{configVars, ...}: let {configVars, pkgs, ...}: let
fileserverIp = configVars.networking.addresses.fileserver.ip; fileserverIp = configVars.networking.addresses.fileserver.ip;
in { in {
environment.systemPackages = [pkgs.nfs-utils];
fileSystems."/media/personal" = { fileSystems."/media/personal" = {
device = "${fileserverIp}:/srv/export/personal"; device = "${fileserverIp}:/srv/export/personal";
fsType = "nfs"; fsType = "nfs";

3
hosts/common/optional/fileserver/nfs-client/photos.nix
View File

@ -1,6 +1,7 @@
{configVars, ...}: let {configVars, pkgs, ...}: let
fileserverIp = configVars.networking.addresses.fileserver.ip; fileserverIp = configVars.networking.addresses.fileserver.ip;
in { in {
environment.systemPackages = [pkgs.nfs-utils];
fileSystems."/media/photos" = { fileSystems."/media/photos" = {
device = "${fileserverIp}:/srv/export/photos"; device = "${fileserverIp}:/srv/export/photos";
fsType = "nfs"; fsType = "nfs";