From c4a846066c9b789207ebd8f7488586192cb1b47a Mon Sep 17 00:00:00 2001 From: twoneis Date: Tue, 27 Aug 2024 14:53:37 +0200 Subject: [PATCH] ugly but works? --- modules/apps/programs.nix | 13 ++++++++++++- modules/niri/niri.conf.nix | 4 ---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/apps/programs.nix b/modules/apps/programs.nix index a714377..c860215 100644 --- a/modules/apps/programs.nix +++ b/modules/apps/programs.nix @@ -1,6 +1,12 @@ { lib, config, pkgs, ... }: let inherit (lib) mkIf; inherit (config) conf; + # Ugly workaround xwl-satellite crashes and prusa not being wayland-native + prusa-wrapper = pkgs.makeDesktopItem { + name = "prusa-wrapper"; + desktopName = "Prusa"; + exec = "${pkgs.xwayland-run}/bin/xwayland-run -- i3"; + }; in { imports = [ ./firefox.nix @@ -21,10 +27,15 @@ in { nautilus libreoffice-qt6-fresh inkscape - prusa-slicer + prusa-wrapper # freecad -- broken dependency ]; + xsession.windowManager.i3 = { + enable = true; + config.startup = [{ command = "${pkgs.prusa-slicer}/bin/prusa-slicer"; }]; + }; + home.file = { ".config/vesktop/settings.json" = { source = ./vesktop.conf.json; diff --git a/modules/niri/niri.conf.nix b/modules/niri/niri.conf.nix index 009700f..405e35f 100644 --- a/modules/niri/niri.conf.nix +++ b/modules/niri/niri.conf.nix @@ -92,10 +92,6 @@ in { hotkey-overlay.skip-at-startup = true; - environment = { - "DISPLAY" = ":0"; - }; - spawn-at-startup = [ { command = [ "waybar" ]; } { command = [ "swayidle" "-w" "before-sleep" "swaylock" ]; }