From f23cf184e2c4ebded203fbc8dae92265f90439ba Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 26 Jan 2020 19:49:59 +0100
Subject: ...

---
 sif.nix      | 5 ++++-
 sif/boot.nix | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sif.nix b/sif.nix
index e9a049f2..3f50c1c2 100644
--- a/sif.nix
+++ b/sif.nix
@@ -60,7 +60,10 @@
     
     vnstat.enable = true;
 
-    printing.enable = true;
+    printing = {
+      enable = true;
+      drivers = with pkgs; [ samsung-unified-linux-driver hplip ];
+    };
 
     logind.extraConfig = ''
       HandleLidSwitch=hibernate
diff --git a/sif/boot.nix b/sif/boot.nix
index dbe081c7..1a6155b3 100644
--- a/sif/boot.nix
+++ b/sif/boot.nix
@@ -3,10 +3,10 @@
 {
   boot = {
     initrd = {
-      luks.devices = [
-        { name = "nvm0"; device = "/dev/disk/by-uuid/fe641e81-0812-4181-a5f6-382ebba509bb"; }
-        { name = "nvm1"; device = "/dev/disk/by-uuid/43df1ba8-1728-4193-8855-920a82d4494a"; }
-      ];
+      luks.devices = {
+        nvm0.device = "/dev/disk/by-uuid/fe641e81-0812-4181-a5f6-382ebba509bb";
+        nvm1.device = "/dev/disk/by-uuid/43df1ba8-1728-4193-8855-920a82d4494a";
+      };
       availableKernelModules = [ "dm-snapshot" "dm-integrity" "dm-raid" "drbg" "authenc" "nvme" "fbcon" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
       kernelModules = [ "dm-raid" ];
     };
-- 
cgit v1.2.3