apps/gui/firefox.nix

@@ -5,10 +5,10 @@
     profiles.default = {
       search = {
         default = "Kagi";
-        privateDefault = "ddg";
+        privateDefault = "DuckDuckGo";
         order = [
           "Kagi"
-          "ddg"
+          "DuckDuckGo"
         ];
         force = true;
         engines = {
@@ -26,7 +26,7 @@
               }
             ];
           };
-          "ddg" = {
+          "DuckDuckGo" = {
             definedAliases = [ "@d" ];
             urls = [
               {
@@ -42,7 +42,7 @@
           };
         };
       };
-      extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
+      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
         bitwarden
         clearurls
         mailvelope
@@ -81,9 +81,7 @@
         "browser.fixup.domainwhitelist.pubserve" = true;
         "browser.fixup.domainwhitelist.privserve" = true;
       };
-      bookmarks = {
+      bookmarks = [
-        force = true;
-        settings = [
         {
           name = "Toolbar";
           toolbar = true;
@@ -275,5 +273,4 @@
       ];
     };
   };
-  };
 }

apps/gui/zed.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  zed-fhs = pkgs.buildFHSEnv {
+  zed-fhs = pkgs.buildFHSUserEnv {
     name = "zed";
     targetPkgs =
       pkgs: with pkgs; [

apps/nogui/jj.nix

@@ -20,7 +20,7 @@
       };
       git.push-bookmark-prefix = "change/";
       signing = {
-        behavior = "own";
+        sign-all = true;
         backend = "ssh";
         key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
       };

machines/common/nogui/default.nix

@@ -43,11 +43,7 @@
   nixpkgs.config.allowUnfree = true;
 
   nix = {
-    gc = {
+    gc.automatic = true;
-      automatic = true;
-      randomizedDelaySec = "15m";
-      options = [ "--delete-older-than 14d" ];
-    };
     optimise.automatic = true;
     package = pkgs.nixVersions.stable;
     settings = {