From f420416a405dc0d5f2e6777efbfee4bcc8417bce Mon Sep 17 00:00:00 2001 From: Reboot-Codes Date: Mon, 7 Sep 2026 22:29:42 -0700 Subject: [PATCH] fix: yayyy RX 9070 XT! --- .direnv/flake-profile | 2 +- common/home/packages/alien.nix | 2 +- common/home/packages/avi.nix | 4 +- common/home/packages/games.nix | 1 + common/home/packages/office.nix | 2 +- common/utils/nix-config.nix | 3 +- flake.lock | 102 +++++++++--------- nixos/custom-odin-nixos/configuration.nix | 72 +++++++------ .../hardware-configuration.nix | 2 +- .../latitude7390-loki-nixos/configuration.nix | 2 +- .../configuration.nix | 3 +- nixos/temp-installer-nixos/configuration.nix | 2 +- 12 files changed, 100 insertions(+), 97 deletions(-) diff --git a/.direnv/flake-profile b/.direnv/flake-profile index 1448496..6439622 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-26-link \ No newline at end of file +flake-profile-33-link \ No newline at end of file diff --git a/common/home/packages/alien.nix b/common/home/packages/alien.nix index 62a776d..fa070ab 100644 --- a/common/home/packages/alien.nix +++ b/common/home/packages/alien.nix @@ -5,7 +5,6 @@ looking-glass-client distrobox boxbuddy - gearlever simh kdePackages.kdialog wineWow64Packages.waylandFull @@ -19,6 +18,7 @@ qtemu # (bottles.override { removeWarningPopup = true; }) bottles + gearlever ]; in { packages = unstable ++ stable; diff --git a/common/home/packages/avi.nix b/common/home/packages/avi.nix index cbaac80..abeac8a 100644 --- a/common/home/packages/avi.nix +++ b/common/home/packages/avi.nix @@ -63,7 +63,7 @@ let obs-3d-effect looking-glass-obs obs-vkcapture - obs-shaderfilter + # obs-shaderfilter obs-source-record # obs-replay-source obs-freeze-filter @@ -71,7 +71,7 @@ let obs-composite-blur obs-command-source # obs-vertical-canvas - obs-move-transition + # obs-move-transition obs-transition-table obs-3d-effect # obs-tuna diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix index deaf1d8..a319837 100644 --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -46,6 +46,7 @@ let rrootage rpcs3 pcsx2 + nestopia-ue (lutris.override { extraLibraries = pkgs: [ diff --git a/common/home/packages/office.nix b/common/home/packages/office.nix index 5bd142b..0c943c0 100644 --- a/common/home/packages/office.nix +++ b/common/home/packages/office.nix @@ -23,7 +23,6 @@ let gnome-decoder junction sigil - openboard kdePackages.marble # kdePackages.itinerary scribus @@ -52,6 +51,7 @@ let kiwix-tools zim zim-tools + # openboard translatelocally translatelocally-models.uk-en-tiny translatelocally-models.tr-en-tiny diff --git a/common/utils/nix-config.nix b/common/utils/nix-config.nix index bd4aa73..c999d84 100644 --- a/common/utils/nix-config.nix +++ b/common/utils/nix-config.nix @@ -4,11 +4,12 @@ nvidia.acceptLicense = true; permittedInsecurePackages = [ + "ladybird-0-unstable-2026-06-05" "electron-39.8.10" "olm-3.2.16" "dotnet-sdk-7.0.120" "SDL_ttf-2.0.11" - "ventoy-1.1.12" + "ventoy-1.1.17" "gradle-7.6.6" ]; diff --git a/flake.lock b/flake.lock index 2c11902..fdaebfe 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1783689476, - "narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=", + "lastModified": 1787517695, + "narHash": "sha256-Z119G3qLJx22frNHO3/seMs7fCCvxe9NJJRfN4Jadew=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "af94408291ad477cae8eed964981ab41f90eb184", + "rev": "4bb57072d963aa47f14894383a5560cf290e296a", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1785658983, - "narHash": "sha256-z+L5OCPOisb/CdSR9hPhf8rcwQsRd+h8zc2vas9gsMg=", + "lastModified": 1787548813, + "narHash": "sha256-gJ4iHdxyghxoo30WuAo4aoiLKOk9XgnNfYBgvYrt25s=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "01550f84c0af977a55bb4b14623de93a4be8fe0f", + "rev": "14dcc33c77701e0f03dd25919e17f55bac55684d", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1785531816, - "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", + "lastModified": 1787379775, + "narHash": "sha256-XL2qfqmocfsvuEGyomZg4nOZfkuSe8vZtrOX99I+b6I=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", + "rev": "ec1a8fdf74ed3f276148ee106299a2ba0e65d51f", "type": "github" }, "original": { @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1785531816, - "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", + "lastModified": 1787540599, + "narHash": "sha256-MHwk52ty3NsLhq9a1IbIfBJZlCUJIdiUYFo52JLK9hY=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", + "rev": "03f4cd46bc1dd4f3a96da778d2ce9f7ce39dd450", "type": "github" }, "original": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1785650611, - "narHash": "sha256-q4kR7g+pCcz6NASvoVPYu+CWWUurX03wogtBqGmR4h0=", + "lastModified": 1787457452, + "narHash": "sha256-FJh4esFS3zqNNuKwvN3t6wrJGewqp1AUF9DAEvoKPD8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "dbc756c9d7287de19b3e0e38c928c47510d42c3e", + "rev": "c51d5c2ba69c907a34e90c9b6b80cd2b93811745", "type": "github" }, "original": { @@ -304,11 +304,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785454630, - "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", + "lastModified": 1787360063, + "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1785491804, - "narHash": "sha256-p00vplVOyfKGlhju0+eGGPAxyYYKaY0lpyuoHLFIx2Y=", + "lastModified": 1787414105, + "narHash": "sha256-WncT27+3BOkgTaJZLnCsf3LcYf9RXMuR9ONSN4rzQ7s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b4f72e1705a63aace42900610c4db82cb4af0ec", + "rev": "a9e6d84f9c2f9012f5fe7d964a7851352300e61a", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1785639327, - "narHash": "sha256-ab+81Lz4qfvdvtnFctv5zkfy65Lw+b2RAIeExlm8dEY=", + "lastModified": 1787448300, + "narHash": "sha256-4Bt9Dj88UthAcHKOvXt3N7HZO3ojqW2Wf7aizJ9cbCE=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "3bbb507f7691e21f1232ae3cfed243e7b123c728", + "rev": "cbcacf4b2eff7f772bbeb1b755a7235887809ea4", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1785571196, - "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", + "lastModified": 1787498568, + "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "type": "github" }, "original": { @@ -391,11 +391,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1785571196, - "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", + "lastModified": 1787360063, + "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "type": "github" }, "original": { @@ -407,11 +407,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1785571196, - "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", + "lastModified": 1787498568, + "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "owner": "nixos", "repo": "nixpkgs", - "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1785680825, - "narHash": "sha256-HGsaRI+h685jeL4wR2g8n7ZRiozQp0m49IDFMhpcN7c=", + "lastModified": 1787585366, + "narHash": "sha256-NvoOvZULRkNeSH0SxchYiqV0fHOGe+TuNxHfI3KZLcU=", "owner": "nix-community", "repo": "NUR", - "rev": "a139c18f56e7807ec4c02756099fb8d11c5c8fd2", + "rev": "f9b4c5b2cf1211da65d0c5514b34fee8a713d918", "type": "github" }, "original": { @@ -480,11 +480,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1785598746, - "narHash": "sha256-y6MpkWLrd5/efDcWvQKkp9I0SPEPqCnEfZgD+eYuK+c=", + "lastModified": 1787585249, + "narHash": "sha256-cAVGt3kW9ZiyzqD17fW1MU+PxXxGh5JZWZ86ar68OR0=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "207fbf1f53a21f1978cda56639147f5b52e0e817", + "rev": "d2d392f9436dbdb49fc205295454352af863724c", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1782875958, - "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=", + "lastModified": 1785476452, + "narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca", + "rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1785648791, - "narHash": "sha256-4wZa7NDOxbcm9pTNNcg88nvvPb9uVcWsJ+Ncil8eB1I=", + "lastModified": 1787540965, + "narHash": "sha256-48/4bbmK3W3Av3YPnrFb/tVQXPvBwU6kyM3Pb13VVD8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "32346a8154e65fa10bac36f7b476a5294cb8b150", + "rev": "ab450d47a3f906d19de1b332915bfc6e5b29c853", "type": "github" }, "original": { @@ -610,11 +610,11 @@ ] }, "locked": { - "lastModified": 1783174389, - "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", + "lastModified": 1786629091, + "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", "type": "github" }, "original": { @@ -676,11 +676,11 @@ ] }, "locked": { - "lastModified": 1785360170, - "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix index c567ba0..4860b7e 100755 --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -11,14 +11,14 @@ }: let # TODO: Check if this exists and is the right display. - virtualDisplayId = "HDMI-A-1"; + # virtualDisplayId = "HDMI-A-1"; vfio-pci-ids = [ # RTX 2060 - #"10de:1f08" - #"10de:10f9" - #"10de:1ada" - #"10de:1adb" + "10de:1f08" + "10de:10f9" + "10de:1ada" + "10de:1adb" # Mobo's WI-FI 7 (we don't use this, but VIFO dies if all of the devices aren't sent to the driver) #"17cb:1107" @@ -72,11 +72,11 @@ in # https://wiki.nixos.org/wiki/OSX-KVM extraModprobeConfig = '' - options kvm_amd nested=1 - options kvm_amd emulate_invalid_guest_state=0 - options kvm ignore_msrs=1 - options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 - options kvmfr static_size_mb=64 + options kvm_amd nested=1 + options kvm_amd emulate_invalid_guest_state=0 + options kvm ignore_msrs=1 + options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 + options kvmfr static_size_mb=64 ''; kernelParams = [ @@ -93,13 +93,15 @@ in "vfio_pci" "vfio_virqfd" ]; + + # The only gpu we have right now *is* an Nvidia card... so... blacklistedKernelModules = [ - #"nouveau" - #"nvidia" - #"nvidia_drm" - #"nvidia_uvm" - #"nvidia_modeset" - #"i2c_nvidia_gpu" + "nouveau" + "nvidia" + "nvidia_drm" + "nvidia_uvm" + "nvidia_modeset" + "i2c_nvidia_gpu" ]; binfmt = { @@ -276,9 +278,9 @@ in dl-music = { script = '' - set -eu - ${pkgs.zsh}/bin/zsh -c "/home/reboot/Music/YT/download.sh" - ''; + set -eu + ${pkgs.zsh}/bin/zsh -c "/home/reboot/Music/YT/download.sh" + ''; serviceConfig = { Type = "oneshot"; @@ -288,8 +290,8 @@ in nix-clean = { script = '' - ${pkgs.nix}/bin/nix-store --gc - ''; + ${pkgs.nix}/bin/nix-store --gc + ''; serviceConfig = { Type = "oneshot"; @@ -343,16 +345,16 @@ in #}; verbatimConfig = '' - user = "reboot" - - cgroup_device_acl = [ - "/dev/null", "/dev/full", "/dev/zero", - "/dev/random", "/dev/urandom", - "/dev/ptmx", "/dev/kvm", "/dev/kqemu", - "/dev/rtc","/dev/hpet", "/dev/vfio/vfio", - "/dev/kvmfr0", "/run/user/1000/pipewire-0" - ] - ''; + user = "reboot" + + cgroup_device_acl = [ + "/dev/null", "/dev/full", "/dev/zero", + "/dev/random", "/dev/urandom", + "/dev/ptmx", "/dev/kvm", "/dev/kqemu", + "/dev/rtc","/dev/hpet", "/dev/vfio/vfio", + "/dev/kvmfr0", "/run/user/1000/pipewire-0" + ] + ''; }; }; @@ -480,9 +482,9 @@ in ]; extraRules = '' - SUBSYSTEM=="kvmfr", MODE="0660", GROUP="kvm" - SUBSYSTEM=="usb", MODE="0660", GROUP="wheel" - ACTION=="add", ATTR{idVendor}=="0bda", ATTR{idProduct}=="1a2b", RUN+="${lib.getExe pkgs.usb-modeswitch} -K -v 0bda -p 1a2b" + SUBSYSTEM=="kvmfr", MODE="0660", GROUP="kvm" + SUBSYSTEM=="usb", MODE="0660", GROUP="wheel" + ACTION=="add", ATTR{idVendor}=="0bda", ATTR{idProduct}=="1a2b", RUN+="${lib.getExe pkgs.usb-modeswitch} -K -v 0bda -p 1a2b" ''; }; @@ -703,7 +705,7 @@ in exfat ntfs3g cifs-utils - mtpfs + simple-mtpfs libimobiledevice ifuse diff --git a/nixos/custom-odin-nixos/hardware-configuration.nix b/nixos/custom-odin-nixos/hardware-configuration.nix index cea1522..81a7869 100755 --- a/nixos/custom-odin-nixos/hardware-configuration.nix +++ b/nixos/custom-odin-nixos/hardware-configuration.nix @@ -78,7 +78,7 @@ }; fileSystems."/data/ZimaOS" = { - device = "//192.168.0.201/ZimaOS-HD"; + device = "//192.168.8.190/ZimaOS-HD"; fsType = "cifs"; options = [ diff --git a/nixos/latitude7390-loki-nixos/configuration.nix b/nixos/latitude7390-loki-nixos/configuration.nix index 8ffc20a..cb4a309 100755 --- a/nixos/latitude7390-loki-nixos/configuration.nix +++ b/nixos/latitude7390-loki-nixos/configuration.nix @@ -459,7 +459,7 @@ exfat ntfs3g cifs-utils - mtpfs + simple-mtpfs libimobiledevice ifuse diff --git a/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix b/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix index f6a58d0..a60b4a6 100755 --- a/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix +++ b/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix @@ -48,7 +48,6 @@ kernelParams = [ "psi=1" # Enable PSI to make sure that Binder doesn't die when using Waydroid. # "drm_kms_helper.edid_firmware=${virtualDisplayId}:edid/reboots-virtual-display.bin" # Set the custom EDID file to the virtual display interface. - ("vfio-pci.ids=" + lib.concatStringsSep "," vfio-pci-ids) ]; kernelModules = [ @@ -546,7 +545,7 @@ sshfs exfat ntfs3g - mtpfs + simple-mtpfs libimobiledevice ifuse diff --git a/nixos/temp-installer-nixos/configuration.nix b/nixos/temp-installer-nixos/configuration.nix index 2887eee..1fb200a 100644 --- a/nixos/temp-installer-nixos/configuration.nix +++ b/nixos/temp-installer-nixos/configuration.nix @@ -138,7 +138,7 @@ exfat ntfs3g cifs-utils - mtpfs + simple-mtpfs links2 alacritty qpwgraph -- 2.51.2