From 25955fc0aa371a6d1b5b6ff79ed33a3861a53223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 2 Dec 2024 20:04:38 +0200 Subject: [PATCH] move some common stuff to desktop --- hosts/fwminex/configuration.nix | 2 -- hosts/mtworx/configuration.nix | 2 -- hosts/vm/configuration.nix | 8 ++------ modules/profiles/desktop/default.nix | 9 ++++++++- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index c29d126..0aea572 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -36,8 +36,6 @@ in }; boot = { - kernelModules = [ "kvm-intel" ]; - loader.systemd-boot.enable = true; initrd = { systemd.enable = true; kernelModules = [ "usb_storage" ]; diff --git a/hosts/mtworx/configuration.nix b/hosts/mtworx/configuration.nix index 5c01db8..95664fa 100644 --- a/hosts/mtworx/configuration.nix +++ b/hosts/mtworx/configuration.nix @@ -31,9 +31,7 @@ in }; boot = { - kernelModules = [ "kvm-intel" ]; kernelPackages = pkgs.linuxPackages_6_11; - loader.systemd-boot.enable = true; initrd = { availableKernelModules = [ diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix index 2c3e02b..b3fbfa6 100644 --- a/hosts/vm/configuration.nix +++ b/hosts/vm/configuration.nix @@ -1,6 +1,7 @@ { self, modulesPath, + pkgs, ... }: { @@ -24,12 +25,7 @@ }; }; - boot = { - loader.systemd-boot.enable = true; - supportedFilesystems = [ - "btrfs" - ]; - }; + boot.kernelPackages = pkgs.linuxPackages_latest; isoImage = { isoName = "toolshed-${self.lastModifiedDate}.iso"; diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix index 72a8fa0..111819d 100644 --- a/modules/profiles/desktop/default.nix +++ b/modules/profiles/desktop/default.nix @@ -12,7 +12,14 @@ in { imports = [ ../dev ]; config = { - boot.supportedFilesystems = [ "ntfs" ]; + boot = { + supportedFilesystems = [ + "btrfs" + "ntfs" + ]; + kernelModules = [ "kvm-intel" ]; + loader.systemd-boot.enable = true; + }; hardware.bluetooth = { enable = true;