From 8475ddf66b88f3fa134f28b05206b326f89b7431 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Sat, 4 May 2024 21:38:48 +0200 Subject: [PATCH] Adding flatpak support --- flake.nix | 4 +++- user/home.nix | 6 ++++++ user/packages.nix | 19 +++++++++++++++++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 049df81..a60e778 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,10 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; }; - outputs = { self, nixpkgs, nixos-hardware, ... }@attrs: { + outputs = { self, nixpkgs, nixos-hardware, nix-flatpak, ... }@attrs: { nixosConfigurations.lyes-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; @@ -16,6 +17,7 @@ ./configuration.nix ./hardware/x1-extreme-gen4.nix nixos-hardware.nixosModules.lenovo-thinkpad-x1-extreme-gen4 + nix-flatpak.nixosModules.nix-flatpak ]; }; }; diff --git a/user/home.nix b/user/home.nix index d003b51..6d069c0 100644 --- a/user/home.nix +++ b/user/home.nix @@ -22,4 +22,10 @@ }; }; }; + + # Protonup config + home.sessionVariables = { + STEAM_EXTRA_COMPAT_TOOLS_PATHS = + "\${HOME}/.steam/root/compatibilitytools.d"; + }; } diff --git a/user/packages.nix b/user/packages.nix index 9d99320..9d03a4b 100644 --- a/user/packages.nix +++ b/user/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) @@ -28,7 +28,6 @@ in { # Games # citra-canary - steam minecraft vvvvvv @@ -48,6 +47,7 @@ in { # Programming git + git-lfs vscode ocaml ledit @@ -68,4 +68,19 @@ in { pulseaudio libopus ]; + + # Flatpaks + services.flatpak.remotes = lib.mkOptionDefault [{ + name = "gnome-nightly"; + location = "https://nightly.gnome.org/gnome-nightly.flatpakrepo"; + }]; + + services.flatpak.packages = [ + "com.github.muriloventuroso.pdftricks" + "app.drey.Damask" + "dev.tchx84.Gameeky" + "dev.tchx84.Gameeky.FreedomValley" + "dev.tchx84.Gameeky.Blasterman" + "dev.tchx84.Gameeky.Wackman" + ]; }