From b770f3ddb6f2b86b13bdb8a77a37b7dbed0244f6 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Sat, 11 Jul 2020 13:50:52 +0200
Subject: [PATCH] Move oldtown to ZFS and rename to kharbranth

---
 configurations/dropbox.nix                    |   2 +-
 imports/nixos-hardware/default.nix            |   7 ---
 imports/nixos-hardware/metadata.nix           |   9 ---
 imports/nixpkgs/metadata.nix                  |   6 +-
 .../{oldtown => kharbranth}/configuration.nix |  20 +++----
 machines/{oldtown => kharbranth}/default.nix  |   0
 machines/kharbranth/hardware.nix              |  56 ++++++++++++++++++
 machines/kharbranth/secret.nix                | Bin 0 -> 2481 bytes
 machines/kholinar/configuration.nix           |   5 --
 machines/kholinar/hardware.nix                |   1 -
 machines/oldtown/hardware.nix                 |  36 -----------
 machines/oldtown/secret.nix                   | Bin 2478 -> 0 bytes
 packages/kotlin-language-server/default.nix   |   2 +-
 13 files changed, 71 insertions(+), 73 deletions(-)
 delete mode 100644 imports/nixos-hardware/default.nix
 delete mode 100644 imports/nixos-hardware/metadata.nix
 rename machines/{oldtown => kharbranth}/configuration.nix (71%)
 rename machines/{oldtown => kharbranth}/default.nix (100%)
 create mode 100644 machines/kharbranth/hardware.nix
 create mode 100644 machines/kharbranth/secret.nix
 delete mode 100644 machines/oldtown/hardware.nix
 delete mode 100644 machines/oldtown/secret.nix

diff --git a/configurations/dropbox.nix b/configurations/dropbox.nix
index 0905bbe4..d342bfb7 100644
--- a/configurations/dropbox.nix
+++ b/configurations/dropbox.nix
@@ -2,7 +2,7 @@
 
 {
   custom.zfs.homeLinks = [
-    { path = ".dropbox"; type = "data"; }
+    { path = ".dropbox"; type = "cache"; }
     { path = "Dropbox"; type = "data"; }
   ];
   home-manager.users.charlotte = { pkgs, ... }: {
diff --git a/imports/nixos-hardware/default.nix b/imports/nixos-hardware/default.nix
deleted file mode 100644
index 961783d0..00000000
--- a/imports/nixos-hardware/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  metadata = import ./metadata.nix;
-in
-builtins.fetchTarball {
-  url = "https://github.com/NixOS/nixos-hardware/archive/${metadata.rev}.tar.gz";
-  sha256 = metadata.sha256;
-}
diff --git a/imports/nixos-hardware/metadata.nix b/imports/nixos-hardware/metadata.nix
deleted file mode 100644
index df47690f..00000000
--- a/imports/nixos-hardware/metadata.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  url = "https://github.com/NixOS/nixos-hardware/archive/master.tar.gz";
-  repo_git = "https://github.com/NixOS/nixos-hardware";
-  branch = "master";
-  rev = "cc353d439e3135dbe3f5473d897d2c35537f260c";
-  sha256 = "1vwjdbl7x5nx3i6x4xqqsbfwm5kby4qskr1yrx5sv849560ag4dm";
-  revdate = "2020-07-06 16:22:31 +0100";
-  skip = false;
-}
diff --git a/imports/nixpkgs/metadata.nix b/imports/nixpkgs/metadata.nix
index df8b5915..aaaf11cf 100644
--- a/imports/nixpkgs/metadata.nix
+++ b/imports/nixpkgs/metadata.nix
@@ -2,8 +2,8 @@
   url = "https://github.com/charvp/nixpkgs/archive/master.tar.gz";
   repo_git = "https://github.com/charvp/nixpkgs";
   branch = "master";
-  rev = "0a76d3a9b33ab414a8719a1a9d6a4aa7eb09a999";
-  sha256 = "0q7hvlf3p1say0j8jw4wzq6w27p3k4xbklcchx08wahvp41lgmix";
-  revdate = "2020-07-10 09:47:22 +0200";
+  rev = "901695dcaa0c0143def8ad5ad75834e3a5bcc478";
+  sha256 = "1w26a7c0yhxv8qa1msylbq3qifxramrnsgdaplyjy5sbs61i95hr";
+  revdate = "2020-07-11 13:04:15 +0200";
   skip = false;
 }
diff --git a/machines/oldtown/configuration.nix b/machines/kharbranth/configuration.nix
similarity index 71%
rename from machines/oldtown/configuration.nix
rename to machines/kharbranth/configuration.nix
index 4837a2e0..1a49270e 100644
--- a/machines/oldtown/configuration.nix
+++ b/machines/kharbranth/configuration.nix
@@ -1,14 +1,7 @@
 { config, pkgs, ... }:
 
-let
-  findImport = (import ../../lib.nix).findImport;
-  nixos-hardware = findImport "nixos-hardware";
-in
 {
   imports = [
-    "${nixos-hardware}/common/cpu/intel"
-    "${nixos-hardware}/common/pc/laptop"
-    "${nixos-hardware}/common/pc/laptop/ssd"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
@@ -17,7 +10,10 @@ in
     ../../profiles/graphical.nix
   ];
 
-  networking.hostName = "oldtown";
+  networking = {
+    hostId = "e718389d";
+    hostName = "kharbranth";
+  };
 
   time.timeZone = "Europe/Brussels";
 
@@ -27,14 +23,18 @@ in
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.03";
+  system.stateVersion = "20.09";
 
   home-manager.users.charlotte = { ... }: {
-    home.stateVersion = "20.03";
+    home.stateVersion = "20.09";
   };
 
   # Machine-specific application settings
   custom = {
     git.email = "charlotte.vanpetegem@ugent.be";
+    zfs = {
+      enable = true;
+      encrypted = true;
+    };
   };
 }
diff --git a/machines/oldtown/default.nix b/machines/kharbranth/default.nix
similarity index 100%
rename from machines/oldtown/default.nix
rename to machines/kharbranth/default.nix
diff --git a/machines/kharbranth/hardware.nix b/machines/kharbranth/hardware.nix
new file mode 100644
index 00000000..f67d9b3c
--- /dev/null
+++ b/machines/kharbranth/hardware.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot = {
+    # Use the systemd-boot EFI boot loader.
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      kernelModules = [ "i915" ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems."/" = {
+    device = "rpool/local/root";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };
+
+  fileSystems."/nix/store" = {
+    device = "rpool/local/nix-store";
+    fsType = "zfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/A5BA-352A";
+    fsType = "vfat";
+  };
+
+  fileSystems."/cache" = {
+    device = "rpool/local/cache";
+    fsType = "zfs";
+  };
+
+  fileSystems."/data" = {
+    device = "rpool/safe/data";
+    fsType = "zfs";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/1de27da4-5e97-4104-ab2b-18ab14a2b90b"; }
+  ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = true;
+}
diff --git a/machines/kharbranth/secret.nix b/machines/kharbranth/secret.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6a77511d5090b35fd94fec93192c41de64ad6efb
GIT binary patch
literal 2481
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
V$&^Fv{{nK;wjX&qcSoq3HvqeC!N>pr

literal 0
HcmV?d00001

diff --git a/machines/kholinar/configuration.nix b/machines/kholinar/configuration.nix
index 96f9d5af..0ba8bda9 100644
--- a/machines/kholinar/configuration.nix
+++ b/machines/kholinar/configuration.nix
@@ -1,12 +1,7 @@
 { pkgs, lib, ... }:
 
-let
-  findImport = (import ../../lib.nix).findImport;
-  nixos-hardware = findImport "nixos-hardware";
-in
 {
   imports = [
-    "${nixos-hardware}/lenovo/thinkpad/t490"
     ./hardware.nix
     ./secret.nix
     ../../configurations/eid.nix
diff --git a/machines/kholinar/hardware.nix b/machines/kholinar/hardware.nix
index a417d9ef..38c502a1 100644
--- a/machines/kholinar/hardware.nix
+++ b/machines/kholinar/hardware.nix
@@ -48,7 +48,6 @@
     { device = "/dev/disk/by-uuid/6c09b90f-8971-4702-a18a-f06dfb3d8dcd"; }
   ];
 
-  nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = true;
 }
diff --git a/machines/oldtown/hardware.nix b/machines/oldtown/hardware.nix
deleted file mode 100644
index 31999a5d..00000000
--- a/machines/oldtown/hardware.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-      kernelModules = [ "i915" ];
-    };
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A4C4-7B9F";
-    fsType = "vfat";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/72c82e3c-ea61-488b-8b24-b3c27368a2ba"; }
-  ];
-
-  nix.maxJobs = lib.mkDefault 8;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = true;
-}
diff --git a/machines/oldtown/secret.nix b/machines/oldtown/secret.nix
deleted file mode 100644
index 72ae63a43b9e2b1cb24b8a97f4487caf4a128bce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2478
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
Wj~7!j&N{h%{Sx-HbERRz3M&A97uzua

diff --git a/packages/kotlin-language-server/default.nix b/packages/kotlin-language-server/default.nix
index b6290026..fe8bfebd 100644
--- a/packages/kotlin-language-server/default.nix
+++ b/packages/kotlin-language-server/default.nix
@@ -8,7 +8,7 @@ buildGradle {
   envSpec = ./gradle-env.json;
   src = fetchTarball {
     url = "https://github.com/fwcd/kotlin-language-server/archive/master.tar.gz";
-    sha256 = "16qddjwcj1n79c4p9dqlj1vg6yg5rkvzb8r15jbyxsy82mp6ib3k";
+    sha256 = "0by07h2ly84dzmwzjf3fsgghm3fwhyhhbnnv3kl7dy1iajhl4shj";
   };
   gradleFlags = [ "server:installDist" ];
   installPhase = ''