From 855afe285f02b88e434a4f536039b4a89cf44474 Mon Sep 17 00:00:00 2001 From: Myned Date: Sat, 14 Sep 2024 16:03:48 -0500 Subject: [PATCH] office: switch to onlyoffice Signed-off-by: Myned --- options/custom/desktops/hyprland/binds.nix | 3 ++- options/custom/desktops/hyprland/rules.nix | 5 +++-- options/custom/programs/default.nix | 2 +- options/custom/settings/packages.nix | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/options/custom/desktops/hyprland/binds.nix b/options/custom/desktops/hyprland/binds.nix index 1f5505d..981eb8d 100644 --- a/options/custom/desktops/hyprland/binds.nix +++ b/options/custom/desktops/hyprland/binds.nix @@ -21,6 +21,7 @@ with lib; let networkmanager_dmenu = "${pkgs.networkmanager_dmenu}/bin/networkmanager_dmenu"; notify-send = "${pkgs.libnotify}/bin/notify-send"; obsidian = "${pkgs.obsidian}/bin/obsidian"; + onlyoffice = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors"; pkill = "${pkgs.procps}/bin/pkill"; playerctl = "${pkgs.playerctl}/bin/playerctl"; rofi-rbw = "${pkgs.rofi-rbw}/bin/rofi-rbw"; @@ -211,7 +212,7 @@ in { (key "M" "Super" "togglespecialworkspace" "music") (key "M" "Super+Shift" "movetoworkspacesilent" "music") (key "O" "Super" "togglespecialworkspace" "office") - (key "O" "Super+Ctrl" "exec" "libreoffice") + (key "O" "Super+Ctrl" "exec" "${onlyoffice}") (key "O" "Super+Shift" "movetoworkspacesilent" "special:office") (key "P" "Super" "exec" "${hyprpicker} --autocopy") (key "P" "Super+Shift" "exec" "${hyprpicker} --autocopy --format rgb") diff --git a/options/custom/desktops/hyprland/rules.nix b/options/custom/desktops/hyprland/rules.nix index 17a5cf5..2db601d 100644 --- a/options/custom/desktops/hyprland/rules.nix +++ b/options/custom/desktops/hyprland/rules.nix @@ -7,8 +7,8 @@ with lib; let gamescope = "${config.programs.gamescope.package}/bin/gamescope"; kitty = "${config.home-manager.users.${config.custom.username}.programs.kitty.package}/bin/kitty"; - libreoffice = "${config.custom.programs.libreoffice.package}/bin/libreoffice"; loupe = "${pkgs.loupe}/bin/loupe"; + onlyoffice = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors"; pgrep = "${pkgs.procps}/bin/pgrep"; steam = "${config.programs.steam.package}/bin/steam"; virt-manager = "${pkgs.virt-manager}/bin/virt-manager"; @@ -28,7 +28,7 @@ in { "special:android, on-created-empty:${waydroid} app launch com.YoStarEN.Arknights" "special:music, on-created-empty:${youtube-music}" - "special:office, on-created-empty:${libreoffice}" + "special:office, on-created-empty:${onlyoffice}" "special:steam, on-created-empty:${steam}" "special:terminal, on-created-empty:${kitty}" "special:vm, on-created-empty:${pgrep} -x vm || ${virt-manager}" @@ -136,6 +136,7 @@ in { ]; office = rules: [ (class "libreoffice.+" rules) + (class "ONLYOFFICE Desktop Editors" rules) ]; pip = rules: [ (title "Picture.in.[Pp]icture" rules) diff --git a/options/custom/programs/default.nix b/options/custom/programs/default.nix index f7f07c9..64a2ea4 100644 --- a/options/custom/programs/default.nix +++ b/options/custom/programs/default.nix @@ -50,7 +50,7 @@ with lib; { #// gnome-shell.enable = true; gpg.enable = true; hyprlock.enable = true; - libreoffice.enable = true; + #// libreoffice.enable = true; #// librewolf.enable = true; localsend.enable = true; logseq.enable = true; diff --git a/options/custom/settings/packages.nix b/options/custom/settings/packages.nix index 6d311d1..47f46a4 100644 --- a/options/custom/settings/packages.nix +++ b/options/custom/settings/packages.nix @@ -98,6 +98,7 @@ in { lutris nheko obsidian + onlyoffice-bin path-of-building pika-backup protonup-qt