Compare commits

..

2 Commits

Author SHA1 Message Date
6a5baec0db
Add LibreOffice to odyssey
All checks were successful
Check flake / build-amd64-linux (push) Successful in 2m19s
2024-06-23 12:26:11 +01:00
681d6606d3
Don't use LibreOffice GTK4 2024-06-23 12:25:48 +01:00
2 changed files with 19 additions and 18 deletions

View File

@ -67,6 +67,7 @@
audio.enable = true; audio.enable = true;
video.enable = true; video.enable = true;
}; };
office.libreoffice.enable = true;
}; };
dev = { dev = {
node.enable = true; node.enable = true;

View File

@ -2,23 +2,23 @@
let let
cfg = config.modules.desktop.office.libreoffice; cfg = config.modules.desktop.office.libreoffice;
libreoffice-gtk4 = pkgs.libreoffice.override { # libreoffice-gtk4 = pkgs.libreoffice.override {
extraMakeWrapperArgs = [ # extraMakeWrapperArgs = [
"--set SAL_USE_VCLPLUGIN gtk4" # "--set SAL_USE_VCLPLUGIN gtk4"
]; # ];
unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: { # unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ # buildInputs = oldAttrs.buildInputs ++ [
pkgs.gtk4 # pkgs.gtk4
]; # ];
configureFlags = oldAttrs.configureFlags ++ [ # configureFlags = oldAttrs.configureFlags ++ [
"--disable-werror" # "--disable-werror"
"--enable-gtk4" # "--enable-gtk4"
]; # ];
passthru = oldAttrs.passthru // { # passthru = oldAttrs.passthru // {
inherit (pkgs) gtk4; # inherit (pkgs) gtk4;
}; # };
}); # });
}; # };
in { in {
options.modules.desktop.office.libreoffice = { options.modules.desktop.office.libreoffice = {
enable = lib.mkOption { enable = lib.mkOption {
@ -29,7 +29,7 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
user.packages = with pkgs; [ user.packages = with pkgs; [
(if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice-gtk4) (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
hunspell hunspell
hunspellDicts.en-gb-large hunspellDicts.en-gb-large
hunspellDicts.en-us-large hunspellDicts.en-us-large