From 6525d6b4cd4bdb4fbb3fa544775066e8f5f009fb Mon Sep 17 00:00:00 2001 From: Reboot-Codes Date: Tue, 11 Nov 2025 16:36:45 +0000 Subject: [PATCH] Updated :3 --- flake.lock | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- common/home/home.nix | 8 ++++++-- common/overlays/steam.nix | 2 +- common/utils/nix-config.nix | 1 + common/utils/nix-gl-wrapper.nix | 2 +- nixos/custom-odin-nixos/configuration.nix | 7 +++---- nixos/latitude7390-loki-nixos/configuration.nix | 3 +-- nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix | 5 ++--- common/home/packages/dev.nix | 2 +- common/home/packages/games.nix | 2 +- common/home/packages/hacking.nix | 4 ++-- common/home/packages/internet.nix | 4 ++-- common/home/packages/object-creation.nix | 2 +- common/home/packages/office.nix | 2 +- 14 file(s) changed, 84 insertion(s)(+), 82 deletion(s)(-) diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759319421, - "narHash": "sha256-45yE92tDGtCX/vdyUuD3ckCqyZ3pwP0yrTorjvL80fc=", + "lastModified": 1762188647, + "narHash": "sha256-OAXK4p7WIYUcp8xx9m0RZUpV6XUDEhkoM4efI8dzPiU=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "37bf87881ae7a68bccdd383fef345c748a23d3b7", + "rev": "1172be1377bc65581004f4d5927b58c5c7d96639", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1760703731, - "narHash": "sha256-WkYdoOLngwc1fim05zQcWjhLgPZVRDPNnhRAiYlguQI=", + "lastModified": 1762736304, + "narHash": "sha256-IZh6dOZf22la7rF23WwQ4y7ncrciqKqT0CUJ6abEAIk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "707764fb48d718b1166a8dc69ceeaf344e15c297", + "rev": "45073419e0a46bf106f025858e93b633e255e402", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1760701190, - "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1762661401, + "narHash": "sha256-SVmijc8t23UMwru5f/9X1Ak5bSwvYkm0OQ5SxR7hOB0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "c053d701d64f0727f62e0269c7940da5805bc9bc", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1760662441, - "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "722792af097dff5790f1a66d271a47759f477755", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1760534924, - "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", + "lastModified": 1762452596, + "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "100b4e000032b865563a9754e5bca189bc544764", + "rev": "99919fd35e70c1b18ce948d5329928d751031312", "type": "github" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1760241904, - "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", + "lastModified": 1762660502, + "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", + "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "type": "github" }, "original": { @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1752054764, - "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "lastModified": 1762090880, + "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=", "owner": "nix-community", "repo": "nixGL", - "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5", "type": "github" }, "original": { @@ -353,11 +353,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1761096483, - "narHash": "sha256-fX81wiODItTrnHVVRVA8+/rMQgpmuAJ9bkjRBz4u5Vg=", + "lastModified": 1762738289, + "narHash": "sha256-ObzGFX6uOWc6qlVm8c9aqKeolMxoRfF/sB6pY4P+v3M=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "d45c1513e3fdc3946e20e9b3a330b7fb7e1060d2", + "rev": "1fbe7ad23159dd2ab142f44756dda718a90162a4", "type": "github" }, "original": { @@ -368,11 +368,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760703608, - "narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=", - "owner": "PedroHLC", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -400,11 +400,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -436,11 +436,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1760736323, - "narHash": "sha256-XHjA+rtoHdDLeskn/AEY60zzvopL7tSyMQPr4yR7Q58=", + "lastModified": 1762807780, + "narHash": "sha256-5XywBVl6sLWIY+azJDPWJHefgpkAo1DDvNOba55jqaI=", "owner": "nix-community", "repo": "NUR", - "rev": "1a099d2eedd510f3e35954fb8079a8dafeb089f1", + "rev": "490660a83481b896033a33bbc555fc4facc5eb3c", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1760702854, - "narHash": "sha256-ONQlgolDB9A9RKMQZOChw1/8AoXlqzfJiMhkDFYJuJE=", + "lastModified": 1762789337, + "narHash": "sha256-0dyaM+jpiqDK+2z918STSIn3XdSoZTxD8nHkBwOGTKM=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "4008901e6698488a4c87127742a14369ca978006", + "rev": "b6dbbcb3973ea200ababb49c7fff08e187d7bea8", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1759199574, - "narHash": "sha256-w24RYly3VSVKp98rVfCI1nFYfQ0VoWmShtKPCbXgK6A=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "381776b12d0d125edd7c1930c2041a1471e586c0", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -565,11 +565,11 @@ ] }, "locked": { - "lastModified": 1760495781, - "narHash": "sha256-3OGPAQNJswy6L4VJyX3U9/z7fwgPFvK6zQtB2NHBV0Y=", + "lastModified": 1762655942, + "narHash": "sha256-hOM12KcQNQALrhB9w6KJmV5hPpm3GA763HRe9o7JUiI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11e0852a2aa3a65955db5824262d76933750e299", + "rev": "6ac961b02d4235572692241e333d0470637f5492", "type": "github" }, "original": { @@ -585,11 +585,11 @@ ] }, "locked": { - "lastModified": 1760668505, - "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=", + "lastModified": 1762742448, + "narHash": "sha256-XMxV0h13gg63s0sV6beihCIqdpcJhtbse6DHI743nvo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858", + "rev": "7f3556887e3375dc26ff1601b57c93ee286f2c5e", "type": "github" }, "original": { @@ -636,11 +636,11 @@ ] }, "locked": { - "lastModified": 1760945191, - "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", + "lastModified": 1762410071, + "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", + "rev": "97a30861b13c3731a84e09405414398fbf3e109f", "type": "github" }, "original": { diff --git a/common/home/home.nix b/common/home/home.nix --- a/common/home/home.nix +++ b/common/home/home.nix @@ -18,8 +18,12 @@ }; git = { - userName = "Reboot-Codes"; - userEmail = "git@reboot-codes.com"; + settings = { + user = { + name = "Reboot-Codes"; + email = "git@reboot-codes.com"; + }; + }; signing = { key = "F4DB81CBA107C76D0F7A75B18A0D03A6C3DCBA53"; diff --git a/common/overlays/steam.nix b/common/overlays/steam.nix --- a/common/overlays/steam.nix +++ b/common/overlays/steam.nix @@ -4,7 +4,7 @@ # withPrimus = true; extraPkgs = steam_pkgs: with steam_pkgs; [ bumblebee - glxinfo + mesa-demos ]; }; } diff --git a/common/utils/nix-config.nix b/common/utils/nix-config.nix --- a/common/utils/nix-config.nix +++ b/common/utils/nix-config.nix @@ -10,6 +10,7 @@ "dotnet-sdk-7.0.120" "SDL_ttf-2.0.11" "ventoy-1.1.07" + "gradle-7.6.6" ]; packageOverrides = pkgs: { diff --git a/common/utils/nix-gl-wrapper.nix b/common/utils/nix-gl-wrapper.nix --- a/common/utils/nix-gl-wrapper.nix +++ b/common/utils/nix-gl-wrapper.nix @@ -23,7 +23,7 @@ shopt -s nullglob # Prevent loop from running if no files for file in ${pkg.out}/bin/*; do echo "#!${pkgs.bash}/bin/bash" > "$out/bin/$(basename $file)" - echo "exec -a \"\$0\" ${nixGL.packages."${pkgs.system}".nixGLDefault}/bin/nixGL $file \"\$@\"" >> "$out/bin/$(basename $file)" + echo "exec -a \"\$0\" ${nixGL.packages."${pkgs.stdenv.hostPlatform.system}".nixGLDefault}/bin/nixGL $file \"\$@\"" >> "$out/bin/$(basename $file)" chmod +x "$out/bin/$(basename $file)" done shopt -u nullglob # Revert nullglob back to its normal default state diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -129,7 +129,7 @@ firmware = [ # Add the EDID of our monitors to use for the virtual display. - (pkgs.runCommandNoCC "firmware-custom-edid" { compressFirmware = false; } '' + (pkgs.runCommand "firmware-custom-edid" { compressFirmware = false; } '' mkdir -p $out/lib/firmware/edid/ cp "${../../common/firmware/EDID.bin}" $out/lib/firmware/edid/reboots-virtual-display.bin '') @@ -412,7 +412,6 @@ udev = { packages = with pkgs; [ qmk-udev-rules - android-udev-rules ]; extraRules = '' @@ -605,8 +604,8 @@ refind efibootmgr smartmontools - glxinfo - piper + mesa-demos + piper openrgb-with-all-plugins # Network diff --git a/nixos/latitude7390-loki-nixos/configuration.nix b/nixos/latitude7390-loki-nixos/configuration.nix --- a/nixos/latitude7390-loki-nixos/configuration.nix +++ b/nixos/latitude7390-loki-nixos/configuration.nix @@ -230,7 +230,6 @@ udev.packages = with pkgs; [ qmk-udev-rules - android-udev-rules ]; ratbagd.enable = true; @@ -401,7 +400,7 @@ refind efibootmgr smartmontools - glxinfo + mesa-demos piper openrgb-with-all-plugins 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 --- a/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix +++ b/nixos/minisforum-valkyrie-2-nixos.cloud.reboot-codes.com/configuration.nix @@ -94,7 +94,7 @@ firmware = [ # Add the EDID of our monitors to use for the virtual display. - (pkgs.runCommandNoCC "firmware-custom-edid" { compressFirmware = false; } '' + (pkgs.runCommand "firmware-custom-edid" { compressFirmware = false; } '' mkdir -p $out/lib/firmware/edid/ cp "${../../common/firmware/EDID.bin}" $out/lib/firmware/edid/reboots-virtual-display.bin '') @@ -327,7 +327,6 @@ udev = { packages = with pkgs; [ qmk-udev-rules - android-udev-rules ]; extraRules = '' @@ -501,7 +500,7 @@ refind efibootmgr smartmontools - glxinfo + mesa-demos piper openrgb-with-all-plugins diff --git a/common/home/packages/dev.nix b/common/home/packages/dev.nix --- a/common/home/packages/dev.nix +++ b/common/home/packages/dev.nix @@ -51,7 +51,7 @@ nixd crc qtcreator - kdePackages.full + # kdePackages.full vrc-get alcom ]; diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -56,7 +56,7 @@ ]; xr = let - pkgs-xr = nixpkgs-xr.packages."${pkgs.system}"; + pkgs-xr = nixpkgs-xr.packages."${pkgs.stdenv.hostPlatform.system}"; in with pkgs-xr; [ wayvr-dashboard ]; diff --git a/common/home/packages/hacking.nix b/common/home/packages/hacking.nix --- a/common/home/packages/hacking.nix +++ b/common/home/packages/hacking.nix @@ -7,7 +7,6 @@ radare2 iaito veracrypt - cryptomator gephi xxd hexcurse @@ -63,10 +62,11 @@ enum4linux enum4linux-ng cewler + cryptomator ]; pwndbg-packages = let - pkgs-pwndbg = pwndbg.packages."${pkgs.system}"; + pkgs-pwndbg = pwndbg.packages."${pkgs.stdenv.hostPlatform.system}"; in with pkgs-pwndbg; [ default pwndbg-lldb diff --git a/common/home/packages/internet.nix b/common/home/packages/internet.nix --- a/common/home/packages/internet.nix +++ b/common/home/packages/internet.nix @@ -1,8 +1,8 @@ { pkgs, pkgs-stable, ... }: let unstable = with pkgs; [ firefox-devedition - tor-browser-bundle-bin - brave + tor-browser + brave onioncircuits # lokinet persepolis diff --git a/common/home/packages/object-creation.nix b/common/home/packages/object-creation.nix --- a/common/home/packages/object-creation.nix +++ b/common/home/packages/object-creation.nix @@ -4,7 +4,7 @@ qmk mission-planner solvespace - rpi-imager + # rpi-imager usbimager weylus librecad diff --git a/common/home/packages/office.nix b/common/home/packages/office.nix --- a/common/home/packages/office.nix +++ b/common/home/packages/office.nix @@ -22,7 +22,7 @@ sigil openboard kdePackages.marble - kdePackages.itinerary + # kdePackages.itinerary scribus upscayl collision -- tangled.sh