瀏覽代碼

Declarative flatpak

Johan Rong 6 月之前
父節點
當前提交
b248c94f20
共有 4 個文件被更改,包括 35 次插入5 次删除
  1. 17 0
      flake.lock
  2. 3 0
      flake.nix
  3. 8 1
      nixos/features/system/basic.nix
  4. 7 4
      nixos/features/system/gaming.nix

+ 17 - 0
flake.lock

@@ -21,6 +21,22 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1767983141,
+        "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "440818969ac2cbd77bfe025e884d0aa528991374",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "v0.7.0",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1771903837,
@@ -40,6 +56,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs"
       }
     }

+ 3 - 0
flake.nix

@@ -7,11 +7,13 @@
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0";
   };
 
   outputs =
     {
       self,
+      nix-flatpak,
       ...
     }@inputs:
 
@@ -48,6 +50,7 @@
         nixpkgs.lib.nixosSystem {
           system = host.arch;
           modules = [
+            nix-flatpak.nixosModules.nix-flatpak
             ./hosts/${host.dir}/configuration.nix
             { nixpkgs.overlays = overlays; }
             home-manager.nixosModules.home-manager

+ 8 - 1
nixos/features/system/basic.nix

@@ -28,6 +28,14 @@
     xdg-desktop-portal-wlr
   ];
 
+  services.flatpak = {
+    enable = true;
+    packages = [
+      "com.github.gabutakut.gabutdm"
+      "com.github.tchx84.Flatseal"
+    ];
+  };
+
   fonts = {
     packages = with pkgs; [
       adwaita-fonts
@@ -75,7 +83,6 @@
 
   services.seatd.enable = true;
   services.gvfs.enable = true;
-  services.flatpak.enable = true;
 
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;

+ 7 - 4
nixos/features/system/gaming.nix

@@ -1,13 +1,16 @@
 { pkgs, lib, ... }:
 {
-  imports = [
-
-  ];
-
   environment.systemPackages = with pkgs; [
     lutris
     prismlauncher
   ];
 
+  services.flatpak = {
+    enable = true;
+    packages = [
+      "org.vinegarhq.Sober"
+    ];
+  };
+
   programs.steam.enable = true;
 }