diff --git a/common/home/packages/alien.nix b/common/home/packages/alien.nix index fb867c4..8f6e40f 100644 --- a/common/home/packages/alien.nix +++ b/common/home/packages/alien.nix @@ -12,6 +12,8 @@ wineWowPackages.waylandFull winetricks protontricks + qemu_full + qtemu ]; in { packages = unstable; diff --git a/common/home/packages/avi.nix b/common/home/packages/avi.nix index 1e45f17..17d8a9d 100644 --- a/common/home/packages/avi.nix +++ b/common/home/packages/avi.nix @@ -8,6 +8,7 @@ krita libresprite vlc + openutau (pkgs.wrapOBS { plugins = with pkgs.obs-studio-plugins; [ diff --git a/common/home/packages/games.nix b/common/home/packages/games.nix index 2bfc6ef..dd27b89 100644 --- a/common/home/packages/games.nix +++ b/common/home/packages/games.nix @@ -17,6 +17,7 @@ r2modman gale ruffle + steamtinkerlaunch (lutris.override { extraLibraries = pkgs: [ diff --git a/common/overlays/default.nix b/common/overlays/default.nix index 6f07fb9..176d872 100644 --- a/common/overlays/default.nix +++ b/common/overlays/default.nix @@ -3,9 +3,11 @@ 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/kdenlive.nix b/common/overlays/kdenlive.nix new file mode 100644 index 0000000..37ada1f --- /dev/null +++ b/common/overlays/kdenlive.nix @@ -0,0 +1,14 @@ +final: prev: { + kdePackages = prev.kdePackages.overrideScope (kdeFinal: kdePrev: { + kdenlive = kdePrev.kdenlive.overrideAttrs (kdenPrev: { + buildInputs = kdenPrev.buildInputs ++ + [ prev.python3 + prev.python3Packages.pip + prev.python3Packages.numpy + prev.python3Packages.torch + prev.python3Packages.srt + prev.python3Packages.openai-whisper + ]; + }); + }); +} diff --git a/nixos/custom-odin-nixos/configuration.nix b/nixos/custom-odin-nixos/configuration.nix index bf75ade..963c713 100755 --- a/nixos/custom-odin-nixos/configuration.nix +++ b/nixos/custom-odin-nixos/configuration.nix @@ -59,6 +59,13 @@ in { kernelModules = [ "kvm-amd" "kvmfr" "vfio" "vfio_iommu_type1" "vfio_pci" "vfio_virqfd" ]; blacklistedKernelModules = [ "nouveau" "nvidia" "nvidia_drm" "nvidia_uvm" "nvidia_modeset" "i2c_nvidia_gpu" ]; + + binfmt = { + emulatedSystems = [ + "aarch64-linux" + "riscv64-linux" + ]; + }; }; powerManagement.enable = true; @@ -132,23 +139,29 @@ in { corefonts # the msft ones, seems to not load. ]; - systemd.services = { - syncthing = { - description = "Run Syncthing"; - serviceConfig = { - ExecStart = "${pkgs.syncthing}/bin/syncthing"; - User = "reboot"; - }; - }; - - libvirtd.path = with pkgs; [ - bash - coreutils - pciutils # For lspci - kmod # For modprobe - systemd - ]; - }; + systemd = { + tmpfiles.rules = [ + "f /srv/win11/pipewire-0 700 reboot reboot - -" + ]; + + services = { + syncthing = { + description = "Run Syncthing"; + serviceConfig = { + ExecStart = "${pkgs.syncthing}/bin/syncthing"; + User = "reboot"; + }; + }; + + libvirtd.path = with pkgs; [ + bash + coreutils + pciutils # For lspci + kmod # For modprobe + systemd + ]; + }; + }; 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 @@ -181,12 +194,14 @@ 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" + "/dev/kvmfr0", "/run/user/1000/pipewire-0" ] ''; }; @@ -240,6 +255,11 @@ in { gamemode.enable = true; dconf.enable = true; + + java = { + binfmt = true; + enable = true; + }; }; xdg.portal = { @@ -577,6 +597,7 @@ in { podman-compose virtiofsd appvm + qemu_full ]; }; } diff --git a/nixos/custom-odin-nixos/hardware-configuration.nix b/nixos/custom-odin-nixos/hardware-configuration.nix index 3917318..302eb4e 100755 --- a/nixos/custom-odin-nixos/hardware-configuration.nix +++ b/nixos/custom-odin-nixos/hardware-configuration.nix @@ -54,6 +54,12 @@ # options = [ "gid=5,mode=620" ]; #}; + fileSystems."/srv/win11/pipewire-0" = { + device = "/run/user/1000/pipewire-0"; + fsType = "none"; + options = [ "bind,rw,user,noauto" ]; + }; + swapDevices = [ { device = "/swap/swapfile"; } ];