1

Replace my shit flatpak module with nix-flatpak

This commit is contained in:
2024-05-30 10:53:05 +02:00
parent c3bcd8969c
commit 83885191db
4 changed files with 62 additions and 23 deletions

View File

@ -33,6 +33,8 @@
firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme"; firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme";
firefox-gnome-theme.flake = false; firefox-gnome-theme.flake = false;
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
# adwaita-for-steam.url = "github:tkashkin/Adwaita-for-Steam"; # adwaita-for-steam.url = "github:tkashkin/Adwaita-for-Steam";
# adwaita-for-steam.flake = false; # adwaita-for-steam.flake = false;
@ -104,6 +106,7 @@
extraModules = [ extraModules = [
# hyprland.nixosModules.default # NOTE: NixOS includes system module # hyprland.nixosModules.default # NOTE: NixOS includes system module
# inputs.nix-flatpak.nixosModules.nix-flatpak
]; ];
}; };
@ -116,6 +119,7 @@
extraModules = [ extraModules = [
# hyprland.nixosModules.default # NOTE: NixOS includes system module # hyprland.nixosModules.default # NOTE: NixOS includes system module
# inputs.nix-flatpak.nixosModules.nix-flatpak
]; ];
}; };
}; };

View File

@ -69,20 +69,20 @@ rec {
fish.enable = true; fish.enable = true;
flatpak = { # flatpak = {
enable = true; # enable = false;
autoUpdate = true; # autoUpdate = true;
autoPrune = true; # autoPrune = true;
fontFix = true; # TODO: This doesn't work reliably... # fontFix = true; # TODO: This doesn't work reliably...
iconFix = false; # iconFix = false;
flatseal.enable = true; # flatseal.enable = true;
discord.enable = true; # discord.enable = true;
spotify.enable = false; # Can't login because browser doesn't open # spotify.enable = true;
bottles.enable = false; # bottles.enable = false;
obsidian.enable = false; # Extremely low graph draw performance? # obsidian.enable = false; # Extremely low graph draw performance?
jabref.enable = false; # jabref.enable = false;
}; # };
helix.enable = true; helix.enable = true;
@ -175,10 +175,10 @@ rec {
}; };
}; };
# neovim = { neovim = {
# enable = false; enable = false;
# alias = true; alias = true;
# }; };
nextcloud = { nextcloud = {
enable = true; enable = true;
@ -376,10 +376,11 @@ rec {
cool-retro-term cool-retro-term
ventoy-full # Bootable USB for many ISOs ventoy-full # Bootable USB for many ISOs
# geekbench # geekbench
spotify # spotify # NOTE: Uses flatpak
neovide
sqlitebrowser # To modify tables sqlitebrowser # To modify tables
dbeaver # To import/export data + diagrams dbeaver-bin # To import/export data + diagrams
hoppscotch # Test APIs hoppscotch # Test APIs
# Xooooorg/Desktop environment stuff # Xooooorg/Desktop environment stuff
@ -879,6 +880,38 @@ rec {
services = { services = {
# kdeconnect.enable = true; # Note: This does not setup the firewall at all # kdeconnect.enable = true; # Note: This does not setup the firewall at all
flatpak = {
packages = [
"com.github.tchx84.Flatseal"
"com.discordapp.Discord"
"com.spotify.Client"
];
uninstallUnmanaged = true;
update.auto = {
enable = true;
onCalendar = "weekly"; # Default value
};
overrides = {
global = {
# Force Wayland by default
Context.sockets = ["wayland" "!x11" "!fallback-x11"];
Context.filesystems = ["/nix/store:ro"];
Environment = {
# Fix un-themed cursor in some Wayland apps
XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
# Force correct theme for some GTK apps
# GTK_THEME = "Adwaita:dark";
};
};
};
};
}; };
# Nicely reload system units when changing configs # Nicely reload system units when changing configs

View File

@ -27,5 +27,7 @@
./rofi ./rofi
./vscode ./vscode
./waybar ./waybar
inputs.nix-flatpak.homeManagerModules.nix-flatpak
]; ];
} }

View File

@ -14,10 +14,10 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
# TODO: Configure by option # TODO: Configure by option
home.sessionVariables = { # home.sessionVariables = {
EDITOR = "nvim"; # EDITOR = "nvim";
VISUAL = "nvim"; # VISUAL = "nvim";
}; # };
programs.neovim = { programs.neovim = {
enable = true; enable = true;