aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

General: move default Flatpak packages to their respective modules

Browse source
This commit is contained in:
Aires 2024-12-11 11:49:19 -05:00
parent 064927b392
commit a725eafe63
6 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -350,11 +350,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733550349, "lastModified": 1733808091,
"narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
modules/nixos/apps/office/default.nix
View file

@ -17,6 +17,7 @@ in
${namespace}.ui.flatpak = { ${namespace}.ui.flatpak = {
enable = true; enable = true;
packages = [ packages = [
"md.obsidian.Obsidian"
"org.onlyoffice.desktopeditors" "org.onlyoffice.desktopeditors"
"us.zoom.Zoom" "us.zoom.Zoom"
]; ];

4
modules/nixos/ui/audio/default.nix
View file

@ -47,5 +47,9 @@ in
}; };
}; };
}; };
${namespace}.ui.flatpak.packages = lib.mkIf config.${namespace}.ui.flatpak.enable [
"com.github.wwmm.easyeffects"
];
}; };
} }

6
modules/nixos/ui/flatpak/default.nix
View file

@ -17,7 +17,11 @@ in
packages = lib.mkOption { packages = lib.mkOption {
description = "Flatpak packages to install."; description = "Flatpak packages to install.";
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
default = [ ]; default = [
"com.github.tchx84.Flatseal"
"org.mozilla.firefox"
"io.github.ungoogled_software.ungoogled_chromium"
];
example = lib.literalExpression "[ \"com.valvesoftware.Steam\" ]"; example = lib.literalExpression "[ \"com.valvesoftware.Steam\" ]";
}; };
remotes = lib.mkOption { remotes = lib.mkOption {

16
systems/x86_64-linux/Khanda/default.nix
View file

@ -1,4 +1,9 @@
{ config, namespace, ... }: {
config,
lib,
namespace,
...
}:
let let
# Do not change this value! This tracks when NixOS was installed on your system. # Do not change this value! This tracks when NixOS was installed on your system.
@ -69,14 +74,9 @@ in
# Enable Flatpak support. # Enable Flatpak support.
enable = true; enable = true;
# Define Flatpak packages to install. # Define extra Flatpak packages to install.
packages = [ packages = lib.mkAfter [
"com.github.tchx84.Flatseal"
"com.github.wwmm.easyeffects"
"md.obsidian.Obsidian"
"net.codelogistics.webapps"
"org.keepassxc.KeePassXC" "org.keepassxc.KeePassXC"
"org.mozilla.firefox"
]; ];
useBindFS = true; useBindFS = true;

8
systems/x86_64-linux/Shura/default.nix
View file

@ -95,14 +95,6 @@ in
ui = { ui = {
flatpak = { flatpak = {
enable = true; enable = true;
packages = [
"com.github.tchx84.Flatseal"
"com.github.wwmm.easyeffects"
"md.obsidian.Obsidian"
"net.codelogistics.webapps"
"org.mozilla.firefox"
];
useBindFS = true; useBindFS = true;
}; };
desktops.gnome.enable = true; desktops.gnome.enable = true;