summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/laptop/configuration.nix6
-rw-r--r--hosts/laptop/disko.nix11
-rw-r--r--hosts/laptop/hardware-configuration.nix18
3 files changed, 30 insertions, 5 deletions
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index c3f2d24..b77bbb3 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -1,10 +1,12 @@
-{ username, ... }:
+{ username, inputs, ... }:
{
system.stateVersion = "25.05";
imports = [
- ./hardware-configuration.nix
+ inputs.disko.nixosModules.disko
./disko.nix
+
+ ./hardware-configuration.nix
../../sys/default.nix
];
diff --git a/hosts/laptop/disko.nix b/hosts/laptop/disko.nix
index 54b30a1..6b9951a 100644
--- a/hosts/laptop/disko.nix
+++ b/hosts/laptop/disko.nix
@@ -1,5 +1,6 @@
{
disko.devices = {
+ disk = {
main = {
type = "disk";
device = "/dev/nvme0n1";
@@ -13,12 +14,12 @@
content = {
type = "filesystem";
format = "vfat";
- mountpoint = "/boot/efi";
+ mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
- root = {
- size = "100%";
+ nixos = {
+ size = "200G";
content = {
type = "btrfs";
extraArgs = [ "-f" ];
@@ -42,8 +43,12 @@
};
};
};
+ fedora = {
+ size = "100%";
+ };
};
};
};
};
+ };
}
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
new file mode 100644
index 0000000..5e029fd
--- /dev/null
+++ b/hosts/laptop/hardware-configuration.nix
@@ -0,0 +1,18 @@
+# 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 = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
+ boot.initrd.kernelModules = [ ];
+ boot.kernelModules = [ "kvm-amd" ];
+ boot.extraModulePackages = [ ];
+
+ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+ hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}