dragotha + formatting

4 files changed, 42 insertions, 2 deletions

diff --git a/modules/hosts/dragotha/dragotha.nix b/modules/hosts/dragotha/dragotha.nix
index 9cd518b..f2236a7 100644
--- a/modules/hosts/dragotha/dragotha.nix
+++ b/modules/hosts/dragotha/dragotha.nix
@@ -38,6 +38,8 @@
     services.desktopManager.lomiri.enable = true;
     services.displayManager.defaultSession = "lomiri";
 
+    services.flatpak.enable = false;
+
     services.kanata = {
       enable = true;
       keyboards.tkb = {
diff --git a/modules/hosts/dragotha/hardware.nix b/modules/hosts/dragotha/hardware.nix
index 19bd7f1..b1f972a 100644
--- a/modules/hosts/dragotha/hardware.nix
+++ b/modules/hosts/dragotha/hardware.nix
@@ -10,5 +10,38 @@
     modulesPath,
     ...
   }: {
+    imports = [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+    boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
+    boot.initrd.kernelModules = [];
+    boot.kernelModules = ["kvm-intel"];
+    boot.extraModulePackages = [];
+
+    fileSystems."/" = {
+      device = "/dev/disk/by-uuid/c7836c05-731a-4bf2-b119-d6eeb64e1dce";
+      fsType = "ext4";
+    };
+
+    fileSystems."/boot" = {
+      device = "/dev/disk/by-uuid/6B9B-0174";
+      fsType = "vfat";
+      options = ["fmask=0077" "dmask=0077"];
+    };
+
+    swapDevices = [
+      {device = "/dev/disk/by-uuid/329fb39c-c386-4115-9a55-a265ae59ff94";}
+    ];
+
+    # 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.wlp1s0.useDHCP = lib.mkDefault true;
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   };
 }
diff --git a/modules/packages/niri/package.nix b/modules/packages/niri/package.nix
index fad7cb4..b7001d6 100644
--- a/modules/packages/niri/package.nix
+++ b/modules/packages/niri/package.nix
@@ -22,7 +22,12 @@
     environment.systemPackages = [pkgs.wlr-randr];
   };
 
-  perSystem = {pkgs, lib, self', ...}: {
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: {
     packages.niri = inputs.wrapper-modules.wrappers.niri.wrap {
       inherit pkgs;
       imports = [
diff --git a/modules/packages/niri/settings.nix b/modules/packages/niri/settings.nix
index 42f9ab2..f97d3ba 100644
--- a/modules/packages/niri/settings.nix
+++ b/modules/packages/niri/settings.nix
@@ -118,7 +118,7 @@
       };
 
       spawn-at-startup = [
-        (noctaliaExe)
+        noctaliaExe
       ];
     };
   };