Use flatpacked vivaldi, flake update
This commit is contained in:
@@ -7,14 +7,20 @@
|
||||
}:
|
||||
let
|
||||
conf = config.programs.vivaldi;
|
||||
vivaldiCMD = if conf.flatpak then "flatpak run com.vivaldi.Vivaldi" else "vivaldi";
|
||||
vivaldiIcon = if conf.flatpak then "com.vivaldi.Vivaldi" else "vivaldi";
|
||||
in
|
||||
{
|
||||
config = lib.mkIf conf.enable {
|
||||
options = {
|
||||
programs.vivaldi.flatpak = lib.mkEnableOption "Use flatpak verion of Vivaldi";
|
||||
};
|
||||
|
||||
config = lib.mkIf (conf.enable || conf.flatpak) {
|
||||
home.file.vivaldiKDEScript = {
|
||||
target = ".local/bin/vivaldi-kde.sh";
|
||||
text = ''
|
||||
#!/bin/sh
|
||||
vivaldi --profile-directory=$(qdbus org.kde.ActivityManager /ActivityManager/Activities org.kde.ActivityManager.Activities.ActivityName $(qdbus org.kde.ActivityManager /ActivityManager/Activities org.kde.ActivityManager.Activities.CurrentActivity)) "$@"
|
||||
${vivaldiCMD} --profile-directory=$(qdbus org.kde.ActivityManager /ActivityManager/Activities org.kde.ActivityManager.Activities.ActivityName $(qdbus org.kde.ActivityManager /ActivityManager/Activities org.kde.ActivityManager.Activities.CurrentActivity)) "$@"
|
||||
'';
|
||||
executable = true;
|
||||
};
|
||||
@@ -46,7 +52,7 @@ in
|
||||
exec = "${config.home.file.vivaldiKDEScript.source} --new-window";
|
||||
};
|
||||
};
|
||||
icon = "vivaldi";
|
||||
icon = "${vivaldiIcon}";
|
||||
startupNotify = true;
|
||||
categories = [
|
||||
"Application"
|
||||
|
||||
Reference in New Issue
Block a user