jordan/nix-config
1
1
Fork 0
Code Issues 14 Pull Requests Actions Projects 3 Wiki Activity

Compare commits

base: jordan:6a5baec0db4fe32790029dc27d5b7f38e4dfb739
Branches Tags
jordan:master
jordan:hass
jordan:immich
jordan:zitadel
jordan:skycam
jordan:24.05
jordan:lunarvim
jordan:matrix
jordan:docs
jordan:vps1
jordan:wallpapers
jordan:fix-odyssey-nix-store
..
compare: jordan:9086701c4fd14434d3dba75e125a5c3cb9ed23a9
Branches Tags
jordan:master
jordan:hass
jordan:immich
jordan:zitadel
jordan:skycam
jordan:24.05
jordan:lunarvim
jordan:matrix
jordan:docs
jordan:vps1
jordan:wallpapers
jordan:fix-odyssey-nix-store

No commits in common. "6a5baec0db4fe32790029dc27d5b7f38e4dfb739" and "9086701c4fd14434d3dba75e125a5c3cb9ed23a9" have entirely different histories.
6a5baec0db ... 9086701c4f

2 changed files with 18 additions and 19 deletions
Show Stats Expand all files Collapse all files

1
hosts/odyssey/default.nix
View File

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

36
modules/desktop/office/libreoffice.nix
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) (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice-gtk4)
hunspell hunspell
hunspellDicts.en-gb-large hunspellDicts.en-gb-large
hunspellDicts.en-us-large hunspellDicts.en-us-large