From 5f94d92e112c63b316221fdb0595429f3b646de3 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Wed, 21 Aug 2024 03:25:55 -0700
Subject: [PATCH] fix: correctly configure new hardware

---
 hosts/callisto/hardware-configuration.nix     | 42 +++++++++----------
 hosts/callisto/hardware-configuration.nix.old | 39 +++++++++++++++++
 .../youwen/linux/packages/common-packages.nix |  2 +-
 3 files changed, 61 insertions(+), 22 deletions(-)
 mode change 100755 => 100644 hosts/callisto/hardware-configuration.nix
 create mode 100755 hosts/callisto/hardware-configuration.nix.old

diff --git a/hosts/callisto/hardware-configuration.nix b/hosts/callisto/hardware-configuration.nix
old mode 100755
new mode 100644
index c812f7a..b32d2d8
--- a/hosts/callisto/hardware-configuration.nix
+++ b/hosts/callisto/hardware-configuration.nix
@@ -1,32 +1,32 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/bc88058e-6e3a-4987-b78e-e19cb5611608";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/mapper/crypted";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/852F-07F1";
-    fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
-  };
+  boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/f4c552be-a4c2-4ca0-aec6-ed692d78fe24";
 
-  swapDevices = [];
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/852F-07F1";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/callisto/hardware-configuration.nix.old b/hosts/callisto/hardware-configuration.nix.old
new file mode 100755
index 0000000..c812f7a
--- /dev/null
+++ b/hosts/callisto/hardware-configuration.nix.old
@@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+
+  boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = [];
+  boot.extraModulePackages = [];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/bc88058e-6e3a-4987-b78e-e19cb5611608";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/852F-07F1";
+    fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
+  };
+
+  swapDevices = [];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}
diff --git a/users/youwen/linux/packages/common-packages.nix b/users/youwen/linux/packages/common-packages.nix
index 68bf4f5..93f60c9 100644
--- a/users/youwen/linux/packages/common-packages.nix
+++ b/users/youwen/linux/packages/common-packages.nix
@@ -36,7 +36,7 @@ with pkgs; [
   # desktop apps
   dolphin
   thunderbird
-  vesktop
+  # vesktop
   signal-desktop
 
   gcc