Merge branch 'main' of ssh://git.duckland.org:2202/don/NixOS-Configs

This commit is contained in:
Don Harper 2024-09-21 14:11:18 -05:00
commit 7f8f785f9f
6 changed files with 64 additions and 45 deletions

View file

@ -1,11 +1,15 @@
# 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")
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
@ -13,13 +17,13 @@
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c871ca4a-fb86-4631-b3bd-105931c5f373";
fileSystems."/" = {
device = "/dev/disk/by-uuid/c871ca4a-fb86-4631-b3bd-105931c5f373";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/55CA-7FD8";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/55CA-7FD8";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};

View file

@ -1,4 +1,10 @@
{ modulesPath, config, lib, pkgs, ... }: {
{
modulesPath,
config,
lib,
pkgs,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/profiles/qemu-guest.nix")
@ -9,9 +15,11 @@
kernelParams = ["consoleblank=60"];
loader = {
timeout = 10;
/* systemd-boot = {
/*
systemd-boot = {
enable = true;
}; */
};
*/
grub = {
device = "nodev";
efiSupport = true;

View file

@ -1,4 +1,10 @@
{ modulesPath, config, lib, pkgs, ... }: {
{
modulesPath,
config,
lib,
pkgs,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/profiles/qemu-guest.nix")

View file

@ -1,6 +1,5 @@
# Example to create a bios compatible gpt partition
{ lib, ... }:
{
{lib, ...}: {
disko.devices = {
disk.disk1 = {
device = lib.mkDefault "/dev/vda";

View file

@ -1,6 +1,5 @@
# Example to create a bios compatible gpt partition
{ lib, ... }:
{
{lib, ...}: {
disko.devices = {
disk.disk1 = {
device = lib.mkDefault "/dev/sda";

View file

@ -3,8 +3,11 @@
inputs.disko.url = "github:nix-community/disko";
inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
outputs = { nixpkgs, disko, ... }:
{
outputs = {
nixpkgs,
disko,
...
}: {
nixosConfigurations.smaug = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [