diff --git a/nixos/.config/nixos/profiles/wm/hyprland-virtualbox.nix b/nixos/.config/nixos/profiles/wm/hyprland-virtualbox.nix new file mode 100644 index 0000000..9fd8b44 --- /dev/null +++ b/nixos/.config/nixos/profiles/wm/hyprland-virtualbox.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: + +let + nixos-unstable = (import {}); +in { + # Since I choose to run Hyprland nightly, the dependencies in the flake + # track nixos-unstable. This causes the installed, stable mesa drivers + # to be out of sync with the expected drivers when launching Hyprland from + # inside VirtualBox, causing a crash. This upgrades the VMs drivers, + # fixing the mis-match. I am not sure why I do not have the same problem + # on bare metal ¯\_(ツ)_/¯. + system.replaceRuntimeDependencies = [ + ({ original = pkgs.mesa; + replacement = nixos-unstable.mesa; }) + ({ original = pkgs.mesa.drivers; + replacement = nixos-unstable.mesa.drivers; }) + ]; +} + diff --git a/nixos/.config/nixos/profiles/wm/hyprland.nix b/nixos/.config/nixos/profiles/wm/hyprland.nix index d9b80d4..4915bdc 100644 --- a/nixos/.config/nixos/profiles/wm/hyprland.nix +++ b/nixos/.config/nixos/profiles/wm/hyprland.nix @@ -29,15 +29,9 @@ in { hyprland = { # Dynamic tiling window manager enable = true; xwayland.enable = true; - package = (hyprland.packages.${pkgs.system}.default).override (o: { - wlroots = o.wlroots.overrideAttrs (oa: { - patches = oa.patches ++ [ - /home/vince/misc/DisplayLink_v2.patch - ]; - }); - }); + # package = ((hyprland.packages.${pkgs.system}.default).override (o: { + # }); }; - # waybar.enable = true; # Status bar }; systemd.user.services = { @@ -57,21 +51,12 @@ in { serviceConfig.RestartSec = 1; serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet"; }; - # waybar = { - # description = "Waybar as systemd service"; - # wantedBy = [ "graphical-session.target" ]; - # partOf = [ "graphical-session.target" ]; - # script = "${pkgs.waybar}/bin/waybar"; - # serviceConfig.Restart = "always"; - # serviceConfig.RestartSec = 1; - # }; }; environment.systemPackages = with pkgs; [ ags # GTK shell for status bar and widgets blueman # Bluetooth manager # dunst # Notification daemon - eww-wayland firefox # My browser of choice foot # Wayland native terminal fuzzel # Fuzzy finding menuing program @@ -86,6 +71,7 @@ in { libnotify # Send messages to notification daemon libreoffice # MSOffice btfo networkmanagerapplet # Wifi dropdown menu + nsxiv # Image viewer nwg-displays pinentry-rofi # Rofi frontend for pinentry program pyprland # Plugin manager for Hyprland @@ -103,6 +89,7 @@ in { wl-clipboard # Copy/paste utility wlr-randr # Xrandr substitute xwaylandvideobridge # Allows screensharing from XWayland programs + zathura # Minimalist PDF reader # GTK Themes lxappearance-gtk2 # Theme switcher