diff --git a/.direnv/flake-profile b/.direnv/flake-profile index faa1c6f..399b3c4 120000 --- a/.direnv/flake-profile +++ b/.direnv/flake-profile @@ -1 +1 @@ -flake-profile-15-link \ No newline at end of file +flake-profile-17-link \ No newline at end of file diff --git a/.direnv/flake-profile-15-link b/.direnv/flake-profile-15-link deleted file mode 120000 index 8304268..0000000 --- a/.direnv/flake-profile-15-link +++ /dev/null @@ -1 +0,0 @@ -/nix/store/9d1gsmyzkcgmx0dwv978nkgfmzlmdihh-nix-shell-env \ No newline at end of file diff --git a/.direnv/flake-profile-17-link b/.direnv/flake-profile-17-link new file mode 120000 index 0000000..d8940c1 --- /dev/null +++ b/.direnv/flake-profile-17-link @@ -0,0 +1 @@ +/nix/store/1ph7q92hlm2z3lngg0qlv9dsz54siwx6-nix-shell-env \ No newline at end of file diff --git a/common/home/home.nix b/common/home/home.nix index 79308b3..f86e2b9 100755 --- a/common/home/home.nix +++ b/common/home/home.nix @@ -304,7 +304,7 @@ }; }; - # TODO: Translate alt DE configs (hyprland, hyprpapr, dunst, waybar) + # TODO: Translate alt DE configs (hyprland, hyprpapr, dunst, waybar) Move to lua! wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; diff --git a/common/home/packages/avi.nix b/common/home/packages/avi.nix index fdc780c..cbaac80 100644 --- a/common/home/packages/avi.nix +++ b/common/home/packages/avi.nix @@ -8,6 +8,7 @@ let polyphone qsynth krita + pixieditor libresprite vlc openutau diff --git a/common/home/packages/fs-manip.nix b/common/home/packages/fs-manip.nix index f6b2db9..541c5b5 100644 --- a/common/home/packages/fs-manip.nix +++ b/common/home/packages/fs-manip.nix @@ -6,9 +6,8 @@ fuzzel virtiofsd p7zip - fuse-7z-ng bchunk ]; in { packages = unstable; -} \ No newline at end of file +} diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix index f849ba7..13d1704 100644 --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -13,7 +13,6 @@ let steam-run ryubing dolphin-emu - rpcs3 ps3-disc-dumper ps3iso-utils ps3netsrv @@ -46,6 +45,7 @@ let openttd duckstation rrootage + rpcs3 (lutris.override { extraLibraries = pkgs: [ diff --git a/common/home/packages/hacking.nix b/common/home/packages/hacking.nix index 5031e25..8676ee3 100644 --- a/common/home/packages/hacking.nix +++ b/common/home/packages/hacking.nix @@ -9,12 +9,10 @@ veracrypt gephi xxd - sleuthkit exiftool samba4 smbnetfs gdb - binwalk ltrace pe-bear flare-floss @@ -41,7 +39,6 @@ ]; stable = with pkgs-stable; [ - (lib.hiPrio autopsy) (pkgs.lib.hiPrio (cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))) hexcurse smbmap @@ -52,6 +49,7 @@ enum4linux-ng cewler cryptomator + binwalk (ghidra.withExtensions (ext: with ext; [ ret-sync @@ -64,6 +62,8 @@ ghidra-delinker-extension ghidra-golanganalyzerextension ])) + + jadx ]; pwndbg-packages = let diff --git a/common/home/packages/repair.nix b/common/home/packages/repair.nix index d9b836c..947e3b8 100644 --- a/common/home/packages/repair.nix +++ b/common/home/packages/repair.nix @@ -22,7 +22,7 @@ kitty-img kitty-themes v4l-utils - okteta + imhex ]; stable = with pkgs-stable; [ diff --git a/common/nixos/default-config.nix b/common/nixos/default-config.nix index 0768829..162288a 100644 --- a/common/nixos/default-config.nix +++ b/common/nixos/default-config.nix @@ -320,6 +320,9 @@ in "vboxusers" "dialout" ]; + + subUidRanges = [{ startUid = 100000; count = 65536; }]; + subGidRanges = [{ startGid = 100000; count = 65536; }]; }; }; diff --git a/common/utils/nix-config.nix b/common/utils/nix-config.nix index 6fdf8ce..bd4aa73 100644 --- a/common/utils/nix-config.nix +++ b/common/utils/nix-config.nix @@ -4,8 +4,7 @@ nvidia.acceptLicense = true; permittedInsecurePackages = [ - "electron-25.9.0" - "electron-27.3.11" + "electron-39.8.10" "olm-3.2.16" "dotnet-sdk-7.0.120" "SDL_ttf-2.0.11" diff --git a/flake.lock b/flake.lock index d4f2592..a2427f3 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1777475243, - "narHash": "sha256-EiCeDGJewyWq2Mtdt5m8qyo/W5PXVUCacLuZJ/diBQ8=", + "lastModified": 1780372639, + "narHash": "sha256-VFzXYHlIGwO4h4ovtnpZj9sX/Qu6+dlI00sXjHdwi2w=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "12e7b06163456e4c3685ee83b8fdc277fe03bdc8", + "rev": "1ee1e8864a1fcfcc21a5fb5af4bd328b3c829f42", "type": "github" }, "original": { @@ -27,15 +27,16 @@ "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", + "niks3": "niks3", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1765204341, - "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", + "lastModified": 1781282908, + "narHash": "sha256-lwC39eEK8C28HzjZwounJkQfGzZBMxMYqN94PdYTUzQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "aacb796ccd42be1555196c20013b9b674b71df75", + "rev": "434a535097a35f701c215318571f96e5ecd69e9f", "type": "github" }, "original": { @@ -52,11 +53,11 @@ ] }, "locked": { - "lastModified": 1776613567, - "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "owner": "nix-community", "repo": "disko", - "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", "type": "github" }, "original": { @@ -230,11 +231,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1781189114, + "narHash": "sha256-5inaamLgUMWy+MOBE9ChF9QAF1o/74LFuHkI0W/9rqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "486595d2cf49cfcd649b58a284fa11ac0e34da22", "type": "github" }, "original": { @@ -250,11 +251,11 @@ ] }, "locked": { - "lastModified": 1777657255, - "narHash": "sha256-GS6JOZn9PBLHg3pHPwNQSmT7uE9zbXnXRBVI5SW7f4U=", + "lastModified": 1781189114, + "narHash": "sha256-5inaamLgUMWy+MOBE9ChF9QAF1o/74LFuHkI0W/9rqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "edf3f59954f4ea31bfb08d09f5c2a392286ce2f6", + "rev": "486595d2cf49cfcd649b58a284fa11ac0e34da22", "type": "github" }, "original": { @@ -272,11 +273,11 @@ ] }, "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", + "lastModified": 1781180725, + "narHash": "sha256-/r9mc3P39QCtm8goasp2d4Ojogq29a7OQFxyTqsv8Oc=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", + "rev": "e509169aadcdbc5019992cfbec9f83d73c5854ff", "type": "github" }, "original": { @@ -285,6 +286,29 @@ "type": "github" } }, + "niks3": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1781027181, + "narHash": "sha256-IHIUd1/lYTaS4ilHZNV6+x0fchxDpvUdMjwnnEBASu4=", + "owner": "Mic92", + "repo": "niks3", + "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "niks3", + "rev": "c74d275536d9a38ff279b498612fae0fd68cfe85", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -315,11 +339,11 @@ ] }, "locked": { - "lastModified": 1777181277, - "narHash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=", + "lastModified": 1780816331, + "narHash": "sha256-0BYqs8yKWkOz2Q7+SP18N5E5gmDKSo6LSxIVIa0wWes=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa", + "rev": "1a2ea89c917781e88508d9fd2b507f2d2a0e173c", "type": "github" }, "original": { @@ -351,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -388,14 +412,14 @@ "nixpkgs": "nixpkgs_4", "nvfetcher": "nvfetcher", "systems": "systems_3", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1777604494, - "narHash": "sha256-EmGwUSnaB9LhXbtqTxz0RVEduJpgqYkAr9UsHH0VG9A=", + "lastModified": 1781236846, + "narHash": "sha256-abJmZv2lwZci9Qxh3lMzRtf1NALrkvrzBSEh6eEzig8=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "72f4212df4df50da00736b4ca18960a9c9547c49", + "rev": "46dfd68ab7bb16f7eb20b5b64ca299c4fd923012", "type": "github" }, "original": { @@ -422,11 +446,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -438,11 +462,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -454,11 +478,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1781074563, + "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "type": "github" }, "original": { @@ -474,11 +498,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1777654504, - "narHash": "sha256-Fmj/etIDU0x6BPATTceLX8y9BQ0vRFkTohEpkQaoHsk=", + "lastModified": 1781284686, + "narHash": "sha256-J0M+d4iBRtVTWUxkKFrTDcoKUBCYdmOtRCVpsuqJJBE=", "owner": "nix-community", "repo": "NUR", - "rev": "5c632bf603720f8600bae3a9e4fdd0920ace9cb3", + "rev": "e26ae3033c32b13979c738c2f973ddc01bfe831b", "type": "github" }, "original": { @@ -527,11 +551,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1777657284, - "narHash": "sha256-+B1e/PLGu9HQkOKXy2jr1vg/8GjKQoWLKLlLdz+e6BQ=", + "lastModified": 1781284530, + "narHash": "sha256-HHim1IhHn9SB8qsJLwm8SvLbIKuoshkPCmPmAhR2SF8=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "3ec656ca281da9f22cfdaac6588e56db653cd8d7", + "rev": "6328085872c8ae570228d9fb828865cfc732bbd1", "type": "github" }, "original": { @@ -617,11 +641,11 @@ ] }, "locked": { - "lastModified": 1770952264, - "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", + "lastModified": 1780197589, + "narHash": "sha256-FVCr2Ij/jKf59a4LW481eeOF6rJRreOBrVgW/aUBTrw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", + "rev": "21632e942d89bf1cce4e5a63d7e58a215a0cbfcc", "type": "github" }, "original": { @@ -638,11 +662,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1781234414, + "narHash": "sha256-HdA+P4fKRGOomkewnI/Tww5Wz4xK1O7+hDO90YAsPB4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "1d18bfe3de6244c641ca4e8011186d0981b81d76", "type": "github" }, "original": { @@ -658,11 +682,11 @@ ] }, "locked": { - "lastModified": 1777605393, - "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=", + "lastModified": 1781234414, + "narHash": "sha256-HdA+P4fKRGOomkewnI/Tww5Wz4xK1O7+hDO90YAsPB4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c", + "rev": "1d18bfe3de6244c641ca4e8011186d0981b81d76", "type": "github" }, "original": { @@ -678,11 +702,11 @@ ] }, "locked": { - "lastModified": 1777338324, - "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", + "lastModified": 1780547341, + "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", + "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", "type": "github" }, "original": { @@ -737,6 +761,28 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "niks3", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs-xr", @@ -744,11 +790,11 @@ ] }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", "type": "github" }, "original": { diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix index b793952..fd1b1c8 100755 --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -312,16 +312,18 @@ in virtualisation = { # Note, make sure to tell waydroid to use an AMD GPU (discrete or internal) with: https://github.com/Quackdoc/waydroid-scripts/blob/main/waydroid-choose-gpu.sh waydroid.enable = true; - containers.enable = true; podman = { enable = true; dockerCompat = true; dockerSocket.enable = true; - defaultNetwork.settings.dns_enabled = true; }; + containers = { + enable = true; + }; + # virtualbox.host.enable = true; # virtualbox.host.enableExtensionPack = true; # Requires previous, will compile all of vbox if enabled! @@ -404,17 +406,6 @@ in binfmt = true; enable = true; }; - - alvr = { - package = pkgs-stable.alvr; - enable = true; - openFirewall = true; - }; - - envision = { - enable = true; - openFirewall = true; - }; }; xdg.portal = {