Skip to content

Commit

Permalink
Bump givc
Browse files Browse the repository at this point in the history 
- fix application restart issue
- add additional optional arguments to givc-cli
- add locale and timezone setting
- various smaller improvements

Signed-off-by: Manuel Bluhm <manuel@ssrc.tii.ae>
  • Loading branch information
@mbssrc @brianmcgillion
mbssrc authored and brianmcgillion committed Oct 5, 2024
1 parent afee6f9 commit c4a6cbb
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 29 deletions.
14 changes: 7 additions & 7 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
};

givc = {
url = "github:tiiuae/ghaf-givc/ff9f60e3059f940fad610c27393b4d101bf6693d";
url = "github:tiiuae/ghaf-givc/68079deac890d19d84389becc37805310fc0107f";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
Expand Down
4 changes: 2 additions & 2 deletions modules/givc/appvm.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ in
description = "Name of the appvm.";
};
applications = mkOption {
type = types.str;
default = "{}";
type = types.listOf types.attrs;
default = [ { } ];
description = "Applications to run in the appvm.";
};
};
Expand Down
7 changes: 6 additions & 1 deletion modules/reference/appvms/appflowy.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
ghaf.givc.appvm = {
enable = true;
name = lib.mkForce "appflowy-vm";
applications = lib.mkForce ''{"appflowy": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/appflowy"}'';
applications = [
{
name = "appflowy";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/appflowy";
}
];
};
}
];
Expand Down
39 changes: 30 additions & 9 deletions modules/reference/appvms/business.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,37 @@ in
ghaf.givc.appvm = {
enable = true;
name = lib.mkForce "business-vm";
applications = lib.mkForce ''
applications = [
{
"chromium": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland ${config.ghaf.givc.idsExtraArgs}",
"outlook": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://outlook.office.com/mail/ ${config.ghaf.givc.idsExtraArgs}",
"office": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://microsoft365.com ${config.ghaf.givc.idsExtraArgs}",
"teams": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://teams.microsoft.com ${config.ghaf.givc.idsExtraArgs}",
"gpclient": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/gpclient -platform wayland",
"gnome-text-editor": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/gnome-text-editor",
"losslesscut": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/losslesscut --enable-features=UseOzonePlatform --ozone-platform=wayland"
}'';
name = "chromium";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland ${config.ghaf.givc.idsExtraArgs}";
args = [ "url" ];
}
{
name = "outlook";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://outlook.office.com/mail/ ${config.ghaf.givc.idsExtraArgs}";
}
{
name = "office";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://microsoft365.com ${config.ghaf.givc.idsExtraArgs}";
}
{
name = "teams";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://teams.microsoft.com ${config.ghaf.givc.idsExtraArgs}";
}
{
name = "gpclient";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/gpclient -platform wayland";
}
{
name = "gnome-text-editor";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/gnome-text-editor";
}
{
name = "losslesscut";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/losslesscut --enable-features=UseOzonePlatform --ozone-platform=wayland";
}
];
};

ghaf.reference.programs.chromium.enable = true;
Expand Down
12 changes: 9 additions & 3 deletions modules/reference/appvms/chromium.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,16 @@ in
ghaf.givc.appvm = {
enable = true;
name = lib.mkForce "chromium-vm";
applications = lib.mkForce ''
applications = [
{
"chromium": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland ${config.ghaf.givc.idsExtraArgs}"
}'';
name = "chromium";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland ${config.ghaf.givc.idsExtraArgs}";
args = [
"url"
"flag"
];
}
];
};

ghaf.reference.programs.chromium.enable = true;
Expand Down
13 changes: 9 additions & 4 deletions modules/reference/appvms/comms.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,16 @@ in
ghaf.givc.appvm = {
enable = true;
name = lib.mkForce "${name}-vm";
applications = lib.mkForce ''
applications = [
{
"element": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland",
"slack": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://app.slack.com/client ${config.ghaf.givc.idsExtraArgs}"
}'';
name = "element";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland";
}
{
name = "slack";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://app.slack.com/client ${config.ghaf.givc.idsExtraArgs}";
}
];
};
}
];
Expand Down
7 changes: 6 additions & 1 deletion modules/reference/appvms/gala.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
ghaf.givc.appvm = {
enable = true;
name = lib.mkForce "gala-vm";
applications = lib.mkForce ''{"gala": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/gala --enable-features=UseOzonePlatform --ozone-platform=wayland"}'';
applications = [
{
name = "gala";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/gala --enable-features=UseOzonePlatform --ozone-platform=wayland";
}
];
};
}
];
Expand Down
7 changes: 6 additions & 1 deletion modules/reference/appvms/zathura.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
givc.appvm = {
enable = true;
name = lib.mkForce "zathura-vm";
applications = lib.mkForce ''{"zathura": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/zathura"}'';
applications = [
{
name = "zathura";
command = "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/zathura";
}
];
};

#this vm should be stateless so nothing stored between boots.
Expand Down

0 comments on commit c4a6cbb

Please sign in to comment.