diff --git a/home/software/terminal/tools/gpg.nix b/home/software/terminal/tools/gpg.nix index 9395142..45248c6 100644 --- a/home/software/terminal/tools/gpg.nix +++ b/home/software/terminal/tools/gpg.nix @@ -57,3 +57,4 @@ }; } # vim: filetype=nix + diff --git a/hosts/zion/hardware-configuration.nix b/hosts/zion/hardware-configuration.nix index b53e7f6..c7a2eda 100644 --- a/hosts/zion/hardware-configuration.nix +++ b/hosts/zion/hardware-configuration.nix @@ -1,29 +1,33 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/97d8b441-42f5-4609-8c8c-05ec4315a0e8"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/97d8b441-42f5-4609-8c8c-05ec4315a0e8"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/E1AD-6788"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/E1AD-6788"; + fsType = "vfat"; + }; - swapDevices = [ ]; + 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 diff --git a/system/services/samba.nix b/system/services/samba.nix index e3999c9..4f07009 100644 --- a/system/services/samba.nix +++ b/system/services/samba.nix @@ -1,33 +1,38 @@ -{ config, lib, pkgs, ... }: { - services = { - samba = { - package = pkgs.samba4Full; - enable = true; - openFirewall = true; - shares.testshare = { - # !TODO: get the current user - path = "/home/glwbr/"; - writable = "true"; - comment = "This is a test!"; - }; - extraConfig = '' - server smb encrypt = required - # ^^ Note: Breaks `smbclient -L -U%` by default, might require the client to set `client min protocol`? - server min protocol = SMB3_00 - ''; - }; - avahi = { - publish.enable = true; - publish.userServices = true; - # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile` - #nssmdns4 = true; - enable = true; - openFirewall = true; - }; - samba-wsdd = { - # This enables autodiscovery on windows since SMB1 (and thus netbios) support was discontinued - enable = true; - openFirewall = true; +{ + config, + lib, + pkgs, + ... +}: { + services = { + samba = { + package = pkgs.samba4Full; + enable = true; + openFirewall = true; + shares.testshare = { + # !TODO: get the current user + path = "/home/glwbr/"; + writable = "true"; + comment = "This is a test!"; }; + extraConfig = '' + server smb encrypt = required + # ^^ Note: Breaks `smbclient -L -U%` by default, might require the client to set `client min protocol`? + server min protocol = SMB3_00 + ''; + }; + avahi = { + publish.enable = true; + publish.userServices = true; + # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile` + #nssmdns4 = true; + enable = true; + openFirewall = true; + }; + samba-wsdd = { + # This enables autodiscovery on windows since SMB1 (and thus netbios) support was discontinued + enable = true; + openFirewall = true; }; + }; }