Public/nixos-config
2
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
John Locke 2024-03-23 11:32:22 -07:00
commit 9e173d75bd
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hosts/desktop/katmai/configuration.nix
View file

@ -13,9 +13,13 @@
../../../users/owners.nix ../../../users/owners.nix
]; ];
# Bootloader.
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sdb";
boot.loader.grub.useOSProber = true;
networking.hostName = "katmai"; # Define your hostname. networking.hostName = "katmai"; # Define your hostname.
networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default

15
hosts/desktop/katmai/hardware-configuration.nix
View file

@ -8,25 +8,20 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/ebd125c4-ab78-4604-a0be-826d0a3d0c03"; { device = "/dev/disk/by-uuid/7c747da5-2aed-4bfd-b24a-0ae6f27b7dbd";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" ]; options = [ "subvol=@" ];
}; };
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/ED13-F512";
fsType = "vfat";
};
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/f5dd6012-e88b-444d-99f6-4a468493bd13"; { device = "/dev/disk/by-uuid/9e71ba51-384d-47f1-a9f1-27adacbb2d9d";
fsType = "xfs"; fsType = "ext4";
}; };
swapDevices = [ ]; swapDevices = [ ];
@ -36,7 +31,7 @@
# still possible to use this option, but it's recommended to use it in conjunction # 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`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";