diff --git a/flake.lock b/flake.lock index babc069..9e2f757 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1722082646, - "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=", + "lastModified": 1722609272, + "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6", + "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722114937, - "narHash": "sha256-MOZ9woPwdpFJcHx3wic2Mlw9aztdKjMnFT3FaeLzJkM=", + "lastModified": 1722332872, + "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e67b60fb1b2c3aad2202d95b91d4c218cf2a4fdd", + "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1722372011, + "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "cf05eeada35e122770c5c14add958790fcfcbef5", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "unstable": { "locked": { - "lastModified": 1722256103, - "narHash": "sha256-M8/qIGTrAw7M9syoid9fvziEvgaXvuXP1lx71Jy+wMA=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c4913a0ed9c3799ff87d06f90baf1498eec966dd", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1722203588, - "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=", + "lastModified": 1722630065, + "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "792757f643cedc13f02098d8ed506d82e19ec1da", + "rev": "afc892db74d65042031a093adb6010c4c3378422", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index df161c3..90cc37c 100644 --- a/flake.nix +++ b/flake.nix @@ -116,7 +116,6 @@ }; }) ([ - "hl-bigbox1" "hl-minipc1" "hl-minipc2" "hl-terra1" @@ -130,7 +129,9 @@ systemStateVersion = "24.05"; }; }) - ([ ]); + ([ + "hl-bigbox1" + ]); in { lib = lib; diff --git a/hosts/hl-bigbox1.hardware-configuration.nix b/hosts/hl-bigbox1.hardware-configuration.nix index f887b97..46b23ba 100644 --- a/hosts/hl-bigbox1.hardware-configuration.nix +++ b/hosts/hl-bigbox1.hardware-configuration.nix @@ -4,26 +4,35 @@ { 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" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/f2732ab2-ea52-4f61-b55a-6617d496bf39"; - fsType = "ext4"; - }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/9222-7B1D"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/6302dadf-57b7-4213-a7a5-2ba97f941e49"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BBF9-1744"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; swapDevices = [ ]; + + # 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.enp4s0.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 869ffc6..9ad5134 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -4,13 +4,14 @@ # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; - systemd.enableUnifiedCgroupHierarchy = false; + hardware.nvidia-container-toolkit.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; boot.kernelPackages = pkgs.linuxPackages_latest; - # Containers + #systemd.enableUnifiedCgroupHierarchy = false; + # Containers virtualisation.oci-containers = { backend = "docker"; containers = { @@ -48,16 +49,16 @@ # Nvidia Settings services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.enable = true; - # hardware.graphics.enable32Bit = true; - # hardware.graphics.enable = true; - hardware.opengl.enable = true; + hardware.graphics.enable32Bit = true; + hardware.graphics.enable = true; + #hardware.opengl.enable = true; hardware.nvidia = { modesetting.enable = true; powerManagement.enable = false; powerManagement.finegrained = false; open = false; - nvidiaSettings = false; - # package = config.boot.kernelPackages.nvidiaPackages.production; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; }; # Steam Settings programs.steam = {