diff --git a/flake.nix b/flake.nix index c9fcd5d..f2c1e33 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,7 @@ ezpw = import ./modules/ezpw.nix; de2 = import ./home-manager/modules/de2.nix; de3 = import ./home-manager/modules/de3.nix; + ezpc = import ./home-manager/modules/ezpc.nix; all = import ./modules/default.nix; }; @@ -82,6 +83,7 @@ fonts = import ./home-manager/modules/fonts.nix; gaming = import ./home-manager/modules/gaming.nix inputs; kermit = import ./home-manager/modules/kermit.nix; + de2u = import ./home-manager/modules/de2u.nix inputs; de3u = import ./home-manager/modules/de3u.nix inputs; all = import ./home-manager/modules/default.nix inputs; }; diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index 2620183..76688c9 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -384,15 +384,6 @@ in { }; }; - home.sessionVariables = { - QT_QPA_PLATFORM = "wayland-egl;xcb"; - MOZ_ENABLE_WAYLAND = "1"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - ECORE_EVAS_ENGINE = "wayland_egl"; - ELM_ENGINE = "wayland_egl"; - _JAVA_AWT_WM_NONREPARENTING = "1"; - }; - programs.firefox.enable = true; programs.waybar = { diff --git a/modules/default.nix b/modules/default.nix index 809bbad..1fa815f 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,5 +13,6 @@ ./ezpw.nix ./de2.nix ./de3.nix + ./ezpc.nix ]; } diff --git a/modules/ezpc.nix b/modules/ezpc.nix new file mode 100644 index 0000000..a62a648 --- /dev/null +++ b/modules/ezpc.nix @@ -0,0 +1,39 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.ezpc; +in { + options.ezpc.enable = mkEnableOption "Enable ezpc system stuff"; + + config = mkIf cfg.enable { + xdg.portal.enable = lib.mkDefault true; + xdg.portal.extraPortals = lib.mkDefault (with pkgs; [ + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]); + + environment.sessionVariables = { + QT_QPA_PLATFORM = "wayland-egl;xcb"; + MOZ_ENABLE_WAYLAND = "1"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + ECORE_EVAS_ENGINE = "wayland_egl"; + ELM_ENGINE = "wayland_egl"; + _JAVA_AWT_WM_NONREPARENTING = "1"; + }; + + environment.loginShellInit = lib.mkAfter '' + [[ "$(tty)" == /dev/tty1 ]] && { + exec sway + } + ''; + + i18n.inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [typing-booster uniemoji]; + }; + }; +}