From 44dc207b5b9203e4c6bbe9d33f984a60f1e1ec97 Mon Sep 17 00:00:00 2001 From: materus Date: Fri, 22 Dec 2023 11:53:49 +0100 Subject: [PATCH] config update --- .../host/materusPC/hardware/boot.nix | 4 +- .../host/materusPC/hardware/default.nix | 6 +- .../host/materusPC/hardware/filesystem.nix | 3 - configurations/host/materusPC/tmp.nix | 8 +- configurations/host/materusPC/vm/default.nix | 19 +++ .../host/materusPC/vm/win10/default.nix | 14 +- .../profile/common/packages/default.nix | 2 +- configurations/profile/os/games/steam.nix | 1 + flake.lock | 130 +++++++++--------- flake.nix | 4 +- 10 files changed, 107 insertions(+), 84 deletions(-) diff --git a/configurations/host/materusPC/hardware/boot.nix b/configurations/host/materusPC/hardware/boot.nix index f8a7a9c..5c43ee9 100644 --- a/configurations/host/materusPC/hardware/boot.nix +++ b/configurations/host/materusPC/hardware/boot.nix @@ -17,10 +17,10 @@ in { #Kernel boot.kernelPackages = pkgs.linuxPackages_zen; - boot.kernelParams = [ "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video; + boot.kernelParams = [ "rcu_nocbs=8-15,24-31" "nohz_full=8-15,24-31" "pcie_acs_override=downstream,multifunction" /*"pci-stub.ids=1002:744c"*/ "nox2apic" "nvme_core.default_ps_max_latency_us=0" "nvme_core.io_timeout=255" "nvme_core.max_retries=10" "nvme_core.shutdown_timeout=10" "amd_iommu=on" "iommu=pt" ] ++ video; boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci" "v4l2loopback" ]; boot.extraModprobeConfig = '' - options kvm_amd nested=1 avic=1 npt=1 + options kvm_amd nested=1 avic=1 npt=1 sev=0 options vfio_iommu_type1 allow_unsafe_interrupts=1 ''; boot.kernel.sysctl = { diff --git a/configurations/host/materusPC/hardware/default.nix b/configurations/host/materusPC/hardware/default.nix index 0088f65..aeb981a 100644 --- a/configurations/host/materusPC/hardware/default.nix +++ b/configurations/host/materusPC/hardware/default.nix @@ -7,8 +7,8 @@ ]; hardware.firmware = with pkgs; [ - #materusArg.pkgs.amdgpu-pro-libs.firmware.vcn - materusArg.pkgs.amdgpu-pro-libs.firmware + materusArg.pkgs.amdgpu-pro-libs.firmware.vcn + #materusArg.pkgs.amdgpu-pro-libs.firmware linux-firmware alsa-firmware sof-firmware @@ -26,8 +26,6 @@ #extra hardware.wooting.enable = true; hardware.bluetooth.enable = true; - - #Graphics hardware.opengl.enable = true; hardware.opengl.driSupport32Bit = true; diff --git a/configurations/host/materusPC/hardware/filesystem.nix b/configurations/host/materusPC/hardware/filesystem.nix index 36e874b..34a1349 100644 --- a/configurations/host/materusPC/hardware/filesystem.nix +++ b/configurations/host/materusPC/hardware/filesystem.nix @@ -12,9 +12,6 @@ ]; - - - fileSystems."/etc/nixos" = { device = "/materus/config/nixos-config"; diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index 9567ade..3ede251 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -6,9 +6,9 @@ virtualisation.lxd.enable = true; #virtualisation.lxd.recommendedSysctlSettings = true; - programs.corectrl.enable = true; - programs.corectrl.gpuOverclock.enable = true; - programs.corectrl.gpuOverclock.ppfeaturemask = "0xffffffff"; + #programs.corectrl.enable = true; + #programs.corectrl.gpuOverclock.enable = true; + #programs.corectrl.gpuOverclock.ppfeaturemask = "0xffffffff"; programs.gamemode.enable = true; @@ -289,6 +289,8 @@ monkeysphere gparted + reaper + virt-viewer inkscape diff --git a/configurations/host/materusPC/vm/default.nix b/configurations/host/materusPC/vm/default.nix index 23e83c5..bdc1a56 100644 --- a/configurations/host/materusPC/vm/default.nix +++ b/configurations/host/materusPC/vm/default.nix @@ -4,6 +4,25 @@ ./win10 ]; + systemd.mounts = [ + { where = "/dev/hugepages"; + enable = false; + } + { where = "/dev/hugepages/hugepages-2048kB"; + enable = true; + what = "hugetlbfs"; + type = "hugetlbfs"; + options = "pagesize=2M"; + requiredBy = [ "basic.target" ]; + } + { where = "/dev/hugepages/hugepages-1048576kB"; + enable = true; + what = "hugetlbfs"; + type = "hugetlbfs"; + options = "pagesize=1G"; + requiredBy = [ "basic.target" ]; + } + ]; virtualisation.libvirtd = { enable = true; diff --git a/configurations/host/materusPC/vm/win10/default.nix b/configurations/host/materusPC/vm/win10/default.nix index 492e813..51fcce3 100644 --- a/configurations/host/materusPC/vm/win10/default.nix +++ b/configurations/host/materusPC/vm/win10/default.nix @@ -32,10 +32,15 @@ let echo "10" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize" echo "8" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize" + echo "3" > /proc/sys/vm/drop_caches + echo "1" > /proc/sys/vm/compact_memory + #echo "8192" > /sys/devices/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages - systemctl set-property --runtime -- user.slice AllowedCPUs=12-15,28-31 - systemctl set-property --runtime -- system.slice AllowedCPUs=12-15,28-31 - systemctl set-property --runtime -- init.scope AllowedCPUs=12-15,28-31 + + + systemctl set-property --runtime -- user.slice AllowedCPUs=0-7,16-23 + systemctl set-property --runtime -- system.slice AllowedCPUs=0-7,16-23 + systemctl set-property --runtime -- init.scope AllowedCPUs=0-7,16-23 ''; @@ -66,7 +71,8 @@ let echo ''$VIRSH_GPU_VIDEO > /sys/bus/pci/drivers/amdgpu/bind echo ''$VIRSH_GPU_AUDIO > /sys/bus/pci/drivers/snd_hda_intel/bind - + + #echo "0" > /sys/devices/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages systemctl start mountWin10Share.service diff --git a/configurations/profile/common/packages/default.nix b/configurations/profile/common/packages/default.nix index 2f28fef..41c0543 100644 --- a/configurations/profile/common/packages/default.nix +++ b/configurations/profile/common/packages/default.nix @@ -31,7 +31,7 @@ with materusArg.pkgs.lib; tdesktop mpv ani-cli - (pkgs.obsidian) + #(pkgs.obsidian) spotify thunderbird keepassxc diff --git a/configurations/profile/os/games/steam.nix b/configurations/profile/os/games/steam.nix index c9bea41..d6bf07c 100644 --- a/configurations/profile/os/games/steam.nix +++ b/configurations/profile/os/games/steam.nix @@ -71,6 +71,7 @@ let pkgs.vivaldi pkgs.x264.lib pkgs.steamtinkerlaunch + pkgs.pipewire ] ++ config.materus.profile.packages.list.fonts ++ config.materus.profile.steam.extraPkgs; diff --git a/flake.lock b/flake.lock index ec550da..c1c698c 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700470498, - "narHash": "sha256-NCz/PuDFJ0SO7QZzznK9Os6x7hij0ld/chr5x1RYcUo=", + "lastModified": 1702399955, + "narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a70fd6e93de6f0d0bca3c02f9cc1acbaa914254e", + "rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1700470498, - "narHash": "sha256-NCz/PuDFJ0SO7QZzznK9Os6x7hij0ld/chr5x1RYcUo=", + "lastModified": 1702399955, + "narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a70fd6e93de6f0d0bca3c02f9cc1acbaa914254e", + "rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -145,16 +145,16 @@ ] }, "locked": { - "lastModified": 1700392168, - "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", + "lastModified": 1703113038, + "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=", "owner": "nix-community", "repo": "home-manager", - "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", + "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1700419052, - "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", + "lastModified": 1703178811, + "narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=", "owner": "nix-community", "repo": "home-manager", - "rev": "993fb02d20760067b8ee19c713d94cee07037759", + "rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae", "type": "github" }, "original": { @@ -186,11 +186,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1700419052, - "narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=", + "lastModified": 1703178811, + "narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=", "owner": "nix-community", "repo": "home-manager", - "rev": "993fb02d20760067b8ee19c713d94cee07037759", + "rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1698411224, - "narHash": "sha256-y4Q7fl0YRkl+TDPxQLMDO1wtEDXLYn/kI3H4Ejn60Yo=", + "lastModified": 1703084866, + "narHash": "sha256-tuJS6LFveE9ZU32TtHRnaMzQ/5Jo+XTTJxniHVFDi1E=", "owner": "materusPL", "repo": "Nixerus", - "rev": "b94af8812cac55a1b33fd93cca52ab5a816ab03a", + "rev": "ae5af742820306b2e25134b73f2952d6f62606b7", "type": "github" }, "original": { @@ -238,11 +238,11 @@ "nur": "nur_3" }, "locked": { - "lastModified": 1698411224, - "narHash": "sha256-y4Q7fl0YRkl+TDPxQLMDO1wtEDXLYn/kI3H4Ejn60Yo=", + "lastModified": 1703084866, + "narHash": "sha256-tuJS6LFveE9ZU32TtHRnaMzQ/5Jo+XTTJxniHVFDi1E=", "owner": "materusPL", "repo": "Nixerus", - "rev": "b94af8812cac55a1b33fd93cca52ab5a816ab03a", + "rev": "ae5af742820306b2e25134b73f2952d6f62606b7", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1700392353, - "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1700392353, - "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700403855, - "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", + "lastModified": 1702221085, + "narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", + "rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af", "type": "github" }, "original": { @@ -318,11 +318,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1700403855, - "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", + "lastModified": 1702221085, + "narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", + "rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af", "type": "github" }, "original": { @@ -334,27 +334,27 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1700403855, - "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", + "lastModified": 1703068421, + "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", + "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "nur": { "locked": { - "lastModified": 1696758426, - "narHash": "sha256-8ebGev/aEoy9NUhexXLg1gFtcdgT+pmYXoc1rg4U5TM=", + "lastModified": 1702770334, + "narHash": "sha256-MVILxIF9ZVIk0f9w3yYZpy8auwxgey0MFzdoIFFvQNU=", "owner": "nix-community", "repo": "NUR", - "rev": "2a1a76ccc91abc61c09521931253f9fe9e012a85", + "rev": "1d37444620523278aa163bb9e30104f5d1152061", "type": "github" }, "original": { @@ -380,11 +380,11 @@ }, "nur_2": { "locked": { - "lastModified": 1700480813, - "narHash": "sha256-WICrrmyn9Y7tZrqKBtw9rGjOJdZeSXJO9q+l7BZDa7g=", + "lastModified": 1703238248, + "narHash": "sha256-0vzcX5nHYNcrJYtzIPJeLgdF8q7ScbUOAjIkMioqAfY=", "owner": "nix-community", "repo": "NUR", - "rev": "f8d15f19746eedce261e4f869634f48705de0716", + "rev": "de8195aac09ca062e6cd39c115a39e37688c77a1", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nur_3": { "locked": { - "lastModified": 1696758426, - "narHash": "sha256-8ebGev/aEoy9NUhexXLg1gFtcdgT+pmYXoc1rg4U5TM=", + "lastModified": 1702770334, + "narHash": "sha256-MVILxIF9ZVIk0f9w3yYZpy8auwxgey0MFzdoIFFvQNU=", "owner": "nix-community", "repo": "NUR", - "rev": "2a1a76ccc91abc61c09521931253f9fe9e012a85", + "rev": "1d37444620523278aa163bb9e30104f5d1152061", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nur_4": { "locked": { - "lastModified": 1700480813, - "narHash": "sha256-WICrrmyn9Y7tZrqKBtw9rGjOJdZeSXJO9q+l7BZDa7g=", + "lastModified": 1703238248, + "narHash": "sha256-0vzcX5nHYNcrJYtzIPJeLgdF8q7ScbUOAjIkMioqAfY=", "owner": "nix-community", "repo": "NUR", - "rev": "f8d15f19746eedce261e4f869634f48705de0716", + "rev": "de8195aac09ca062e6cd39c115a39e37688c77a1", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nur_5": { "locked": { - "lastModified": 1700480813, - "narHash": "sha256-WICrrmyn9Y7tZrqKBtw9rGjOJdZeSXJO9q+l7BZDa7g=", + "lastModified": 1703238248, + "narHash": "sha256-0vzcX5nHYNcrJYtzIPJeLgdF8q7ScbUOAjIkMioqAfY=", "owner": "nix-community", "repo": "NUR", - "rev": "f8d15f19746eedce261e4f869634f48705de0716", + "rev": "de8195aac09ca062e6cd39c115a39e37688c77a1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2a9fb82..e68fecb 100644 --- a/flake.nix +++ b/flake.nix @@ -29,14 +29,14 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-23.05"; + ref = "nixos-23.11"; }; hm-stable = { type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-23.05"; + ref = "release-23.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; };