diff --git a/provision/local/gpu-passthrough/XFX.RX6700XT.12288.210201_1.rom b/provision/local/gpu-passthrough/XFX.RX6700XT.12288.210201_1.rom deleted file mode 100644 index 8d4cb14c..00000000 Binary files a/provision/local/gpu-passthrough/XFX.RX6700XT.12288.210201_1.rom and /dev/null differ diff --git a/provision/local/gpu-passthrough/patch.rom b/provision/local/gpu-passthrough/patch.rom new file mode 100644 index 00000000..2f88172c Binary files /dev/null and b/provision/local/gpu-passthrough/patch.rom differ diff --git a/provision/local/gpu-passthrough/revert.sh b/provision/local/gpu-passthrough/revert.sh index 1de25ec9..47060e51 100755 --- a/provision/local/gpu-passthrough/revert.sh +++ b/provision/local/gpu-passthrough/revert.sh @@ -29,4 +29,4 @@ modprobe radeon modprobe drm_kms_helper # Kill sway -killall sway +systemctl start display-manager.service diff --git a/provision/nixos/flake.lock b/provision/nixos/flake.lock index 1aa2ea43..d2ef51e7 100644 --- a/provision/nixos/flake.lock +++ b/provision/nixos/flake.lock @@ -37,10 +37,27 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1691186842, + "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/provision/nixos/flake.nix b/provision/nixos/flake.nix index a15e1942..bef55238 100644 --- a/provision/nixos/flake.nix +++ b/provision/nixos/flake.nix @@ -3,26 +3,31 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = github:nix-community/home-manager/release-23.05; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = inputs @ { self, nixpkgs, home-manager, ... }: + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, home-manager, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; lib = nixpkgs.lib; user = "tstarr"; in { nixosConfigurations = { kestrel = lib.nixosSystem { inherit system; - specialArgs = { inherit user; }; + specialArgs = { inherit user; inherit pkgs-unstable; }; modules = [ ./hosts/kestrel/configuration.nix ./hosts/kestrel/hardware.nix diff --git a/provision/nixos/hosts/kestrel/configuration.nix b/provision/nixos/hosts/kestrel/configuration.nix index d164ef7c..a7050e92 100644 --- a/provision/nixos/hosts/kestrel/configuration.nix +++ b/provision/nixos/hosts/kestrel/configuration.nix @@ -92,23 +92,46 @@ dataDir = "/home/${user}/sync"; configDir = "/home/${user}/.config/syncthing"; }; + # xserver = { + # enable = true; + # displayManager = { + # #defaultSession = "none+bspwm"; + # lightdm.greeters.mini = { + # enable = true; + # #user = "tstarr"; + # #extraConfig = '' + # # [greeter] + # # show-password-label = false + # # invalid-password-text = Access Denied + # # show-input-cursor = true + # # password-alignment = left + # # [greeter-theme] + # # font-size = 1em + # # background-image = "" + # #''; + # }; + # }; + # }; + #}; + xserver.enable = true; + xserver.displayManager.sddm.enable = true; }; - # Enable the OpenSSH daemon. - services.openssh.enable = true; - services.pcscd.enable = true; - programs.gnupg.agent = { - enable = true; - pinentryFlavor = "curses"; - enableSSHSupport = true; - }; + # Enable the OpenSSH daemon. + services.openssh.enable = true; + services.pcscd.enable = true; + programs.gnupg.agent = { + enable = true; + pinentryFlavor = "curses"; + enableSSHSupport = true; + }; # Enable modules imports = [ ../../modules ]; modules = { services = { samba-client.enable = true; - vfio.enable = true; + vfio.enable = false; }; devel = { tooling.enable = true; diff --git a/provision/nixos/modules/gaming/steam.nix b/provision/nixos/modules/gaming/steam.nix index 419fab13..cbb3bd6d 100644 --- a/provision/nixos/modules/gaming/steam.nix +++ b/provision/nixos/modules/gaming/steam.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, user, ... }: +{ config, lib, pkgs, pkgs-unstable, user, ... }: let cfg = config.modules.gaming.steam; in { @@ -16,7 +16,7 @@ in { environment.systemPackages = [ pkgs.steam - pkgs.yuzu-early-access + pkgs-unstable.yuzu-early-access ]; }; diff --git a/provision/nixos/modules/services/vfio.nix b/provision/nixos/modules/services/vfio.nix index a0a0eae9..be975267 100644 --- a/provision/nixos/modules/services/vfio.nix +++ b/provision/nixos/modules/services/vfio.nix @@ -10,7 +10,7 @@ in { users.users.${user}.extraGroups = [ "qemu-libvirtd" "libvirtd" "kvm" ]; # Boot configuration - boot.kernelParams = [ "amd_iommu=on" "iommu=pt" ]; + boot.kernelParams = [ "amd_iommu=on" "iommu=pt" "iommu=1" "video=efifb:off" "disable_idle_d3=1" ]; boot.kernelModules = [ "kvm-amd" "vfio-pci" ]; programs.dconf.enable = true; @@ -48,8 +48,8 @@ in { source = "/home/${user}/.local/share/chezmoi/provision/local/gpu-passthrough/libvirtd.conf"; mode = "0755"; }; - "libvirt/XFX.RX6700XT.12288.210201_1.rom" = { - source = "/home/${user}/.local/share/chezmoi/provision/local/gpu-passthrough/XFX.RX6700XT.12288.210201_1.rom"; + "libvirt/patch.rom" = { + source = "/home/${user}/.local/share/chezmoi/provision/local/gpu-passthrough/patch.rom"; mode = "0755"; }; }; diff --git a/provision/nixos/pkgs/advcpmv.nix b/provision/nixos/pkgs/advcpmv.nix index d1831852..da0de469 100644 --- a/provision/nixos/pkgs/advcpmv.nix +++ b/provision/nixos/pkgs/advcpmv.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -D "src/cp" "$out/bin/advcp" - install -D "src/mv" "$out/bin/advmv" + install -D "src/cp" "$out/bin/cpg" + install -D "src/mv" "$out/bin/mvg" ''; }