meep

flake.lock

@@ -857,6 +857,22 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1739444422,
+        "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "latest",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nix-gaming": {
       "inputs": {
         "flake-parts": [
@@ -1273,6 +1289,7 @@
         "neorg-overlay": "neorg-overlay",
         "nh": "nh",
         "niri": "niri",
+        "nix-flatpak": "nix-flatpak",
         "nix-gaming": "nix-gaming",
         "nix-index-database": "nix-index-database",
         "nix-std": "nix-std_2",
@@ -1296,7 +1313,8 @@
         "systems": "systems",
         "tree": "tree",
         "treefmt-nix": "treefmt-nix",
-        "wezterm": "wezterm"
+        "wezterm": "wezterm",
+        "zen-browser": "zen-browser"
       }
     },
     "rust": {
@@ -1581,6 +1599,26 @@
         "type": "github"
       }
     },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1727721329,
+        "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=",
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "rev": "e6ab73f405e9a2896cce5956c549a9cc359e5fcc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MarceColl",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
+    },
     "zlib": {
       "flake": false,
       "locked": {

flake.nix

@@ -8,6 +8,9 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+    nix-flatpak = {
+      url = "github:gmodena/nix-flatpak/?ref=latest";
+    };
     rust = {
       url = "github:arcnmx/nixexprs-rust";
       inputs = {
@@ -76,6 +79,10 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+    zen-browser = {
+      url = "github:MarceColl/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nixpkgs-xr = {
       url = "github:nix-community/nixpkgs-xr";
       inputs = {

home/environments/niri/niri.nix

@@ -15,6 +15,7 @@ in {
     grim
     pavucontrol
     brightnessctl
+    nautilus
     playerctl
     glib
     pcmanfm
@@ -85,7 +86,7 @@ in {
       environment = {
         MOZ_ENABLE_WAYLAND = "1";
         XDG_CURRENT_DESKTOP = "niri";
-        GDK_BACKEND = "wayland,x11";
+        GDK_BACKEND = "wayland";
         CLUTTER_BACKEND = "wayland";
       };
       xwayland-satellite = {

home/environments/niri/xdg.nix

@@ -1,8 +1,13 @@
-_: {
+{ pkgs, ... }: {
   xdg = {
     enable = true;
     autostart.enable = true;
     mime.enable = true;
+    portal.extraPortals = with pkgs; [
+      xdg-desktop-portal-gnome
+      xdg-desktop-portal-gtk
+      gnome-keyring
+    ];
 
     mimeApps = {
       enable = true;

home/profiles/shell/zsh.nix

@@ -14,7 +14,8 @@ in {
     # programs.zsh.enableAutosuggestions only includes nix-zsh-autocompletions
     zsh-completions
     fortune
-    neofetch
+    hyfetch
+    fastfetch
     ponysay
   ];
 

nixos/profiles/gaming/bottles.nix

@@ -0,0 +1,8 @@
+_: {
+  services.flatpak.packages = [
+    {
+      appId = "com.usebottles.bottles";
+      origin = "flathub";
+    }
+  ];
+}

nixos/profiles/gaming/lutris.nix

@@ -5,7 +5,6 @@
       driversi686Linux.mesa
     ];
   };
-  services.flatpak.enable = true;
   programs.gamescope = {
     enable = true;
     package = pkgs.gamescope;

nixos/profiles/graphical/flatpak.nix

@@ -0,0 +1,20 @@
+_: {
+  home-manager.sharedModules = [
+    ({ config, ... }: {
+      xdg.systemDirs.data = [
+        "/var/lib/flatpak/exports/share"
+        "/home/${config.home.username}/.local/share/flatpak/exports/share/"
+      ];
+    })
+  ];
+  services.flatpak = {
+    enable = true;
+    update.auto = {
+      enable = true;
+      onCalendar = "weekly";
+    };
+    remotes = [
+      { name = "flathub"; location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; }
+    ];
+  };
+}

tree.nix

@@ -92,6 +92,7 @@
           inputs.niri.nixosModules.niri
           inputs.lix-module.nixosModules.default
           inputs.nixos-cli.nixosModules.nixos-cli
+          inputs.nix-flatpak.nixosModules.nix-flatpak
         ];
       };
     };
@@ -115,6 +116,7 @@
             chaotic.homeManagerModules.default
             spicetify-nix.homeManagerModules.spicetify
             inputs.moonlight.homeModules.default
+            inputs.nix-flatpak.homeManagerModules.nix-flatpak
           ]
           ++ (with (import (inputs.arcexprs + "/modules")).home-manager; [
             i3gopher