niri-autoselect-portal

4 files changed, 114 insertions, 6 deletions

diff --git a/flake.lock b/flake.lock
index 1583147c..0f336b0a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -173,6 +173,22 @@
     "flake-compat_5": {
       "flake": false,
       "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_6": {
+      "flake": false,
+      "locked": {
         "lastModified": 1673956053,
         "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
@@ -380,6 +396,28 @@
     "gitignore_4": {
       "inputs": {
         "nixpkgs": [
+          "niri-autoselect-portal",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_5": {
+      "inputs": {
+        "nixpkgs": [
           "prometheus-borg-exporter",
           "pre-commit-hooks-nix",
           "nixpkgs"
@@ -520,6 +558,27 @@
         "url": "https://data.iana.org/time-zones/tzdb/leap-seconds.list"
       }
     },
+    "niri-autoselect-portal": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "pre-commit-hooks": "pre-commit-hooks"
+      },
+      "locked": {
+        "lastModified": 1772483707,
+        "narHash": "sha256-jKHdgwPXWqbLeqOJ7Zc3oEVZdh8Zj/7VytJ7jRKnLbM=",
+        "ref": "refs/heads/main",
+        "rev": "9b55ce56ad7255577b199db9b85c1ff66b0a714a",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://codeberg.org/debugloop/niri-autoselect-portal.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://codeberg.org/debugloop/niri-autoselect-portal.git"
+      }
+    },
     "niri-flake": {
       "inputs": {
         "niri-stable": "niri-stable",
@@ -854,6 +913,22 @@
     },
     "nixpkgs_3": {
       "locked": {
+        "lastModified": 1770073757,
+        "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "47472570b1e607482890801aeaf29bfb749884f6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
         "lastModified": 1770197578,
         "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "NixOS",
@@ -868,7 +943,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1681303793,
         "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
@@ -938,6 +1013,26 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_5",
+        "gitignore": "gitignore_4",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1772024342,
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -1010,10 +1105,10 @@
     },
     "pre-commit-hooks-nix_4": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_6",
         "flake-utils": "flake-utils_2",
-        "gitignore": "gitignore_4",
-        "nixpkgs": "nixpkgs_4",
+        "gitignore": "gitignore_5",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-stable": "nixpkgs-stable_4"
       },
       "locked": {
@@ -1143,12 +1238,13 @@
         "home-manager-eostre": "home-manager-eostre",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
+        "niri-autoselect-portal": "niri-autoselect-portal",
         "niri-flake": "niri-flake",
         "nix-index-database": "nix-index-database",
         "nix-monitored": "nix-monitored",
         "nixVirt": "nixVirt",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-eostre": "nixpkgs-eostre",
         "nixpkgs-pgbackrest": "nixpkgs-pgbackrest",
         "nixpkgs-stable": "nixpkgs-stable_3",
diff --git a/flake.nix b/flake.nix
index db0c6991..73a448ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -224,6 +224,11 @@
 
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    niri-autoselect-portal = {
+      url = "git+https://codeberg.org/debugloop/niri-autoselect-portal.git";
+
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs:
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 2dcf5459..c2f0a4dc 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -628,11 +628,12 @@ in {
     };
 
     environment.sessionVariables."GTK_USE_PORTAL" = "1";
+    services.niri-autoselect-portal.enable = true;
     xdg.portal = {
       enable = true;
       extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
       config.niri = {
-        default = ["gnome" "gtk"];
+        default = lib.mkForce ["gnome" "gtk"];
         "org.freedesktop.impl.portal.FileChooser" = ["gtk"];
         "org.freedesktop.impl.portal.OpenFile" = ["gtk"];
         "org.freedesktop.impl.portal.Access" = ["gtk"];
diff --git a/modules/niri-autoselect-portal.nix b/modules/niri-autoselect-portal.nix
new file mode 100644
index 00000000..df21aaae
--- /dev/null
+++ b/modules/niri-autoselect-portal.nix
@@ -0,0 +1,6 @@
+{ flakeInputs, ... }:
+{
+  imports = [
+    flakeInputs.niri-autoselect-portal.nixosModules.default
+  ];
+}