configurations: updates

flake: update lock
materusPC: fix for reattach performance issue
2024-05-20 15:40:24 +02:00 · 2024-05-20 15:40:00 +02:00 · 2024-05-20 15:39:47 +02:00
7 changed files with 159 additions and 74 deletions
--- a/configurations/host/flamaster/configuration.nix
+++ b/configurations/host/flamaster/configuration.nix
@ -158,9 +158,9 @@
  services.openssh.enable = true;

  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 22 27015 25565 24454 8123 ];
+  networking.firewall.allowedTCPPorts = [ 22 27015 25565 24454 8123 24800 ];
  networking.firewall.allowedTCPPortRanges = [{ from = 16262; to = 16272; }];
-  networking.firewall.allowedUDPPorts = [ 22 16261 16262 8766 8767 25565 24454 8123 ];
+  networking.firewall.allowedUDPPorts = [ 22 16261 16262 8766 8767 25565 24454 8123 24800 ];
  # Or disable the firewall altogether.
  networking.firewall.enable = true;

--- a/configurations/host/flamaster/home/materus/default.nix
+++ b/configurations/host/flamaster/home/materus/default.nix
@ -13,6 +13,65 @@
    
    bash.enable = true;
    zsh.enable = true;
+    editor.code.fhs.enable = true;
+    editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in [
+      llvmpkgs.clang
+      llvmpkgs.llvm
+      llvmpkgs.bintools
+      llvmpkgs.lld
+      llvmpkgs.lldb
+      llvmpkgs.libllvm
+      llvmpkgs.libllvm.dev
+
+      raylib
+      gcc
+      gdb
+      nil
+      nixfmt
+      nixpkgs-fmt
+      cmake
+      gnumake
+      ninja
+      binutils
+      coreutils
+      util-linux
+      openssl
+      openssl.dev
+      pkg-config
+      dotnet-sdk_8
+      mono
+      mold
+      python3
+      lua
+      gtk4.dev
+      gtk4
+      miniaudio
+      SDL2.dev
+      SDL2
+      freeglut.dev
+      freeglut
+      boost.dev
+      boost
+      glew.dev
+      libGL.dev
+      libGLU.dev
+      vulkan-loader.dev
+      xorg.xorgproto
+      xorg.libX11.dev
+      xorg.libXrandr.dev
+      xorg.libXrender.dev
+      rustup
+      freetype.dev
+
+      fpc
+      openjdk21
+      bison
+      flex
+
+      ldc
+      dmd
+      dub
+    ]);

  };
  
--- a/configurations/host/materusPC/hardware/boot.nix
+++ b/configurations/host/materusPC/hardware/boot.nix
@ -13,10 +13,13 @@ let


  ];
+
 in
 {
  #Kernel
-  boot.kernelPackages = pkgs.linuxPackages_zen;
+
+  boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_lqx;
+
  boot.kernelParams = [
    "rcu_nocbs=${materusArg.materusPC.vmCores}"
    "nohz_full=${materusArg.materusPC.vmCores}"
--- a/configurations/host/materusPC/network.nix
+++ b/configurations/host/materusPC/network.nix
@ -11,7 +11,7 @@
  #networking.networkmanager.wifi.backend = "iwd";
  networking.firewall.enable = true;
  networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 8080 9943 9944 ];
-  networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 6000 9943 9944 ];
+  networking.firewall.allowedUDPPorts = [ (lib.strings.toInt materusArg.wireguard.port) 24800 5900 3702 4656 6000 9943 9944 ];
  networking.networkmanager.settings = {
    connectivity = {
      uri = "http://nmcheck.gnome.org/check_network_status.txt";
--- a/configurations/host/materusPC/vm/win10/default.nix
+++ b/configurations/host/materusPC/vm/win10/default.nix
@ -1,5 +1,10 @@
 { config, pkgs, materusArg, ... }:
 let
+  bar0_guest="15";
+  bar2_guest="8";
+  bar0_host="15";
+  bar2_host="8";
+
  VM_UUID = "ad2632db-0da0-4204-98b3-0592a185ebd0";

  startedHook = ''
@ -36,6 +41,8 @@ let
    ''
    +*/
    ''
+      systemctl stop windows-share-mount.service
+
      # Make sure nothing renders on gpu to prevent "sysfs: cannot create duplicate filename" after rebinding to amdgpu
      chmod 0 /dev/dri/renderD128 
      fuser -k /dev/dri/renderD128
@ -43,16 +50,28 @@ let
      # Seems to fix reset bug for 7900 XTX
      echo "0" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/d3cold_allowed"

-      systemctl stop windows-share-mount.service
+      #####################################################################
+      # Weird bug on kernel 6.7+, after changing bar sizes and binding to vfio driver, performance after returning to host will be lower than expected
+      # binding to amdgpu after changing bar sizes and binding after it to vfio will work as expected.
+      # I could skip changing bar sizes since I'm able to use full bar, but keeping it just in case
+      echo ''$VIRSH_GPU_VIDEO > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/driver/unbind"
+      sleep 1s
+      echo "${bar0_host}" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize"
+      echo "${bar2_host}" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize"

+      echo ''$VIRSH_GPU_VIDEO > /sys/bus/pci/drivers/amdgpu/bind
+      
+      sleep 1s
+
+      chmod 0 /dev/dri/renderD128 
+      fuser -k /dev/dri/renderD128
+      #####################################################################
      
      echo ''$VIRSH_GPU_VIDEO > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/driver/unbind"
      echo ''$VIRSH_GPU_AUDIO > "/sys/bus/pci/devices/''${VIRSH_GPU_AUDIO}/driver/unbind"

-      sleep 1s
-
-      echo "15" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize"
-      echo "8" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize"
+      echo "${bar0_guest}" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize"
+      echo "${bar2_guest}" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize"

      sync
      echo "3" > /proc/sys/vm/drop_caches
@ -61,6 +80,7 @@ let
      

      
+
      systemctl set-property --runtime -- user.slice AllowedCPUs=${materusArg.materusPC.hostCores}
      systemctl set-property --runtime -- system.slice AllowedCPUs=${materusArg.materusPC.hostCores}
      systemctl set-property --runtime -- init.scope AllowedCPUs=${materusArg.materusPC.hostCores}
@ -71,6 +91,9 @@ let
      sysctl -w kernel.watchdog=0


+      
+
+
    '';
  stopHook = ''

@ -101,8 +124,8 @@ let
        
    

-    echo "15" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize"
-    echo "8" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize"
+    echo "${bar0_host}" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource0_resize"
+    echo "${bar2_host}" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/resource2_resize"
    echo "1" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/d3cold_allowed"


--- a/configurations/profile/common/nixpkgs.nix
+++ b/configurations/profile/common/nixpkgs.nix
@ -20,7 +20,7 @@ in
  };
  config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [ materusArg.cfg.configInputs.emacs-overlay.overlay ];

-  config.nix.package = lib.mkDefault pkgs.nixUnstable;
+  config.nix.package = lib.mkDefault  (if (!materusCfg.stable) then pkgs.nixVersions.${"latest"} else pkgs.nixVersions.stable);
  config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry {
    nixpkgs-stable = {
      from = { type = "indirect"; id = "nixpkgs-stable"; };
--- a/flake.lock
+++ b/flake.lock
@ -167,11 +167,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1714640845,
-        "narHash": "sha256-uAyf7QAFzgwJKUjS3Ik3PaCAVRj0IBV+IwbF2g8YxSI=",
+        "lastModified": 1716169020,
+        "narHash": "sha256-hkeDsZJS+WkAqWJFzmOaNzK0qoa2afozX5HGD+uuxos=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "b49e31f50e9772f18e582b8e75bbe9d5f08d2b1f",
+        "rev": "aa8ac9a29c08356bd9285f66b18dd49631cc2227",
        "type": "github"
      },
      "original": {
@ -194,11 +194,11 @@
        "nixpkgs-stable": "nixpkgs-stable_3"
      },
      "locked": {
-        "lastModified": 1714640845,
-        "narHash": "sha256-uAyf7QAFzgwJKUjS3Ik3PaCAVRj0IBV+IwbF2g8YxSI=",
+        "lastModified": 1716169020,
+        "narHash": "sha256-hkeDsZJS+WkAqWJFzmOaNzK0qoa2afozX5HGD+uuxos=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "b49e31f50e9772f18e582b8e75bbe9d5f08d2b1f",
+        "rev": "aa8ac9a29c08356bd9285f66b18dd49631cc2227",
        "type": "github"
      },
      "original": {
@ -337,11 +337,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714043624,
-        "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
+        "lastModified": 1715381426,
+        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
+        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
        "type": "github"
      },
      "original": {
@ -359,11 +359,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714515075,
-        "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
+        "lastModified": 1715930644,
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
        "type": "github"
      },
      "original": {
@ -378,10 +378,10 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1714203603,
-        "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=",
-        "path": "/nix/store/cf6w4ljzxk8q9rx6bbvffaj1sqdvd4sz-source",
-        "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e",
+        "lastModified": 1715486357,
+        "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
+        "path": "/nix/store/0b11p5g24mgl5qfg34khvjs3fh91vdx4-source",
+        "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
        "type": "path"
      },
      "original": {
@ -445,11 +445,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1714465198,
-        "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=",
+        "lastModified": 1716173274,
+        "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4",
+        "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
        "type": "github"
      },
      "original": {
@ -461,11 +461,11 @@
    },
    "nixos-hardware_2": {
      "locked": {
-        "lastModified": 1714465198,
-        "narHash": "sha256-ySkEJvS0gPz2UhXm0H3P181T8fUxvDVcoUyGn0Kc5AI=",
+        "lastModified": 1716173274,
+        "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "68d680c1b7c0e67a9b2144d6776583ee83664ef4",
+        "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
        "type": "github"
      },
      "original": {
@ -477,11 +477,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1713714899,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "lastModified": 1715266358,
+        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
        "type": "github"
      },
      "original": {
@ -493,11 +493,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1714531828,
-        "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=",
+        "lastModified": 1716061101,
+        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1",
+        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
        "type": "github"
      },
      "original": {
@ -509,11 +509,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1713638189,
-        "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
+        "lastModified": 1716061101,
+        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "74574c38577914733b4f7a775dd77d24245081dd",
+        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
        "type": "github"
      },
      "original": {
@ -525,11 +525,11 @@
    },
    "nixpkgs-stable_3": {
      "locked": {
-        "lastModified": 1714531828,
-        "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=",
+        "lastModified": 1716061101,
+        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1",
+        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
        "type": "github"
      },
      "original": {
@ -541,11 +541,11 @@
    },
    "nixpkgs-stable_4": {
      "locked": {
-        "lastModified": 1713638189,
-        "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
+        "lastModified": 1716061101,
+        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "74574c38577914733b4f7a775dd77d24245081dd",
+        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
        "type": "github"
      },
      "original": {
@ -557,11 +557,11 @@
    },
    "nixpkgs-stable_5": {
      "locked": {
-        "lastModified": 1714531828,
-        "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=",
+        "lastModified": 1716061101,
+        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1",
+        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
        "type": "github"
      },
      "original": {
@ -573,11 +573,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1715961556,
+        "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
        "type": "github"
      },
      "original": {
@ -602,11 +602,11 @@
    },
    "nur_2": {
      "locked": {
-        "lastModified": 1714665582,
-        "narHash": "sha256-4AvWvlif/vjZeUc5oldA1VlLSwZn5GzJYbrW3yt7YH4=",
+        "lastModified": 1716186917,
+        "narHash": "sha256-5yUJK6MX/J7YHbHwvTN+nxe4mIo1XuaNfkDDuRyfd0k=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "7182bb77cdf51e1d559a9fe04a204fa96e43ff12",
+        "rev": "96e33e0ced8b33d74458c9728ea5cfe0c52740c8",
        "type": "github"
      },
      "original": {
@ -631,11 +631,11 @@
    },
    "nur_4": {
      "locked": {
-        "lastModified": 1714665582,
-        "narHash": "sha256-4AvWvlif/vjZeUc5oldA1VlLSwZn5GzJYbrW3yt7YH4=",
+        "lastModified": 1716186917,
+        "narHash": "sha256-5yUJK6MX/J7YHbHwvTN+nxe4mIo1XuaNfkDDuRyfd0k=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "7182bb77cdf51e1d559a9fe04a204fa96e43ff12",
+        "rev": "96e33e0ced8b33d74458c9728ea5cfe0c52740c8",
        "type": "github"
      },
      "original": {
@ -647,10 +647,10 @@
    },
    "nur_5": {
      "locked": {
-        "lastModified": 1714250691,
-        "narHash": "sha256-OIs8D5aNGgQlBbOXDSVw8hK+c1iyPrpAwIgs9/k+dN4=",
-        "path": "/nix/store/k9v6df4vjhh356zc34va395h9337yxym-source",
-        "rev": "1def883444a9bf8d2863558fda1f15910f43c7ce",
+        "lastModified": 1715668671,
+        "narHash": "sha256-yG1rdxL/ePCHvW8vHi7tpSHfTlCjXmGWI5FWZ+vDScQ=",
+        "path": "/nix/store/7h0rfv5nx3zgh4zgrpi9k9jpv7fhsrw5-source",
+        "rev": "f78fe612baca61fac58a0050f791d8178452ffe4",
        "type": "path"
      },
      "original": {
@ -695,11 +695,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1713892811,
-        "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
+        "lastModified": 1716087663,
+        "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
+        "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5",
        "type": "github"
      },
      "original": {
@ -718,11 +718,11 @@
        "nixpkgs-stable": "nixpkgs-stable_4"
      },
      "locked": {
-        "lastModified": 1713892811,
-        "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
+        "lastModified": 1716087663,
+        "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
+        "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5",
        "type": "github"
      },
      "original": {
Author	SHA1	Message	Date
Mateusz Słodkowicz	b4cafcfe3a	configurations: updates	2024-05-20 15:40:24 +02:00
Mateusz Słodkowicz	a8fc766902	flake: update lock	2024-05-20 15:40:00 +02:00
Mateusz Słodkowicz	c04f1f41fd	materusPC: fix for reattach performance issue	2024-05-20 15:39:47 +02:00