Merge branch 'main' of codeberg.org:muon/home

modules/home/desktop/social.nix

@@ -1,8 +1,13 @@
-{ pkgs, lib, config, sources, ... }:
-let
-  vesktop-nogain = (pkgs.vesktop.overrideAttrs (previousAttrs: {
-    patches = previousAttrs.patches ++ [ sources."vesktop.micfix".src ];
-  }));
+{
+  pkgs,
+  lib,
+  config,
+  sources,
+  ...
+}: let
+  vesktop-nogain = pkgs.vesktop.overrideAttrs (previousAttrs: {
+    patches = previousAttrs.patches ++ [sources."vesktop.micfix".src];
+  });
 in {
   options.mods.social.enable =
     lib.mkEnableOption "enables social media clients";

modules/nixos/core/network.nix

@@ -33,12 +33,13 @@ in
       networking.networkmanager.enable = true;
       # networking.nameservers = [ "45.90.28.97" "45.90.30.97" ];
       networking.nameservers = ["194.242.2.4#base.dns.mullvad.net"];
+      # networking.enableIPv6 = false;
       # services.resolved = {
       #   enable = true;
       #   dnssec = "false";
       #   dnsovertls = "true";
-      #   domains = [ "~." ];
-      #   fallbackDns = [ "194.242.2.4#base.dns.mullvad.net" ];
+      #   domains = ["~."];
+      #   fallbackDns = ["194.242.2.4#base.dns.mullvad.net"];
       # };
 
       # udev 250 doesn't reliably reinitialize devices after restart

modules/nixos/default.nix

@@ -11,6 +11,7 @@
     ./server
     ./sops
     ./security
+    ./flatpak
 
     ./impermanence.nix
 

modules/nixos/flatpak/default.nix

@@ -0,0 +1,26 @@
+{
+  pkgs,
+  config,
+  inputs,
+  lib,
+  ...
+}: let
+  cfg = config.mods.flatpak;
+in
+  with lib; {
+    options.mods.flatpak.enable =
+      mkEnableOption "enables flatpak programs";
+
+    imports = [
+      inputs.nix-flatpak.nixosModules.nix-flatpak
+      ./stremio.nix
+    ];
+
+    config = mkIf cfg.enable {
+      services.flatpak.enable = true;
+      xdg.portal.enable = true;
+      xdg.portal.extraPortals = [
+        pkgs.xdg-desktop-portal
+      ];
+    };
+  }

modules/nixos/flatpak/stremio.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.mods.flatpak.stremio;
+in
+  with lib; {
+    options.mods.flatpak.stremio.enable =
+      mkEnableOption "enables stremio flatpak";
+
+    config = mkIf cfg.enable {
+      services.flatpak.packages = [
+        {
+          appId = "com.stremio.Stremio";
+          origin = "flathub";
+        }
+      ];
+    };
+  }