From 98daa4eec2af1e444a8c7585c9f89aecb47473f3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 22 May 2021 19:24:11 +0200 Subject: [PATCH] flammea: flakify --- flake.nix | 4 ++++ flammea.nix | 26 ++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 765fb73..c56cff9 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,10 @@ system = "x86_64-linux"; modules = [ ./petalius.nix neovimOverlay ]; }; + flammea = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ ./flammea.nix neovimOverlay ]; + }; }; }; } diff --git a/flammea.nix b/flammea.nix index 69d5fbc..5214df0 100644 --- a/flammea.nix +++ b/flammea.nix @@ -3,7 +3,6 @@ { imports = [ - /etc/nixos/hardware-configuration.nix ./common-headless.nix # ./sway.nix ./i3.nix @@ -14,10 +13,31 @@ ./atmega.nix ./v4l2loopback.nix ./huion.nix - # ./unstable-nix.nix + ./unstable-nix.nix ./spacenav.nix ]; + hardware.enableRedistributableFirmware = true; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ + "kvm-amd" + "zenpower" + ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/3b8c5c8a-fff2-49ba-98bd-ceb01d6d57c3"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1FA2-93AB"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + environment.etc."lvm/lvm.conf".text = '' devices { issue_discards = 1 @@ -124,8 +144,6 @@ ACTION=="add", KERNEL=="i2c-[0-9]*", GROUP="wheel", MODE="666" ''; - boot.kernelModules = [ "zenpower" ]; - system.stateVersion = "21.05"; }