switch to new flatpak, make webapps

This commit is contained in:
atagen 2024-02-27 23:11:21 +11:00
parent deeda4b05a
commit f43572bc05
11 changed files with 1148 additions and 123 deletions

View file

@ -18,8 +18,10 @@ in {
./programs/zsh.nix
./util/ez.nix
./util/firefox-webapp.nix
inputs.plasma-manager.homeManagerModules.plasma-manager # TODO: set up manually, use rc2nix to convert
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.plasma-manager.homeManagerModules.plasma-manager
./programs/plasma.nix
# inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.nix-index-database.hmModules.nix-index
];
home.packages = with pkgs;
@ -40,8 +42,6 @@ in {
fzf
zoxide
zellij
grim
slurp
libnotify
playerctl
@ -81,18 +81,40 @@ in {
enable = true;
};
services.udiskie.enable = true; # TODO is this fixed now?
services.udiskie.enable = true;
services.flatpak.packages = [
"com.logseq.Logseq"
# "com.github.IsmaelMartinez.teams_for_linux"
];
services.flatpak.overrides = {
global = {
Context.sockets = ["wayland" "!x11" "!fallback-x11"];
Environment."ELECTRON_OZONE_PLATFORM_HINT" = "auto";
services.flatpak = {
enableModule = true;
packages = [
"flathub:app/com.logseq.Logseq/x86_64/stable"
];
remotes = {
"flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
# "flathub-beta" = "https://dl.flathub.org/beta-repo/flathub-beta.flatpakrepo";
};
overrides = {
"global" = {
sockets = ["wayland"];
environment = {
"ELECTRON_OZONE_PLATFORM_HINT" = "auto";
};
};
};
};
# services.flatpak.packages = [
# "com.logseq.Logseq"
# ];
# services.flatpak.overrides = {
# global = {
# Context.sockets = [
# "wayland"
# ];
# Environment."ELECTRON_OZONE_PLATFORM_HINT" = "auto";
# };
# "com.logseq.Logseq" = {
# Application.command = "run.sh --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WaylandWindowDecorations";
# };
# };
programs.firefox.webapps = {
teams = {
@ -100,10 +122,26 @@ in {
id = 1;
extraSettings = config.programs.firefox.profiles.default.settings;
name = "Microsoft Teams";
icon = ./ms_teams.png;
icon = ./icons/ms_teams.png;
};
messenger = {
url = "https://www.messenger.com";
id = 2;
extraSettings = config.programs.firefox.profiles.default.settings;
name = "Facebook Messenger";
icon = ./icons/fb_msg.png;
};
};
# programs.nix-index-database.comma.enable = true;
# programs.nix-index = {
# enable = true;
# enableZshIntegration = false;
# enableBashIntegration = false;
# };
# programs.command-not-found.enable = false;
# programs.nix-index.enable = true;
programs.vscode = {
enable = true;
extensions = with pkgs.vscode-extensions; [
@ -165,17 +203,6 @@ in {
"${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
];
xdg.desktopEntries.logseq = {
name = "Logseq";
exec = "logseq --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform-hint=auto %u";
icon = "logseq";
type = "Application";
categories = ["Utility"];
mimeType = ["x-scheme-handler/logseq"];
terminal = false;
comment = "A privacy-first, open-source platform for knowledge management and collaboration.";
};
# gtk = with pkgs.rice; {
# enable = true;
# theme = with gtk-theme; {