Too much stuff

hmModules/digikam/default.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = [pkgs.digikam];
+}

hmModules/emacs/default.nix

@@ -3,20 +3,81 @@
   config,
   lib,
   ...
-}: {
-  programs.emacs = {
-    enable = true;
-    package = lib.mkForce (pkgs.emacs28NativeComp.override {
-      # FIXME `mkForce` shouldn't be needed
+}: let
+  rev = "72a94f91fd0570556ce770dc3a39e658f7588f7e"; # Current master, Emacs 29, seems a good commit
+  sha256 = "e5kKIEZJB9BGbBvGtiPK3gNygFoGxkG02nRLCwnGtmk=";
+  emacsMaster =
+    (pkgs.emacs.override {
       nativeComp = true;
+      withPgtk = true;
       withSQLite3 = true;
       withGTK3 = true;
+    })
+    .overrideAttrs (old: {
+      src = pkgs.fetchFromSavannah {
+        repo = "emacs";
+        inherit rev sha256;
+      };
+      version = rev;
+      patches = [];
+      postPatch =
+        old.postPatch
+        + ''
+          substituteInPlace lisp/loadup.el \
+          --replace '(emacs-repository-get-version)' '"${rev}"' \
+          --replace '(emacs-repository-get-branch)' '"master"'
+        ''
+        + (lib.optionalString (old ? NATIVE_FULL_AOT)
+        # TODO: remove when https://github.com/NixOS/nixpkgs/pull/193621 is merged
+        (
+          let
+            backendPath =
+              lib.concatStringsSep " "
+              (builtins.map (x: ''\"-B${x}\"'') [
+                # Paths necessary so the JIT compiler finds its libraries:
+                "${lib.getLib pkgs.libgccjit}/lib"
+                "${lib.getLib pkgs.libgccjit}/lib/gcc"
+                "${lib.getLib pkgs.stdenv.cc.libc}/lib"
+
+                # Executable paths necessary for compilation (ld, as):
+                "${lib.getBin pkgs.stdenv.cc.cc}/bin"
+                "${lib.getBin pkgs.stdenv.cc.bintools}/bin"
+                "${lib.getBin pkgs.stdenv.cc.bintools.bintools}/bin"
+              ]);
+          in ''
+            substituteInPlace lisp/emacs-lisp/comp.el --replace \
+              "(defcustom comp-libgccjit-reproducer nil" \
+              "(setq native-comp-driver-options '(${backendPath})) (defcustom comp-libgccjit-reproducer nil"
+          ''
+        ));
     });
+in {
+  programs.emacs = {
+    enable = true;
   };
 
   programs.doom-emacs = {
     enable = true;
+    emacsPackage = emacsMaster;
     doomPrivateDir = ../../doom.d;
+    doomPackageDir = pkgs.linkFarm "my-doom-packages" [
+      {
+        name = "config.el";
+        path = ../../doom.d/config.el;
+      }
+      {
+        name = "init.el";
+        path = ../../doom.d/init.el;
+      }
+      {
+        name = "packages.el";
+        path = ../../doom.d/packages.el;
+      }
+      {
+        name = "modules";
+        path = ../../doom.d/modules;
+      }
+    ];
   };
 
   services.emacs = {

hmModules/firefox/default.nix

@@ -1,6 +1,12 @@
 {pkgs, ...}: {
   programs.firefox = {
     enable = true;
+    package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
+      forceWayland = true;
+      extraPolicies = {
+        ExtensionSettings = {};
+      };
+    };
     profiles.ccr = {
       settings = {
         "browser.startup.homepage" = "https://google.it";
@@ -15,4 +21,9 @@
       };
     };
   };
+  home.sessionVariables = {
+    MOZ_ENABLE_WAYLAND = 1;
+    XDG_CURRENT_DESKTOP = "sway";
+    NIXOS_OZONE_WL = 1;
+  };
 }