diff --git a/flake.nix b/flake.nix index 73e41f3..bfaf0ad 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ nix-gaming.url = "github:fufexan/nix-gaming"; disko.url = "github:nix-community/disko/latest"; impermanence.url = "github:nix-community/impermanence"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -88,6 +89,7 @@ modules = [ ./hardware ./system + nixos-hardware.nixosModules.framework-16-amd-ai-300-series home-manager.nixosModules.home-manager { powerManagement.enable = true; diff --git a/hardware/station-hardware-configuration.nix b/hardware/station-hardware-configuration.nix index 5a4e17d..016c5f2 100644 --- a/hardware/station-hardware-configuration.nix +++ b/hardware/station-hardware-configuration.nix @@ -4,13 +4,15 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hardware/station-mounts.nix b/hardware/station-mounts.nix index 1f061de..742df3d 100644 --- a/hardware/station-mounts.nix +++ b/hardware/station-mounts.nix @@ -5,18 +5,18 @@ ./nas-mounts.nix ]; - fileSystems = { - "/home/chris/Games" = { - device = "/dev/disk/by-label/Games"; - fsType = "ext4"; - options = [ - "defaults" - "x-systemd.mount-timeout=5" - "user" - "exec" - "x-systemd.automount" - "noauto" - ]; - }; - }; + # fileSystems = { + # "/home/chris/Games" = { + # device = "/dev/disk/by-label/Games"; + # fsType = "ext4"; + # options = [ + # "defaults" + # "x-systemd.mount-timeout=5" + # "user" + # "exec" + # "x-systemd.automount" + # "noauto" + # ]; + # }; + # }; } diff --git a/system/services.nix b/system/services.nix index d241c5f..85009ba 100644 --- a/system/services.nix +++ b/system/services.nix @@ -39,6 +39,8 @@ defaultSession = "hyprland-uwsm"; }; gnome.gnome-keyring.enable = true; + + hardware.bolt.enable = true; }; security.pam.services.sddm.enableGnomeKeyring = true; }