diff --git a/common/home/packages/alien.nix b/common/home/packages/alien.nix index 8f6e40f..1175aad 100644 --- a/common/home/packages/alien.nix +++ b/common/home/packages/alien.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: let +{ pkgs, pkgs-stable, ... }: let unstable = with pkgs; [ # Run Alien Software dosbox-x @@ -12,9 +12,12 @@ wineWowPackages.waylandFull winetricks protontricks + ]; + + stable = with pkgs-stable; [ qemu_full qtemu - ]; + ]; in { - packages = unstable; + packages = unstable ++ stable; } diff --git a/common/home/packages/toys.nix b/common/home/packages/toys.nix index b7fd221..3cf5e89 100644 --- a/common/home/packages/toys.nix +++ b/common/home/packages/toys.nix @@ -14,7 +14,7 @@ ktailctl kdePackages.wallpaper-engine-plugin lightly-qt - input-leap + # input-leap python3Full python3Packages.pip python3Packages.srt diff --git a/common/overlays/default.nix b/common/overlays/default.nix index 176d872..6f07fb9 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -3,11 +3,9 @@ let spotify = import ./spotify.nix; fortune = import ./fortune; steam = import ./steam.nix; - kdenlive = import ./kdenlive.nix; in [ discord spotify fortune # steam - # kdenlive ] diff --git a/common/overlays/waydroid.nix b/common/overlays/waydroid.nix deleted file mode 100644 index 47960ca..0000000 --- a/common/overlays/waydroid.nix +++ /dev/null @@ -1,12 +0,0 @@ -final: prev: { - waydroid = prev.waydroid.overrideAttrs { - version = "1.4.2-update-regex-for-deprecation-warning"; - - src = pkgs.fetchFromGitHub { - owner = prev.waydroid.pname; - repo = prev.waydroid.pname; - rev = "66c8343c4d2ea118601ba5d8ce52fa622cbcd665"; - hash = "sha256-ywlykYPLMx3cI6/7JOL0UDIcymzf0qug5A/c9JaCr+k"; - }; - }; -} \ No newline at end of file diff --git a/common/utils/nix-config.nix b/common/utils/nix-config.nix index ea86302..dd2c860 100644 --- a/common/utils/nix-config.nix +++ b/common/utils/nix-config.nix @@ -9,6 +9,7 @@ "olm-3.2.16" "dotnet-sdk-7.0.120" "SDL_ttf-2.0.11" + "ventoy-1.1.05" ]; packageOverrides = pkgs: { diff --git a/flake.lock b/flake.lock old mode 100755 new mode 100644 index ad208ff..0e49510 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1744132274, - "narHash": "sha256-bWpXUpC9cI8HMl7KvP6HrxAZPuh8XJpgCoCE3PmC9hI=", + "lastModified": 1747088856, + "narHash": "sha256-zWSO9D3dUiLXQ6eY7sjFASLwsiH140AMORrJPm44DPI=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "f33669ec06a9d58d3c04bf82e3fcc8d322ab4459", + "rev": "3448880953fc93666096d1e2878799d07a6c04db", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744070747, - "narHash": "sha256-ds14Cu3aXDwTVtV6IN9q5nVCCz2H6vqQxIQ2KNd5/z0=", + "lastModified": 1747157759, + "narHash": "sha256-8qQqCX80Xumu/x0fbOkzmveNAJXOAelf/K3hOSBpOh0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5d40cdae16b48c400b0d024a79644d0bd52eabcc", + "rev": "ba96c160ca011c9407c554237a2451fe623cf3fc", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1746729224, + "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "85555d27ded84604ad6657ecca255a03fd878607", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1742452566, - "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", + "lastModified": 1747118403, + "narHash": "sha256-6LDKrSTxPmh9c1f79ixqIwg6mlXE2FKwi11x9GNPKhA=", "owner": "nix-community", "repo": "fenix", - "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", + "rev": "01daa5be6a29caab8b6831b0e936750ea66d463d", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1747147271, + "narHash": "sha256-ORthkM8I3GpWDK/pjOSXPuxWjLJV2AwWERKQCsjPPAk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "df556f2a17b7b94148d0275c1a57fed20e62ad18", "type": "github" }, "original": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1744138333, - "narHash": "sha256-l0Vjq1EZoYTfWImVmwsvMEuIdasrBRRCoNTV0rNtYi0=", + "lastModified": 1747155932, + "narHash": "sha256-NnPzzXEqfYjfrimLzK0JOBItfdEJdP/i6SNTuunCGgw=", "owner": "nix-community", "repo": "home-manager", - "rev": "760eed59594f2f258db0d66b7ca4a5138681fd97", + "rev": "8d832ddfda9facf538f3dda9b6985fb0234f151c", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1743879910, - "narHash": "sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo=", + "lastModified": 1747109298, + "narHash": "sha256-v6P2Lm2ucRhFpVdY2feQKxJIGfaud3CVHV5GWoCNji8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96a7fbb4a892696ff89d3d42fc743ab5d6714222", + "rev": "7ceb01d01e02fa55699db1ecb99df1295b47b499", "type": "github" }, "original": { @@ -277,11 +277,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -293,11 +293,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743975612, - "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -309,11 +309,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -325,11 +325,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744155734, - "narHash": "sha256-jCeXozYsIKOjXnOZnPrhGew90HyLnkKx27+EUwbTm98=", + "lastModified": 1747165514, + "narHash": "sha256-G9zopJ2mOC6g1VogPjWfTXCOczf3FMDJHiU3LWq2kr8=", "owner": "nix-community", "repo": "NUR", - "rev": "bb6b512b08b22a8d5e029927cf241e0b6134eb43", + "rev": "c803355757d8ba2b5c900357a931853ffb9de1cb", "type": "github" }, "original": { @@ -369,11 +369,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1744122265, - "narHash": "sha256-hNimr2t9UhEURVs1W0eUbpGEsS9uNtG4FatqQ2ocmFI=", + "lastModified": 1747060518, + "narHash": "sha256-899LlVgDVRSR8+qZnaN1RPo3hAkRoobn0gp/sQ++88w=", "owner": "pwndbg", "repo": "pwndbg", - "rev": "42e5bd60b0c955b314e73bb200f1e37301910488", + "rev": "02335839dda01a90adb397fa1c387495369a7fbe", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1742296961, - "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", + "lastModified": 1746889290, + "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", + "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1744079607, - "narHash": "sha256-5cog6Qd6w/bINdLO5mOysAHOHey8PwFXk4IWo+y+Czg=", + "lastModified": 1747103809, + "narHash": "sha256-a3Yk+CoFmNw7V8J/si/AM8WuI/qTxQhiJpuQ7HFl774=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f6b62cc99c25e79a1c17e9fca91dc6b6faebec6c", + "rev": "fe36c63649875f391949e8b2ec33949d0cd8aa95", "type": "github" }, "original": { diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix index cccad09..de0c416 100755 --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running 'nixos-help'). -{ config, pkgs, lib, ... }: let +{ config, pkgs, pkgs-stable, lib, ... }: let # TODO: Check if this exists and is the right display. virtualDisplayId = "HDMI-A-1"; @@ -62,8 +62,8 @@ in { binfmt = { emulatedSystems = [ - "aarch64-linux" - "riscv64-linux" + # "aarch64-linux" + # "riscv64-linux" ]; }; }; @@ -178,13 +178,16 @@ in { defaultNetwork.settings.dns_enabled = true; }; - # virtualbox.host.enable = true; - # virtualbox.host.enableExtensionPack = true; # Requires previous, will compile all of vbox if enabled! + virtualbox.host.enable = true; + virtualbox.host.enableExtensionPack = true; # Requires previous, will compile all of vbox if enabled! libvirtd = { enable = true; qemu = { + # Fucking.... ceph... also. so sorry y'all at nixpkgs, noob momence go brr. + package = pkgs-stable.qemu; + swtpm.enable = true; ovmf = { @@ -459,7 +462,7 @@ in { environment = { sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; - systemPackages = with pkgs; [ + systemPackages = (with pkgs; [ # Utils cryptsetup vim @@ -599,7 +602,8 @@ in { podman-compose virtiofsd appvm + ]) ++ (with pkgs-stable; [ qemu_full - ]; + ]); }; } diff --git a/nixos/latitude7390-loki-nixos/configuration.nix b/nixos/latitude7390-loki-nixos/configuration.nix index 5bbca6d..5935fe5 100755 --- a/nixos/latitude7390-loki-nixos/configuration.nix +++ b/nixos/latitude7390-loki-nixos/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running 'nixos-help'). -{ pkgs, ... }: { +{ pkgs, pkgs-stable, ... }: { imports = [ ./hardware-configuration.nix # Include the results of the hardware scan. ]; @@ -122,13 +122,14 @@ defaultNetwork.settings.dns_enabled = true; }; - # virtualbox.host.enable = true; - # virtualbox.host.enableExtensionPack = true; # Requires previous, will compile all of vbox if enabled! + virtualbox.host.enable = true; + virtualbox.host.enableExtensionPack = true; # Requires previous, will compile all of vbox if enabled! libvirtd = { enable = true; qemu = { + package = pkgs-stable.qemu; swtpm.enable = true; ovmf.enable = true; }; @@ -334,7 +335,7 @@ environment = { sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; - systemPackages = with pkgs; [ + systemPackages = (with pkgs; [ # Utils cryptsetup vim @@ -474,6 +475,6 @@ podman-compose virtiofsd appvm - ]; + ]); }; }