2024-08-03

5 files changed, 57 insertions, 14 deletions

diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix
index ca20140..29f1adc 100644
--- a/configurations/eonwe/default.nix
+++ b/configurations/eonwe/default.nix
@@ -15,7 +15,10 @@ with lib;
 
     syncthing.enable = true;
 
-    openssh.server.enable = true;
+    openssh.server = {
+      enable = true;
+      port = 22;
+    };
 
     android.enable = true;
     beets.enable = true;
@@ -294,4 +297,18 @@ with lib;
     enable = true;
     memoryPercent = 25;
   };
+
+  users = {
+    users.builder = {
+      isSystemUser = true;
+      group = "builder";
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzclJfd2n0POaFlYuSRK40JddtS+PYIpFyTz2BY94Wb root@ilmare"
+      ];
+      useDefaultShell = true;
+    };
+    groups.builder = { };
+  };
+
+  nix.settings.trusted-users = [ "builder" ];
 }
diff --git a/configurations/ilmare/default.nix b/configurations/ilmare/default.nix
index 1e9f5ff..a1b5007 100644
--- a/configurations/ilmare/default.nix
+++ b/configurations/ilmare/default.nix
@@ -123,4 +123,28 @@ _: {
     enable = true;
     memoryPercent = 100;
   };
+
+  nix = {
+    buildMachines = [
+      {
+        hostName = "eonwe.shire.net";
+
+        protocol = "ssh-ng";
+        sshUser = "builder";
+        sshKey = "/root/.ssh/id_ed25519";
+
+        system = "x86_64-linux";
+        supportedFeatures = [
+          "nixos-test"
+          "benchmark"
+          "big-parallel"
+          "kvm"
+        ];
+      }
+    ];
+
+    distributedBuilds = true;
+
+    settings.builders-use-substitutes = true;
+  };
 }
diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix
index 70312f0..7537d60 100644
--- a/modules/firefox/addons.nix
+++ b/modules/firefox/addons.nix
@@ -2,10 +2,10 @@
 {
   "bitwarden" = buildFirefoxXpiAddon {
     pname = "bitwarden";
-    version = "2024.6.3";
+    version = "2024.7.1";
     addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4307738/bitwarden_password_manager-2024.6.3.xpi";
-    sha256 = "d3c052e66a9daa390707c4481ec50c09bc3b6253cb222792c9a55aa4b5f4045a";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4326285/bitwarden_password_manager-2024.7.1.xpi";
+    sha256 = "28c505df3b615f6a3c829afdcff74584ddc5eb1d3fb35f9848c18470fad93772";
     meta = with lib; {
       homepage = "https://bitwarden.com";
       description = "At home, at work, or on the go, Bitwarden easily secures all your passwords, passkeys, and sensitive information.";
@@ -20,6 +20,7 @@
         "clipboardRead"
         "clipboardWrite"
         "idle"
+        "alarms"
         "webRequest"
         "webRequestBlocking"
         "webNavigation"
@@ -119,10 +120,10 @@
   };
   "languagetool" = buildFirefoxXpiAddon {
     pname = "languagetool";
-    version = "8.10.4";
+    version = "8.11.2";
     addonId = "languagetool-webextension@languagetool.org";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4317259/languagetool-8.10.4.xpi";
-    sha256 = "cf5fed5704ac8b6d4052fcf5819d1aa46ee61c76811393a7e355064baa32679c";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4329853/languagetool-8.11.2.xpi";
+    sha256 = "bfac73229d0973370d163cd607ed36ada0aff46d597afee2c334cc58ec431210";
     meta = with lib; {
       homepage = "https://languagetool.org";
       description = "With this extension you can check text with the free style and grammar checker LanguageTool. It finds many errors that a simple spell checker cannot detect, like mixing up there/their, a/an, or repeating a word.";
@@ -183,10 +184,10 @@
   };
   "rikaichamp" = buildFirefoxXpiAddon {
     pname = "rikaichamp";
-    version = "1.19.1";
+    version = "1.20.0";
     addonId = "{59812185-ea92-4cca-8ab7-cfcacee81281}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4299897/10ten_ja_reader-1.19.1.xpi";
-    sha256 = "e7e6ac877da00a8b08b68f265665a6317febdbb692350031fb133fcc2e92dd88";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4325631/10ten_ja_reader-1.20.0.xpi";
+    sha256 = "25215fe0211f2e01b5f7b75a3311214eb647999e48e4a77268e36e5ccc4efbd2";
     meta = with lib; {
       homepage = "https://github.com/birchill/10ten-ja-reader/";
       description = "Quickly translate Japanese by hovering over words. Formerly released as Rikaichamp.";
@@ -228,10 +229,10 @@
   };
   "ublock-origin" = buildFirefoxXpiAddon {
     pname = "ublock-origin";
-    version = "1.58.0";
+    version = "1.59.0";
     addonId = "uBlock0@raymondhill.net";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi";
-    sha256 = "470c56994a7174db21578adce598b158a5dc0970c87c5cfe889ac632bd3085ea";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59.0.xpi";
+    sha256 = "1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14";
     meta = with lib; {
       homepage = "https://github.com/gorhill/uBlock#ublock-origin";
       description = "Finally, an efficient wide-spectrum content blocker. Easy on CPU and memory.";
diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index 79c7320..b05443b 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -270,7 +270,7 @@ in
 
                   "Kubernetes" = {
                     urls = [ { template = "https://kubernetes.io/search/?q={searchTerms}"; } ];
-                    icon = getIcon "https://kubernetes.io/images/favicon.png" "sha256-YI5QvGQXoaTG3uUGQ/R99Xl2r+VqBAA1qqthzPbf8nQ=";
+                    icon = getIcon "https://kubernetes.io/images/kubernetes.png" "sha256-YI5QvGQXoaTG3uUGQ/R99Xl2r+VqBAA1qqthzPbf8nQ=";
                     definedAliases = [
                       "@kubernetes"
                       "@k8s"
diff --git a/modules/soju.nix b/modules/soju.nix
index c64b89e..58bb271 100644
--- a/modules/soju.nix
+++ b/modules/soju.nix
@@ -97,6 +97,7 @@ in
                     "sslmode=disable"
                   ]
                 }"
+                message-store db
                 hostname ${cfg.domain}
                 title ${cfg.domain}
               '';