From 783b7c8705dde36d66bbb59f61283ed612f1e2fc Mon Sep 17 00:00:00 2001 From: lightly-toasted Date: Sat, 9 Aug 2025 11:55:25 +0900 Subject: [PATCH] feat: add flatpak --- flake.lock | 16 ++++++++++++++++ flake.nix | 1 + home/toast/home.nix | 2 +- home/toast/programs/prismlauncher.nix | 5 ----- hosts/nixos/configuration.nix | 24 +++++++++++++++++++++++- 5 files changed, 41 insertions(+), 7 deletions(-) delete mode 100644 home/toast/programs/prismlauncher.nix diff --git a/flake.lock b/flake.lock index 8c51d8b..07e7a6a 100644 --- a/flake.lock +++ b/flake.lock @@ -119,6 +119,21 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1754513886, + "narHash": "sha256-iDO2Sr99l400kQWBIk/xEyZ9oMDht6Y/ScnK7k5+tmI=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "f3cf46a120cf17f0a2517667666db5adb8e60ae3", + "type": "github" + }, + "original": { + "owner": "gmodena", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixcord": { "inputs": { "flake-compat": "flake-compat", @@ -221,6 +236,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixcord": "nixcord", "nixpkgs": "nixpkgs", "nixvim": "nixvim" diff --git a/flake.nix b/flake.nix index ded31b2..ae7e77e 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ url = "github:kaylorben/nixcord"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-flatpak.url = "github:gmodena/nix-flatpak"; }; outputs = { self, nixpkgs, home-manager, ... } @ inputs: diff --git a/home/toast/home.nix b/home/toast/home.nix index 8e47fa3..5a5ab24 100644 --- a/home/toast/home.nix +++ b/home/toast/home.nix @@ -3,6 +3,7 @@ imports = [ inputs.nixvim.homeManagerModules.nixvim inputs.nixcord.homeModules.nixcord + inputs.nix-flatpak.homeManagerModules.nix-flatpak ./programs/kitty.nix ./programs/git.nix @@ -14,7 +15,6 @@ ./programs/firefox.nix ./programs/yazi.nix ./programs/nixcord.nix - ./programs/prismlauncher.nix ./programs/nodejs.nix ./programs/btop.nix ./programs/waybar diff --git a/home/toast/programs/prismlauncher.nix b/home/toast/programs/prismlauncher.nix deleted file mode 100644 index 2256d75..0000000 --- a/home/toast/programs/prismlauncher.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: - -{ - home.packages = with pkgs; [ prismlauncher ]; -} diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index 27681ad..b0f5f9e 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -1,8 +1,9 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: { imports = [ + inputs.nix-flatpak.nixosModules.nix-flatpak ./hardware-configuration.nix ]; @@ -94,6 +95,27 @@ }; }; services.zerotierone.enable = true; + services.flatpak = { + enable = true; + packages = [ + "org.prismlauncher.PrismLauncher" + "org.vinegarhq.Sober" + "org.vinegarhq.Vinegar" + ]; + overrides = { + "org.prismlauncher.PrismLauncher".Context = { + filesystems = [ + "home" + ]; + }; + "org.vinegarhq.Sober".Context = { + filesystems = [ + "xdg-run/app/com.discordapp.Discord:create" + "xdg-run/discord-ipc-0" + ]; + }; + }; + }; system.stateVersion = "25.05"; nix.settings.experimental-features = [ "nix-command" "flakes" ];