feat(koishi): new laptop!!!

systems/default.nix

@@ -3,6 +3,7 @@
   tree,
   lib,
   std,
+  pkgs,
   ...
 }: let
   # The purpose of this file is to set up the host module which allows assigning of the system, e.g. aarch64-linux and the builder used with less pain.
@@ -109,9 +110,13 @@
           macos = inputs.darwin.lib.darwinSystem;
         }
         .${string.toLower config.type};
-      specialArgs =
-        {
-          inherit machine;
+      specialArgs = let
+        nur = import inputs.nur {
+          pkgs = pkgs.${config.system};
+          nurpkgs = pkgs.${config.system};
+        };
+      in {
+          inherit machine nur;
           systemType = config.folder;
           inherit (config) system;
         }

systems/koishi.nix

@@ -1,91 +1,70 @@
 _: let
-  hostConfig = {tree, pkgs, ...}: {
+  hostConfig = {
+    tree,
+    pkgs,
+    lib,
+    inputs,
+    ...
+  }: {
     imports =
       (with tree.nixos.hardware; [
-        intel_cpu
-        intel_gpu
-        uefi
+        framework
       ])
       ++ (with tree.nixos.profiles; [
         graphical
         wireless
         laptop
+        bcachefs
       ])
       ++ (with tree.nixos.environments; [
-        #kde
         hyprland
       ]);
+    config = {
+      home-manager.users.kat.imports =
+        (with tree.home.profiles; [
+          graphical
+          devops
+        ])
+        ++ (with tree.home.environments; [
+          hyprland
+        ]);
 
-    home-manager.users.kat.imports =
-      (with tree.home.profiles; [
-        graphical
-        devops
-      ])
-      ++ (with tree.home.environments; [
-        #kde
-        hyprland
-      ]);
+      environment.systemPackages = with pkgs; [
+        parsec-bin
+      ];
 
-    environment.systemPackages = with pkgs; [
-      parsec-bin
-    ];
-  
-  programs.adb.enable = true;
-  users.users.kat.extraGroups = ["adbusers"];
-
-    fileSystems = {
-      "/" = {
-        device = "/dev/disk/by-uuid/a664de0f-9883-420e-acc5-b9602a23e816";
-        fsType = "xfs";
-      };
-      "/boot" = {
-        device = "/dev/disk/by-uuid/DEBC-8F03";
-        fsType = "vfat";
-      };
-    };
-
-    networking.networkmanager.wifi.backend = "iwd";
-
-    swapDevices = [
-      {device = "/dev/disk/by-uuid/0d846453-95b4-46e1-8eaf-b910b4321ef0";}
-    ];
-
-    boot = {
-      supportedFilesystems = ["xfs"];
-      extraModprobeConfig = "options snd_hda_intel power_save=1 power_save_controller=Y";
-      initrd = {
-        availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"];
-        luks.devices."cryptroot".device = "/dev/disk/by-uuid/f0ea08b4-6af7-4d90-a2ad-edd5672a2105";
-      };
-      loader = {
-        efi = {
-          canTouchEfiVariables = true;
-          efiSysMountPoint = "/boot";
+      fileSystems = {
+        "/" = {
+          device = "UUID=861e8815-9327-4e49-915b-73a3b0bdfa25";
+          fsType = "bcachefs";
         };
-        grub = {
-          enable = true;
-          efiSupport = true;
-          devices = ["nodev"];
-          extraEntries = ''
-            menuentry "Windows" {
-              insmod part_gpt
-                insmod fat
-                insmod search_fs_uuid
-                insmod chain
-                search --fs-uuid --set=root DEBC-8F03
-                chainloader /EFI/Microsoft/Boot/bootmgfw.efi
-            }
-          '';
+        "/boot" = {
+          device = "/dev/disk/by-uuid/DD84-303D";
+          fsType = "vfat";
         };
       };
-    };
 
-    networking = {
-      hostId = "dddbb888";
-      useDHCP = false;
-    };
+      swapDevices = [
+        {device = "/dev/disk/by-uuid/04bd322e-dca0-43b8-b588-cc0ef1b1488e";}
+      ];
 
-    system.stateVersion = "21.11";
+      boot = {
+        supportedFilesystems = ["ntfs"];
+        loader = {
+          efi = {
+            canTouchEfiVariables = true;
+            efiSysMountPoint = "/boot";
+          };
+          systemd-boot.enable = true;
+        };
+      };
+
+      networking = {
+        useDHCP = false;
+      };
+
+      system.stateVersion = "24.05";
+    };
   };
 in {
   arch = "x86_64";