diff options
| -rw-r--r-- | config/emacs/init.el | 2 | ||||
| -rwxr-xr-x | dist/vm.sh | 2 | ||||
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | modules/virtualization.nix | 31 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 |
5 files changed, 47 insertions, 20 deletions
diff --git a/config/emacs/init.el b/config/emacs/init.el index cc03b97..b39da3e 100644 --- a/config/emacs/init.el +++ b/config/emacs/init.el @@ -14,6 +14,8 @@ '("\\*Messages\\*" "Output\\*$" "\\*Async Shell Command\\*" + "\\*Async-native-compile-log\\*" + "\\*lsp-log\\*" help-mode compilation-mode)) (popper-mode 1) @@ -1,2 +1,2 @@ #!/usr/bin/env bash -alacritty --title float -o 'window.dimensions = { columns = 80, lines = 40 }' -e bash -c 'virt-manager -c qemu:///system --show-domain-console $(virsh -c qemu:///system list --all --name | fzf) & disown' +alacritty --title float -o 'window.dimensions = { columns = 80, lines = 40 }' -e bash -c 'virt-manager -c qemu:///system --show-domain-console $(virsh -c qemu:///system list --all --name | fzf)' @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1734343412, - "narHash": "sha256-b7G8oFp0Nj01BYUJ6ENC9Qf/HsYAIZvN9k/p0Kg/PFU=", + "lastModified": 1735048446, + "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", "owner": "nix-community", "repo": "disko", - "rev": "a08bfe06b39e94eec98dd089a2c1b18af01fef19", + "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "impermanence": { "locked": { - "lastModified": 1734200366, - "narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=", + "lastModified": 1734945620, + "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=", "owner": "nix-community", "repo": "impermanence", - "rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48", + "rev": "d000479f4f41390ff7cf9204979660ad5dd16176", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734582321, - "narHash": "sha256-7HcM6yaEQfbhjkNKrUj9J9mOe9UtzmTDYMdsX8ojw9E=", + "lastModified": 1735140310, + "narHash": "sha256-NuhGCcev/etYS4qAsh905St1Co0tK8FjgGDovUeCVjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "751b02210f4e9818e7a763330c1e4efd48f62a9a", + "rev": "bb881a68c1174d38ee466a35f5e23d03a938b186", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { diff --git a/modules/virtualization.nix b/modules/virtualization.nix index 28d9fe1..a92ffb9 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -1,5 +1,11 @@ -{ pkgs, config, ... }: +{ pkgs, config, lib, ... }: +let + gpuIDs = [ + "10de:28e0" + "10de:22be" + ]; +in { virtualisation = { libvirtd = { @@ -47,8 +53,27 @@ '') ]; + boot = { + /* initrd.kernelModules = [ + "vfio_pci" + "vfio" + "vfio_iommu_type1" + + "nvidia" + "nvidia_modeset" + "nvidia_uvm" + "nvidia_drm" + ]; */ + + kernelParams = [ + "skippatcheck" + "pci_acs_override=downstream,multifunction" + /* ("vfio-pci.ids=" + lib.concatStringsSep "," gpuIDs) */ + ]; + }; + # Use the custom kernel package set - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; # boot.kernelPatches = [ # { @@ -63,5 +88,5 @@ # } # ]; - boot.kernelParams = [ "skippatcheck" "pcie_acs_override=downstream,multifunction" ]; + # boot.kernelParams = [ "skippatcheck" "pcie_acs_override=downstream,multifunction" ]; } diff --git a/packages/dwl.nix b/packages/dwl.nix index ad469e1..010db6d 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "compromyse"; - hash = "sha256-Lhcc3rW6SFnnjXknhyGbB8xsYldQz5zeWw+1MHZqOhc="; + hash = "sha256-jNlhtbjI//LLhDxxfz7HCN9rAqlACtOZXg7gr519GJA="; }; nativeBuildInputs = [ |