diff options
| -rw-r--r-- | hosts/optiplex/configuration.nix | 2 | ||||
| -rw-r--r-- | hosts/optiplex/hardware-configuration.nix | 23 | ||||
| -rw-r--r-- | hosts/poweredge/configuration.nix | 1 | ||||
| -rw-r--r-- | hosts/poweredge/fileshares.nix | 44 |
4 files changed, 57 insertions, 13 deletions
diff --git a/hosts/optiplex/configuration.nix b/hosts/optiplex/configuration.nix index 560869e..b314905 100644 --- a/hosts/optiplex/configuration.nix +++ b/hosts/optiplex/configuration.nix @@ -100,5 +100,5 @@ }; }; - system.stateVersion = "24.11"; + system.stateVersion = "25.11"; } diff --git a/hosts/optiplex/hardware-configuration.nix b/hosts/optiplex/hardware-configuration.nix index 3d9651e..9485a66 100644 --- a/hosts/optiplex/hardware-configuration.nix +++ b/hosts/optiplex/hardware-configuration.nix @@ -14,32 +14,31 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/a9d54117-31f6-4cad-b1b2-250f6bfd7808"; + { device = "/dev/disk/by-uuid/e4094dd8-d1fd-4aa1-8f95-82a9144a32be"; fsType = "btrfs"; - options = [ "subvol=@" ]; + options = [ "subvol=root" ]; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/a9d54117-31f6-4cad-b1b2-250f6bfd7808"; + { device = "/dev/disk/by-uuid/e4094dd8-d1fd-4aa1-8f95-82a9144a32be"; fsType = "btrfs"; - options = [ "subvol=@home" ]; + options = [ "subvol=home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/e4094dd8-d1fd-4aa1-8f95-82a9144a32be"; + fsType = "btrfs"; + options = [ "subvol=nix" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6987-81B6"; + { device = "/dev/disk/by-uuid/9350-1411"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/poweredge/configuration.nix b/hosts/poweredge/configuration.nix index a363592..16a2686 100644 --- a/hosts/poweredge/configuration.nix +++ b/hosts/poweredge/configuration.nix @@ -3,6 +3,7 @@ in { imports = [ ./ddns-updater.nix + ./fileshares.nix ./networking.nix #./notification-mailer.nix # TODO move some of this stuff to archetype ./wg1.nix diff --git a/hosts/poweredge/fileshares.nix b/hosts/poweredge/fileshares.nix new file mode 100644 index 0000000..4593ef8 --- /dev/null +++ b/hosts/poweredge/fileshares.nix @@ -0,0 +1,44 @@ +{ + # TODO make user for ps2 + services._fileShares.enable = true; + services._fileShares.shares = { + PS2 = { + path = "/media/storage/games/ps2"; + smb = { + enable = true; + allowUser = "ps2"; + extraOptions = { + "min protocol" = "NT1"; + "max protocol" = "NT1"; + }; + }; + }; + WinBackups = { + path = "/media/storage/backups/windows"; + smb.enable = true; + }; + pictures = { + path = "/media/storage/pictures"; + nfs.enable = true; + }; + tapes = { + path = "/media/storage/tapes"; + nfs.enable = true; + }; + backups = { + path = "/media/storage/backups"; + nfs.enable = true; + }; + }; + + users.users = { + ps2 = { + isSystemUser = true; + password = "ps2"; + group = "ps2"; + }; + }; + users.groups = { + ps2 = {}; + }; +} |