ugly but works?

This commit is contained in:
twoneis 2024-08-27 14:53:37 +02:00
parent 9c1b7e349d
commit c4a846066c
2 changed files with 12 additions and 5 deletions

View file

@ -1,6 +1,12 @@
{ lib, config, pkgs, ... }: let { lib, config, pkgs, ... }: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (config) conf; 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 { in {
imports = [ imports = [
./firefox.nix ./firefox.nix
@ -21,10 +27,15 @@ in {
nautilus nautilus
libreoffice-qt6-fresh libreoffice-qt6-fresh
inkscape inkscape
prusa-slicer prusa-wrapper
# freecad -- broken dependency # freecad -- broken dependency
]; ];
xsession.windowManager.i3 = {
enable = true;
config.startup = [{ command = "${pkgs.prusa-slicer}/bin/prusa-slicer"; }];
};
home.file = { home.file = {
".config/vesktop/settings.json" = { ".config/vesktop/settings.json" = {
source = ./vesktop.conf.json; source = ./vesktop.conf.json;

View file

@ -92,10 +92,6 @@ in {
hotkey-overlay.skip-at-startup = true; hotkey-overlay.skip-at-startup = true;
environment = {
"DISPLAY" = ":0";
};
spawn-at-startup = [ spawn-at-startup = [
{ command = [ "waybar" ]; } { command = [ "waybar" ]; }
{ command = [ "swayidle" "-w" "before-sleep" "swaylock" ]; } { command = [ "swayidle" "-w" "before-sleep" "swaylock" ]; }