From 4c5f2aa497fd015d4c4ff11a598e5203f80b60a9 Mon Sep 17 00:00:00 2001 From: Leonardo Date: Tue, 24 Feb 2026 18:54:34 +0100 Subject: mi sono arreso a nix e ora hardware-configuration.nix รจ tracciato MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hermes/nixos/boot.nix | 7 +++++++ hermes/nixos/default.nix | 7 ++----- hermes/nixos/hardware.nix | 24 ++++++++++++++++++++++++ hermes/nixos/networking.nix | 3 ++- hermes/nixos/programs/default.nix | 2 ++ 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 hermes/nixos/hardware.nix (limited to 'hermes') diff --git a/hermes/nixos/boot.nix b/hermes/nixos/boot.nix index b4cc5b9..f7ff6b4 100644 --- a/hermes/nixos/boot.nix +++ b/hermes/nixos/boot.nix @@ -1,8 +1,14 @@ {pkgs, ...}: { boot = { kernelPackages = pkgs.linuxPackages_latest; + kernelModules = [ "kvm-intel" ]; kernelParams = [ "boot.shell_on_fail" ]; + initrd = { + availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; + kernelModules = [ ]; + }; + loader = { timeout = 3; systemd-boot.enable = true; @@ -10,5 +16,6 @@ }; supportedFilesystems = [ "exfat" "ntfs" ]; + extraModulePackages = [ ]; }; } diff --git a/hermes/nixos/default.nix b/hermes/nixos/default.nix index 2c96aee..c23603e 100644 --- a/hermes/nixos/default.nix +++ b/hermes/nixos/default.nix @@ -1,6 +1,6 @@ -{inputs, pkgs, ...}: { +{pkgs, ...}: { imports = [ - ./hardware-configuration.nix + ./hardware.nix ./boot.nix ./networking.nix ./locales.nix @@ -8,9 +8,6 @@ ./gui ./services ./programs - - inputs.nixos-hardware.nixosModules.lenovo-thinkpad-l14-intel - inputs.home-manager.nixosModules.home-manager ]; # Experimental features diff --git a/hermes/nixos/hardware.nix b/hermes/nixos/hardware.nix new file mode 100644 index 0000000..52ab29c --- /dev/null +++ b/hermes/nixos/hardware.nix @@ -0,0 +1,24 @@ +{inputs, config, lib, modulesPath, ...}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-l14-intel + ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/d2dbb171-8b65-4c40-9f09-d4e7b83f0094"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/ACC0-F37A"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/d5e4b700-4eb2-4b19-8d7f-8a8e154a4df1"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hermes/nixos/networking.nix b/hermes/nixos/networking.nix index c76ecc2..595a9cc 100644 --- a/hermes/nixos/networking.nix +++ b/hermes/nixos/networking.nix @@ -1,6 +1,7 @@ -{pkgs, ...}: { +{lib, pkgs, ...}: { networking = { hostName = "hermes"; + useDHCP = lib.mkDefault true; nameservers = [ "208.67.222.222" "208.67.220.220" ]; diff --git a/hermes/nixos/programs/default.nix b/hermes/nixos/programs/default.nix index 28ca86e..bcee834 100644 --- a/hermes/nixos/programs/default.nix +++ b/hermes/nixos/programs/default.nix @@ -2,6 +2,8 @@ imports = [ ./fonts.nix ./games.nix + + inputs.home-manager.nixosModules.home-manager ]; nixpkgs.config.allowUnfree = true; -- cgit v1.3