diff --git a/configuration.nix b/configuration.nix index a547b4e..52cd04f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,7 +13,6 @@ ./modules/programs.nix ./modules/hardware.nix ./modules/services.nix - ./modules/flatpak.nix ./modules/home.nix ]; diff --git a/modules/flatpak.nix b/modules/flatpak.nix deleted file mode 100644 index f0840f9..0000000 --- a/modules/flatpak.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ pkgs, lib, ... }: - -let - # Format: ":" - flatpakApps = [ - "flathub:in.cinny.Cinny" - ]; - - installScript = pkgs.writeShellScript "flatpak-setup" '' - ${pkgs.flatpak}/bin/flatpak remote-add --if-not-exists flathub \ - https://dl.flathub.org/repo/flathub.flatpakrepo - - ${lib.concatMapStringsSep "\n" ( - entry: - let - parts = lib.splitString ":" entry; - remote = lib.elemAt parts 0; - appId = lib.elemAt parts 1; - in - '' - ${pkgs.flatpak}/bin/flatpak install --assumeyes --noninteractive \ - ${remote} ${appId} || true - '' - ) flatpakApps} - ''; -in -{ - services.flatpak.enable = true; - - environment.sessionVariables = { - XDG_DATA_DIRS = [ - "/var/lib/flatpak/exports/share" - "\${HOME}/.local/share/flatpak/exports/share" - ]; - }; - - system.activationScripts.flatpakSetup = { - text = '' - ${installScript} - ''; - deps = [ ]; - }; -} diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 098442d..bf85f1b 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -18,7 +18,6 @@ lean4 nerd-fonts.iosevka desktop-file-utils - cinny # CLI/TUI bitwarden-cli @@ -42,5 +41,6 @@ supersonic mpv nicotine-plus + nheko ]; }