From ddb7150624294492d57c4b409f5169121c0ab9f5 Mon Sep 17 00:00:00 2001 From: Faris Date: Fri, 31 Oct 2025 15:18:34 +0000 Subject: [PATCH] bluph --- config/common.nix | 5 +++- config/desktop.nix | 2 +- hosts/desktop/hardware.nix | 57 +++++++++++++------------------------- 3 files changed, 24 insertions(+), 40 deletions(-) diff --git a/config/common.nix b/config/common.nix index 8ca6621..0e401c9 100644 --- a/config/common.nix +++ b/config/common.nix @@ -11,8 +11,11 @@ { # Bootloader - boot.loader.limine.enable = true; + #boot.loader.limine.enable = true; + #boot.loader.grub.enable = false; + boot.loader.systemd-boot.enable = true; #boot.loader.limine.secureBoot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; # Enable networking #networking.networkmanager.enable = true; diff --git a/config/desktop.nix b/config/desktop.nix index 68b1274..91bb13c 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -49,7 +49,7 @@ # }; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/hosts/desktop/hardware.nix b/hosts/desktop/hardware.nix index 44587c8..b67b6ec 100644 --- a/hosts/desktop/hardware.nix +++ b/hosts/desktop/hardware.nix @@ -1,60 +1,41 @@ # 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, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "uas" - "usbhid" - "sd_mod" - ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/ba76c63c-7fe5-4e61-8b24-0961de838681"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/bd28421d-7ec4-4b23-964d-c07a6f351e1f"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."luks-2af03012-1c9a-4245-8b4d-a4df773d6a14".device = - "/dev/disk/by-uuid/2af03012-1c9a-4245-8b4d-a4df773d6a14"; + boot.initrd.luks.devices."luks-e3a81f8e-3ae9-494b-a329-a6f860b10e34".device = "/dev/disk/by-uuid/e3a81f8e-3ae9-494b-a329-a6f860b10e34"; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/7AEC-64D7"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/D47C-5FCE"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/be22d9db-283a-4dd9-93d5-1006e392724b"; } ]; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/34d32441-0c17-4592-b026-56b28bf7e3bf"; } - ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp42s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;