From 9d420364c77541947029e8d2daffe435b511d772 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 17 Sep 2022 18:59:21 +0000
Subject: [PATCH] New install on spike

---
 system/spike/boot-config.nix            |  4 ++--
 system/spike/default.nix                | 15 +++++++++++-
 system/spike/hardware-configuration.nix | 32 ++++++++++---------------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/system/spike/boot-config.nix b/system/spike/boot-config.nix
index 08c4c2e..5d78c3b 100644
--- a/system/spike/boot-config.nix
+++ b/system/spike/boot-config.nix
@@ -3,6 +3,7 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
+    kernelParams = [ "fbcon=rotate:1" ];
     kernel.sysctl."vm.swappiness" = 5;
     cleanTmpDir = true;
 
@@ -12,10 +13,9 @@
     };
 
     initrd = {
-      availableKernelModules = [ "battery" ]; # wat
       luks.devices."${config.networking.hostName}" = {
         name = config.networking.hostName;
-        device = "/dev/disk/by-uuid/9df93bae-80b9-48c2-be43-b73994afda5b";
+        device = "/dev/disk/by-uuid/eb0e5aaf-afa3-43e4-89b3-af4a3f7f0546";
         preLVM = true;
         allowDiscards = true;
       };
diff --git a/system/spike/default.nix b/system/spike/default.nix
index c01cf71..389bbca 100644
--- a/system/spike/default.nix
+++ b/system/spike/default.nix
@@ -13,5 +13,18 @@
   ];
 
   networking.hostName = "spike";
-  system.stateVersion = "20.03";
+  system.stateVersion = "22.05";
+
+  home-manager.users.artemis.wayland.windowManager.sway.config = {
+    output."DSI-1" = { pos = "0 0"; mode = "720x1280@60.083Hz"; transform = "90"; };
+    input."24704:32865:AMR-4630-XXX-0-_0-1023_USB_KEYBOARD_Mouse" = {
+      scroll_method = "on_button_down";
+      scroll_button = "BTN_MIDDLE";
+    };
+  };
+
+  services.btrfs.autoScrub = {
+    enable = true;
+    fileSystems = [ "/" ];
+  };
 }
diff --git a/system/spike/hardware-configuration.nix b/system/spike/hardware-configuration.nix
index 59c024c..a2ff16d 100644
--- a/system/spike/hardware-configuration.nix
+++ b/system/spike/hardware-configuration.nix
@@ -9,47 +9,39 @@
       (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
     {
-      device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
+      device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
       fsType = "btrfs";
       options = [ "subvol=root" ];
     };
 
-  fileSystems."/nix" =
-    {
-      device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
-      fsType = "btrfs";
-      options = [ "subvol=nix" ];
-    };
-
-  fileSystems."/var/lib/flatpak" =
-    {
-      device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
-      fsType = "btrfs";
-      options = [ "subvol=flatpak" ];
-    };
-
   fileSystems."/home" =
     {
-      device = "/dev/disk/by-uuid/54a16759-45b0-4b30-92d9-d60ee6815511";
+      device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
 
+  fileSystems."/nix" =
+    {
+      device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
   fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/597E-B7FC";
+      device = "/dev/disk/by-uuid/B78C-8B71";
       fsType = "vfat";
     };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/52effd04-0e5a-4ac6-a0c9-5970c063e5f4"; }];
+    [{ device = "/dev/disk/by-uuid/057964ef-4692-4189-98c6-32e7e05565e2"; }];
 
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }