systems: update nix settings

home/config/nvim/plugins/cmp.fnl

@@ -82,7 +82,7 @@
                                            kind (kind-fn entry vim-item)
                                            strings (vim.split kind.kind "%s"
                                                               {:trimempty true})]
-                                       (set kind.dup 0)
+                                       ;(set kind.dup 0)
                                        (if (= entry.source.name :cmp_tabnine)
                                            (do
                                              (set kind.kind " 󱜚 ")

home/programs/scripts/bdfr

@@ -31,4 +31,13 @@ def "main search" [
   http get $url | ignore
 }
 
+def "main post" [
+  post: string
+] {
+  let reddit_url = $post | url encode
+  let url = $"($base_url)args[link]=($reddit_url)"
+
+  http get $url | ignore
+}
+
 def main [] {}

system/flakes/tanker.nix

@@ -4,12 +4,10 @@ let
   default-system = "x86_64-linux";
 
   # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
-  # overlay-unstable = _: _: { pkgs-unstable = import inputs.nixpkgs { system = default-system; }; };
 
   nixpkgsConfig = {
     overlays = [
       # overlay-master
-      # overlay-unstable
       inputs.neovim-nightly-overlay.overlays.default
       inputs.nifoc-overlay.overlay
     ];

system/hosts/Styx.nix

@@ -24,30 +24,35 @@ in
       experimental-features = [ "nix-command" "flakes" ];
       extra-platforms = [ "x86_64-darwin" ];
 
+      log-lines = 25;
       auto-optimise-store = true;
       keep-derivations = true;
       keep-outputs = true;
 
-      substituters = [
+      builders-use-substitutes = true;
-        "https://attic.cache.daniel.sx/nifoc-systems?priority=1"
+
-        "https://nix-community.cachix.org?priority=2"
+      extra-substituters = [
-        "https://cache.garnix.io?priority=3"
+        "https://attic.cache.daniel.sx/nifoc-systems?priority=30"
+        "https://nix-community.cachix.org?priority=50"
+        "https://cache.garnix.io?priority=60"
       ];
 
-      trusted-substituters = [
+      extra-trusted-substituters = [
         "https://attic.hosting.nedeco.mobi/devshells"
       ];
 
-      trusted-public-keys = [
+      extra-trusted-public-keys = [
         "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
 
-        # trusted-substituters
+        # extra-trusted-substituters
         "devshells:YXtbU0DheB229oCr2D0H0qHjj2Ed/e2VZiLSXgQ1IVA="
       ];
 
       trusted-users = [ "@admin" ];
+
+      connect-timeout = 5;
     };
 
     configureBuildUsers = true;

system/hosts/argon.nix

@@ -48,16 +48,21 @@ in
     package = pkgs.nixVersions.stable;
 
     settings = {
-      auto-optimise-store = true;
+      experimental-features = [ "nix-command" "flakes" ];
 
-      substituters = [
+      log-lines = 25;
-        "https://attic.cache.daniel.sx/nifoc-systems?priority=1"
+      auto-optimise-store = true;
-        "https://attic.cache.daniel.sx/nifoc-ci?priority=2"
+      keep-derivations = true;
-        "https://nix-community.cachix.org?priority=3"
+      keep-outputs = true;
-        "https://cache.garnix.io?priority=4"
+
+      extra-substituters = [
+        "https://attic.cache.daniel.sx/nifoc-systems?priority=30"
+        "https://attic.cache.daniel.sx/nifoc-ci?priority=35"
+        "https://nix-community.cachix.org?priority=50"
+        "https://cache.garnix.io?priority=60"
       ];
 
-      trusted-public-keys = [
+      extra-trusted-public-keys = [
         "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
         "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
@@ -68,6 +73,8 @@ in
         "root"
         "nix-remote-builder"
       ];
+
+      connect-timeout = 5;
     };
 
     gc = {
@@ -75,12 +82,6 @@ in
       dates = "weekly";
       options = "--delete-older-than 14d";
     };
-
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      keep-derivations = true
-      keep-outputs = true
-    '';
   };
 
   environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc;

system/hosts/mediaserver.nix

@@ -58,16 +58,22 @@ in
     package = pkgs.nixVersions.stable;
 
     settings = {
-      auto-optimise-store = true;
+      experimental-features = [ "nix-command" "flakes" ];
+      extra-platforms = [ "aarch64-linux" ];
 
-      substituters = [
+      log-lines = 25;
-        "https://attic.cache.daniel.sx/nifoc-systems?priority=1"
+      auto-optimise-store = true;
-        "https://attic.cache.daniel.sx/nifoc-ci?priority=2"
+      keep-derivations = true;
-        "https://nix-community.cachix.org?priority=3"
+      keep-outputs = true;
-        "https://cache.garnix.io?priority=4"
+
+      extra-substituters = [
+        "https://attic.cache.daniel.sx/nifoc-systems?priority=30"
+        "https://attic.cache.daniel.sx/nifoc-ci?priority=35"
+        "https://nix-community.cachix.org?priority=50"
+        "https://cache.garnix.io?priority=60"
       ];
 
-      trusted-public-keys = [
+      extra-trusted-public-keys = [
         "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
         "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
@@ -78,6 +84,8 @@ in
         "root"
         "nix-remote-builder"
       ];
+
+      connect-timeout = 5;
     };
 
     gc = {
@@ -85,13 +93,6 @@ in
       dates = "weekly";
       options = "--delete-older-than 14d";
     };
-
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      extra-platforms = aarch64-linux
-      keep-derivations = true
-      keep-outputs = true
-    '';
   };
 
   environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc;

system/hosts/neon.nix

@@ -36,21 +36,28 @@ in
     package = pkgs.nixVersions.stable;
 
     settings = {
-      auto-optimise-store = true;
+      experimental-features = [ "nix-command" "flakes" ];
 
-      substituters = [
+      log-lines = 25;
-        "https://attic.cache.daniel.sx/nifoc-systems?priority=1"
+      auto-optimise-store = true;
-        "https://attic.cache.daniel.sx/nifoc-ci?priority=2"
+      keep-derivations = true;
-        "https://nix-community.cachix.org?priority=3"
+      keep-outputs = true;
-        "https://cache.garnix.io?priority=4"
+
+      extra-substituters = [
+        "https://attic.cache.daniel.sx/nifoc-systems?priority=30"
+        "https://attic.cache.daniel.sx/nifoc-ci?priority=35"
+        "https://nix-community.cachix.org?priority=50"
+        "https://cache.garnix.io?priority=60"
       ];
 
-      trusted-public-keys = [
+      extra-trusted-public-keys = [
         "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
         "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
       ];
+
+      connect-timeout = 5;
     };
 
     gc = {
@@ -58,12 +65,6 @@ in
       dates = "weekly";
       options = "--delete-older-than 14d";
     };
-
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      keep-derivations = true
-      keep-outputs = true
-    '';
   };
 
   environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc;

system/hosts/tanker.nix

@@ -66,21 +66,29 @@ in
     package = pkgs.nixVersions.stable;
 
     settings = {
-      auto-optimise-store = true;
+      experimental-features = [ "nix-command" "flakes" ];
+      extra-platforms = [ "aarch64-linux" ];
 
-      substituters = [
+      log-lines = 25;
-        "https://attic.cache.daniel.sx/nifoc-systems?priority=1"
+      auto-optimise-store = true;
-        "https://attic.cache.daniel.sx/nifoc-ci?priority=2"
+      keep-derivations = true;
-        "https://nix-community.cachix.org?priority=3"
+      keep-outputs = true;
-        "https://cache.garnix.io?priority=4"
+
+      extra-substituters = [
+        "https://attic.cache.daniel.sx/nifoc-systems?priority=30"
+        "https://attic.cache.daniel.sx/nifoc-ci?priority=35"
+        "https://nix-community.cachix.org?priority=50"
+        "https://cache.garnix.io?priority=60"
       ];
 
-      trusted-public-keys = [
+      extra-trusted-public-keys = [
         "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
         "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
       ];
+
+      connect-timeout = 5;
     };
 
     gc = {
@@ -88,13 +96,6 @@ in
       dates = "weekly";
       options = "--delete-older-than 14d";
     };
-
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      extra-platforms = aarch64-linux
-      keep-derivations = true
-      keep-outputs = true
-    '';
   };
 
   boot = {

system/nixos/mastodon.nix

@@ -11,8 +11,8 @@ let
         tangerine-ui = pkgs.fetchFromGitHub {
           owner = "nileane";
           repo = "TangerineUI-for-Mastodon";
-          rev = "v1.9.4";
+          rev = "v1.9.5";
-          hash = "sha256-ejAmITS4DKeaLetcqZr8LEhLdlDUkKwKXlG7rY1PN1E=";
+          hash = "sha256-PXcQZ6MQVfqVk/h39aJqWBi0V7jfqVHK0y4gLfG+UdE=";
         };
       in
       {