Commit 4637f1dfcddd

Vincent Demeester <vincent@sbr.pm>
2025-04-17 18:17:36
systems: re-enable some stuff now that kyushu boots
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent a5a723d
Changed files (5)
systems
common
desktop
default.nix
kyushu
disks.nix
extra.nix
hardware.nix
default.nix
systems/common/desktop/default.nix
@@ -10,7 +10,7 @@
     ./binfmt.nix
     ../programs/nix-ld.nix
     ../services/pipewire.nix
-    # ../hardware/yubikey.nix
+    ../hardware/yubikey.nix
     # ../virt
   ];
   # Enable Plymouth and surpress some logs by default.
systems/kyushu/disks.nix
@@ -20,10 +20,6 @@
     # fallbackToPassword = lib.mkForce true;
   };
 
-  # TODO: Remove this if/when machine is reinstalled.
-  # This is a workaround for the legacy -> gpt tables disko format.
-  # fileSystems."/boot".device = lib.mkForce "/dev/disk/by-partlabel/ESP";
-
   disko.devices = {
     disk = {
       # 512GB root/boot drive. Configured with:
systems/kyushu/extra.nix
@@ -2,12 +2,11 @@
 {
 
   imports = [
-    # ../common/services/backup
-    # ../common/hardware/laptop.nix
-    # ../common/programs/direnv.nix
-    # ../common/programs/git.nix
-    # ../common/programs/tmux.nix
-    # ../common/services/networkmanager.nix
+    ../common/hardware/laptop.nix
+    ../common/programs/direnv.nix
+    ../common/programs/git.nix
+    ../common/programs/tmux.nix
+    ../common/services/networkmanager.nix
   ];
 
 }
systems/kyushu/hardware.nix
@@ -6,8 +6,8 @@
 
     inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-12th-gen
 
-    # ../common/hardware/acpid.nix
-    # ../common/hardware/bluetooth.nix
+    ../common/hardware/acpid.nix
+    ../common/hardware/bluetooth.nix
   ];
 
   hardware = {
systems/default.nix
@@ -17,8 +17,8 @@
     ./common/base
     ./common/users
   ]
-  ++ lib.optional (builtins.pathExists (./. + "/${hostname}/extra.nix")) ./${hostname}/extra.nix;
-  # ++ lib.optional (builtins.isString desktop) ./common/desktop;
+  ++ lib.optional (builtins.pathExists (./. + "/${hostname}/extra.nix")) ./${hostname}/extra.nix
+  ++ lib.optional (builtins.isString desktop) ./common/desktop;
 
   nixpkgs = {
     overlays = [