modules: Extend sway and emacs by common options

This commit is contained in:
PapaTutuWawa 2021-11-04 19:51:49 +01:00
parent 2bfb389572
commit 52ce4eed01
3 changed files with 19 additions and 18 deletions

View File

@ -17,7 +17,6 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
emacsPgtkGcc
gajim-mainwindow gajim-mainwindow
virt-manager qemu scream virt-manager qemu scream
replaysorcery # Custom package replaysorcery # Custom package
@ -136,12 +135,6 @@
# sdma0 time out (whatever this means). Maybe bisect? # sdma0 time out (whatever this means). Maybe bisect?
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_zen;
}; };
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-wlr
];
};
services = { services = {
ratbagd.enable = true; ratbagd.enable = true;
flatpak.enable = true; flatpak.enable = true;
@ -160,17 +153,6 @@
}; };
}; };
environment.sessionVariables = {
# sway
#"_JAVA_AWT_NONREPARENTING" = 1;
# Wayland
"QT_QPA_PLATFORM" = "wayland-egl";
"ECORE_EVAS_ENGINE" = "wayland-egl";
"ELM_ENGINE" = "wayland-egl";
"SDL_VIDEODRIVER" = "wayland";
};
# TODO: Move into modules # TODO: Move into modules
systemd.user.services = { systemd.user.services = {
scream = { scream = {

View File

@ -8,6 +8,7 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ emacsPgtkGcc ];
services.emacs.package = pkgs.emacsPgtkGcc; services.emacs.package = pkgs.emacsPgtkGcc;
home-manager.users."${config.ptw.system.singleUser}".home.file = { home-manager.users."${config.ptw.system.singleUser}".home.file = {

View File

@ -38,6 +38,24 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-wlr
];
};
environment.sessionVariables = {
# sway
#"_JAVA_AWT_NONREPARENTING" = 1;
# Wayland
"QT_QPA_PLATFORM" = "wayland-egl";
"ECORE_EVAS_ENGINE" = "wayland-egl";
"ELM_ENGINE" = "wayland-egl";
"SDL_VIDEODRIVER" = "wayland";
};
programs.sway.enable = true; programs.sway.enable = true;
home-manager.users."${config.ptw.system.singleUser}" = { home-manager.users."${config.ptw.system.singleUser}" = {
wayland.windowManager.sway = { wayland.windowManager.sway = {