From b0e295743fb8d62fb501df094a610f6e087d2464 Mon Sep 17 00:00:00 2001 From: Reboot-Codes Date: Sun, 3 May 2026 08:31:19 -0700 Subject: [PATCH] Update to avoid Copy.Fail --- .direnv/flake-profile | 2 +- .direnv/flake-profile-6-link | 1 - .direnv/flake-profile-8-link | 1 + common/home/home.nix | 1 + common/home/packages/alien.nix | 3 +- common/home/packages/games.nix | 23 ++-- common/home/packages/hacking.nix | 2 +- common/utils/nix-config.nix | 2 +- flake.lock | 123 ++++++++---------- .../hardware-configuration.nix | 2 +- 10 files changed, 74 insertions(+), 86 deletions(-) delete mode 120000 .direnv/flake-profile-6-link create mode 120000 .direnv/flake-profile-8-link diff --git a/.direnv/flake-profile b/.direnv/flake-profile index 2ea10f8..81fbd58 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-6-link \ No newline at end of file +flake-profile-8-link \ No newline at end of file diff --git a/.direnv/flake-profile-6-link b/.direnv/flake-profile-6-link deleted file mode 120000 index ec5b5f4..0000000 --- a/.direnv/flake-profile-6-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/d4ydzlnr7n2qmkg3kzxdnwkf97nbv4pj-nix-shell-env \ No newline at end of file diff --git a/.direnv/flake-profile-8-link b/.direnv/flake-profile-8-link new file mode 120000 index 0000000..ef12bfe --- /dev/null +++ b/.direnv/flake-profile-8-link @@ -0,0 +1 @@ +/nix/store/mnbd9qfgkwxbqkf3n4j6rraal3zp7j3x-nix-shell-env \ No newline at end of file diff --git a/common/home/home.nix b/common/home/home.nix index 8c6342e..79308b3 100755 --- a/common/home/home.nix +++ b/common/home/home.nix @@ -52,6 +52,7 @@ catppuccin-nvim { plugin = lightline-vim; + type = "viml"; # TODO: Configure lightline. config = '' diff --git a/common/home/packages/alien.nix b/common/home/packages/alien.nix index 57927bf..62a776d 100644 --- a/common/home/packages/alien.nix +++ b/common/home/packages/alien.nix @@ -2,7 +2,6 @@ unstable = with pkgs; [ # Run Alien Software dosbox-x - (bottles.override { removeWarningPopup = true; }) looking-glass-client distrobox boxbuddy @@ -18,6 +17,8 @@ stable = with pkgs-stable; [ qemu_full qtemu + # (bottles.override { removeWarningPopup = true; }) + bottles ]; in { packages = unstable ++ stable; diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix index 60454fb..f849ba7 100644 --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -25,18 +25,6 @@ let ruffle steamtinkerlaunch sidequest - - (lutris.override { - extraLibraries = pkgs: [ - pkgs.libunwind - gdk-pixbuf - ]; - - extraPkgs = pkgs: [ - wineWow64Packages.waylandFull - ]; - }) - mangohud cockatrice kdePackages.knetwalk @@ -58,6 +46,17 @@ let openttd duckstation rrootage + + (lutris.override { + extraLibraries = pkgs: [ + pkgs.libunwind + gdk-pixbuf + ]; + + extraPkgs = pkgs: [ + wineWow64Packages.waylandFull + ]; + }) ]; xr = diff --git a/common/home/packages/hacking.nix b/common/home/packages/hacking.nix index 3116b67..5031e25 100644 --- a/common/home/packages/hacking.nix +++ b/common/home/packages/hacking.nix @@ -38,11 +38,11 @@ arp-scan (rizin.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ])) - (pkgs.lib.hiPrio (cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))) ]; stable = with pkgs-stable; [ (lib.hiPrio autopsy) + (pkgs.lib.hiPrio (cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))) hexcurse smbmap kerbrute diff --git a/common/utils/nix-config.nix b/common/utils/nix-config.nix index 1ce76c9..6fdf8ce 100644 --- a/common/utils/nix-config.nix +++ b/common/utils/nix-config.nix @@ -9,7 +9,7 @@ "olm-3.2.16" "dotnet-sdk-7.0.120" "SDL_ttf-2.0.11" - "ventoy-1.1.10" + "ventoy-1.1.12" "gradle-7.6.6" ]; diff --git a/flake.lock b/flake.lock index 9baa72c..d4f2592 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774186997, - "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=", + "lastModified": 1777475243, + "narHash": "sha256-EiCeDGJewyWq2Mtdt5m8qyo/W5PXVUCacLuZJ/diBQ8=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd", + "rev": "12e7b06163456e4c3685ee83b8fdc277fe03bdc8", "type": "github" }, "original": { @@ -27,7 +27,7 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1776613567, + "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", "type": "github" }, "original": { @@ -68,7 +68,7 @@ "distro-grub-themes": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1774698239, @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1775683737, - "narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=", + "lastModified": 1777657255, + "narHash": "sha256-GS6JOZn9PBLHg3pHPwNQSmT7uE9zbXnXRBVI5SW7f4U=", "owner": "nix-community", "repo": "home-manager", - "rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992", + "rev": "edf3f59954f4ea31bfb08d09f5c2a392286ce2f6", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1775365369, - "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", + "lastModified": 1777181277, + "narHash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", + "rev": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa", "type": "github" }, "original": { @@ -351,16 +351,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -385,17 +385,17 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvfetcher": "nvfetcher", "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775615465, - "narHash": "sha256-as/MWP8MXrnfQ0HNHsCZFj9I1SmSm2s5bK4umn7qkfA=", + "lastModified": 1777604494, + "narHash": "sha256-EmGwUSnaB9LhXbtqTxz0RVEduJpgqYkAr9UsHH0VG9A=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "ee18f7bcd5a19f66bead9099839dec0407fda6ff", + "rev": "72f4212df4df50da00736b4ca18960a9c9547c49", "type": "github" }, "original": { @@ -405,22 +405,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", @@ -436,13 +420,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -452,13 +436,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -468,13 +452,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -487,14 +471,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1775689752, - "narHash": "sha256-NXgAYzaBjmSviGC/1GDpOuTYlb3d4tKmKbXKOhJDj9Y=", + "lastModified": 1777654504, + "narHash": "sha256-Fmj/etIDU0x6BPATTceLX8y9BQ0vRFkTohEpkQaoHsk=", "owner": "nix-community", "repo": "NUR", - "rev": "ae5816b2855c3c3354e62278950962a24a73228f", + "rev": "5c632bf603720f8600bae3a9e4fdd0920ace9cb3", "type": "github" }, "original": { @@ -543,11 +527,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1775353404, - "narHash": "sha256-9Plcxx+EjvOo+rS2hySI7J2Gue3VXyZn5M+c2oIhaRU=", + "lastModified": 1777657284, + "narHash": "sha256-+B1e/PLGu9HQkOKXy2jr1vg/8GjKQoWLKLlLdz+e6BQ=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "80b8096eee1aacbb7ae5bb8edf0c348df0558cf5", + "rev": "3ec656ca281da9f22cfdaac6588e56db653cd8d7", "type": "github" }, "original": { @@ -616,7 +600,7 @@ "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nixGL": "nixGL", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-xr": "nixpkgs-xr", "nur": "nur", @@ -627,7 +611,10 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "aagl", + "nixpkgs" + ] }, "locked": { "lastModified": 1770952264, @@ -671,11 +658,11 @@ ] }, "locked": { - "lastModified": 1775617983, - "narHash": "sha256-2NWGA/I4j/qlx6qbg86QvJiK1/GyH9gnf0hFiARWVwE=", + "lastModified": 1777605393, + "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54", + "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c", "type": "github" }, "original": { @@ -691,11 +678,11 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1777338324, + "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", "type": "github" }, "original": { @@ -757,11 +744,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { diff --git a/nixos/custom-odin-nixos/hardware-configuration.nix b/nixos/custom-odin-nixos/hardware-configuration.nix index f9438a1..cea1522 100755 --- a/nixos/custom-odin-nixos/hardware-configuration.nix +++ b/nixos/custom-odin-nixos/hardware-configuration.nix @@ -31,7 +31,7 @@ allowDiscards = true; keyFileSize = 4096; keyFile = "/dev/disk/by-partuuid/6c3b0218-edb2-4740-9c15-482667f229d8"; - fallbackToPassword = true; + keyFileTimeout = 5; }; fileSystems."/" = { -- 2.51.2