From 073782130e73608b3b89b02e42141b36794f09ce Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 21 Dec 2023 21:09:44 -0600 Subject: [PATCH] Tried nix-flatpak but couldn't get hmModule to work --- flake.nix | 6 +++++- user/app/flatpak/flatpak.nix | 4 ++++ user/app/games/games.nix | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b423f47..1209b34 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,9 @@ homeConfigurations = { user = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ (./. + "/profiles"+("/"+profile)+"/home.nix") ]; # load home.nix from selected PROFILE + modules = [ (./. + "/profiles"+("/"+profile)+"/home.nix") # load home.nix from selected PROFILE + # inputs.nix-flatpak.homeManagerModules.nix-flatpak # Declarative flatpaks + ]; extraSpecialArgs = { # pass config variables from above inherit username; @@ -75,6 +77,7 @@ inherit term; inherit spawnEditor; inherit (inputs) nix-doom-emacs; + #inherit (inputs) nix-flatpak; inherit (inputs) stylix; inherit (inputs) eaf; inherit (inputs) eaf-browser; @@ -116,6 +119,7 @@ nix-doom-emacs.url = "github:librephoenix/nix-doom-emacs?ref=pgtk-patch"; stylix.url = "github:danth/stylix"; rust-overlay.url = "github:oxalica/rust-overlay"; + #nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.2.0"; eaf = { url = "github:emacs-eaf/emacs-application-framework"; flake = false; diff --git a/user/app/flatpak/flatpak.nix b/user/app/flatpak/flatpak.nix index fc340da..75a367e 100644 --- a/user/app/flatpak/flatpak.nix +++ b/user/app/flatpak/flatpak.nix @@ -5,4 +5,8 @@ home.sessionVariables = { XDG_DATA_DIRS = "$XDG_DATA_DIRS:/usr/share:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share"; # lets flatpak work }; + + #services.flatpak.enable = true; + #services.flatpak.packages = [ { appId = "com.kde.kdenlive"; origin = "flathub"; } ]; + #services.flatpak.update.onActivation = true; } diff --git a/user/app/games/games.nix b/user/app/games/games.nix index a3b31df..e86218f 100644 --- a/user/app/games/games.nix +++ b/user/app/games/games.nix @@ -37,4 +37,9 @@ in }; # To get steam to import into gamehub, first install it as a flatpak, then # Set steam directory to ~/.var/app/com.valvesoftware.Steam/.steam + + #services.flatpak.packages = [ + # "com.discordapp.Discord" + # "com.jaquadro.NBTExplorer" + #]; }