diff --git a/.envrc b/.envrc index 4d82c901a..3d4ddbc9c 100644 --- a/.envrc +++ b/.envrc @@ -1,5 +1,5 @@ -if ! has nix_direnv_version || ! nix_direnv_version 2.5.1; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.5.1/direnvrc" "sha256-puRzug17Ed4JFS2wbpqa3k764QV6xPP6O3A/ez/JpOM=" +if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=" fi use flake diff --git a/nixosModules/clanCore/wayland-proxy-virtwl.nix b/nixosModules/clanCore/wayland-proxy-virtwl.nix index ca79ed279..d44d4753a 100644 --- a/nixosModules/clanCore/wayland-proxy-virtwl.nix +++ b/nixosModules/clanCore/wayland-proxy-virtwl.nix @@ -13,7 +13,7 @@ environment.sessionVariables = { WAYLAND_DISPLAY = "wayland-1"; - DISPLAY = ":0"; + DISPLAY = ":1"; QT_QPA_PLATFORM = "wayland"; # Qt Applications GDK_BACKEND = "wayland"; # GTK Applications XDG_SESSION_TYPE = "wayland"; # Electron Applications @@ -34,7 +34,7 @@ wantedBy = [ "graphical-session.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "${config.services.wayland-proxy-virtwl.package}/bin/wayland-proxy-virtwl --virtio-gpu --x-display=0 --xwayland-binary=${pkgs.xwayland}/bin/Xwayland"; + ExecStart = "${config.services.wayland-proxy-virtwl.package}/bin/wayland-proxy-virtwl --virtio-gpu --x-display=1 --xwayland-binary=${pkgs.xwayland}/bin/Xwayland"; Restart = "always"; RestartSec = 5; }; diff --git a/pkgs/clan-vm-manager/.envrc b/pkgs/clan-vm-manager/.envrc index 27620706b..76d5ff725 100644 --- a/pkgs/clan-vm-manager/.envrc +++ b/pkgs/clan-vm-manager/.envrc @@ -1,6 +1,6 @@ source_up -nix_direnv_watch_file flake-module.nix default.nix +watch_file flake-module.nix default.nix # Because we depend on nixpkgs sources, uploading to builders takes a long time use flake .#clan-vm-manager --builders ''