From 7d37b6e58520a5d279d3e7b573d4d1f0c4d7aa1a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 18 Mar 2020 15:20:19 +0100
Subject: rescue odin

---
 installer.nix             | 18 ++++++++++++++----
 nixpkgs                   |  2 +-
 odin.nix                  |  1 +
 odin/hw.nix               |  3 +++
 users/gkleen.nix          |  1 +
 users/keys/gkleen-sif.pub |  1 +
 6 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 users/keys/gkleen-sif.pub

diff --git a/installer.nix b/installer.nix
index 3bdca7ab..9276907f 100644
--- a/installer.nix
+++ b/installer.nix
@@ -8,13 +8,11 @@
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
-
   environment.systemPackages = with pkgs; [
     mosh
     tmux
     zsh
-    pythonPackages.magic-wormhole
+    python3Packages.magic-wormhole
   ];
 
   networking = {
@@ -30,5 +28,17 @@
     };
   };
 
-  i18n.consoleKeyMap = "dvp";
+  users.users.root =
+    let template = import ./users/gkleen.nix;
+    in {
+      inherit (template) shell;
+      openssh.authorizedKeys.keyFiles = template.openssh.authorizedKeys.keyFiles;
+    };
+
+  services.openssh = {
+    enable = true;
+    passwordAuthentication = false;
+  };
+
+  console.keyMap = "dvp";
 }
diff --git a/nixpkgs b/nixpkgs
index a59f1fa7..28cb581e 160000
--- a/nixpkgs
+++ b/nixpkgs
@@ -1 +1 @@
-Subproject commit a59f1fa76fd6de48ac39e0289a59e7e2fcfb0e4b
+Subproject commit 28cb581e131f67fb7862e47653e9b74c0e679879
diff --git a/odin.nix b/odin.nix
index 1ae5d26c..56fca270 100644
--- a/odin.nix
+++ b/odin.nix
@@ -29,6 +29,7 @@
   boot.loader.grub.extraConfig = "serial; terminal_output.serial";
   boot.kernelParams = [ "console=ttyS0,115200"
                       ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.extraTTYs = [ "tty7" ];
 
diff --git a/odin/hw.nix b/odin/hw.nix
index e3c711fc..c7ff5968 100644
--- a/odin/hw.nix
+++ b/odin/hw.nix
@@ -13,7 +13,10 @@
       "uhci_hcd" "ehci_pci" "ata_piix" "xhci_pci" "ahci"
       "pata_marvell" "nvme" "firewire_ohci" "usb_storage" "usbhid"
       "sd_mod" "r8169" "mpt3sas"
+      "dm-snapshot" "dm-integrity" "dm-raid" "drbg" "authenc"
+      "fbcon" "rtsx_pci_sdmmc" 
     ];
+    kernelModules = [ "dm-raid" ];
     luks.devices = {
       raid6 = {
         device = "/dev/disk/by-uuid/1a552384-4f74-40bf-a5cf-961ea24c339e";
diff --git a/users/gkleen.nix b/users/gkleen.nix
index c799070d..b1497470 100644
--- a/users/gkleen.nix
+++ b/users/gkleen.nix
@@ -10,6 +10,7 @@
   isNormalUser = true;
   openssh.authorizedKeys.keyFiles = [
     keys/gkleen-hel.pub
+    keys/gkleen-sif.pub
   ];
   hashedPassword = "$6$rounds=500000$dOMgCU7DAk$yQFYGOURTEt12387LIYBnFKSWmtwXMUk1LJWnV0m7OFt.y2TnxQn2abdGA5dhwG9EmMB5wZGXf4J5F71c746C/";
 
diff --git a/users/keys/gkleen-sif.pub b/users/keys/gkleen-sif.pub
new file mode 100644
index 00000000..e9aaf215
--- /dev/null
+++ b/users/keys/gkleen-sif.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrHPERae+OUTNOzNf9d2767ljFCm5hgmQw48Dj4RrlU gkleen@sif.midgard.yggdrasil
-- 
cgit v1.2.3