diff --git a/flake.nix b/flake.nix index b9be5f9..9aa2d52 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,7 @@ ./hosts/Ratchet/hardware-Ratchet.nix ./hosts/Ratchet/fingerprint.nix ./hosts/generic/persistence.nix + ./hosts/generic/cups.nix ./desktop/kde.nix ./hosts/generic/unfree_allow.nix ./hosts/generic/virtualization.nix diff --git a/hosts/Ratchet/hardware-Ratchet.nix b/hosts/Ratchet/hardware-Ratchet.nix index bed4c45..9db6adc 100644 --- a/hosts/Ratchet/hardware-Ratchet.nix +++ b/hosts/Ratchet/hardware-Ratchet.nix @@ -20,19 +20,17 @@ options = ["defaults" "size=1G" "mode=755"]; }; fileSystems."/nix" = - { device = "/dev/disk/by-uuid/067a8472-18d0-49d4-961d-dbe07d8cc1a7"; - fsType = "btrfs"; - options = [ "subvol=@nix" "compress=zstd"]; + { device = "ratchet-zfs/root/nix"; + fsType = "zfs"; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/067a8472-18d0-49d4-961d-dbe07d8cc1a7"; - fsType = "btrfs"; - options = [ "subvol=@home" "compress=zstd"]; + { device = "ratchet-zfs/root/home"; + fsType = "zfs"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/67E3-17ED"; + { device = "/dev/nvme0n1p5"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/hosts/generic/cups.nix b/hosts/generic/cups.nix new file mode 100644 index 0000000..c108848 --- /dev/null +++ b/hosts/generic/cups.nix @@ -0,0 +1,9 @@ +{ ... }: +{ + services.printing.enable = true; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; +}