Update from update-inputs-2024-09-27-04-20

flake.lock

@@ -155,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727249977,
-        "narHash": "sha256-lAqOCDI4B6hA+t+KHSm/Go8hQF/Ob5sgXaIRtMAnMKw=",
+        "lastModified": 1727359191,
+        "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "c1c472f4cd91e4b0703e02810a8c7ed30186b6fa",
+        "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700",
         "type": "github"
       },
       "original": {
@@ -521,11 +521,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727246346,
-        "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=",
+        "lastModified": 1727383923,
+        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb",
+        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
         "type": "github"
       },
       "original": {
@@ -874,11 +874,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1726937504,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "lastModified": 1727122398,
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
         "type": "github"
       },
       "original": {
@@ -905,11 +905,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1727286212,
-        "narHash": "sha256-iab+k8m6+MBkwQoyqMcMYggwILHCkMSkgNYd1GN0FbM=",
+        "lastModified": 1727402188,
+        "narHash": "sha256-AxZVGgsWBDbhO1JVrYoHWG2IW5Se8JjJhC93Yfst4AM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7bda0f1ce49e9da252bcee20b5f700e6dcd3cf8d",
+        "rev": "cb2b76c1a9ec067ed0c449080f4973fecf8532ef",
         "type": "github"
       },
       "original": {
@@ -1019,11 +1019,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1727218376,
-        "narHash": "sha256-vRYd45uOqzXDaSt8M50hLcsBqIWbEMsflfHk/a1nYA8=",
+        "lastModified": 1727362643,
+        "narHash": "sha256-Ceiq/aYjRlRBU677lBaemn8ZU2Jpr08Iso6UlBc9nFc=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "cf8b6e2d4e8aca8ef14b839a906ab5eb98b08561",
+        "rev": "e3eb7fdf8d129ff3676dfbc84ee1262322ca6fb4",
         "type": "github"
       },
       "original": {
@@ -1170,11 +1170,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726734507,
-        "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=",
+        "lastModified": 1727252110,
+        "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f",
+        "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3",
         "type": "github"
       },
       "original": {

modules/graphical/hyprland.nix

@@ -119,7 +119,7 @@
           #"eDP-1, 2560x1600@60, 0x0, 1, bitdepth, 10"
           #"eDP-1, 1920x1200@60, 0x0, 1, bitdepth, 10"
           "desc:Dell Inc. AW3225QF FXK2YZ3, 3840x2160@240,5280x0,1, bitdepth,10, vrr,2"
-          "desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455, 2560x1440@144,3840x-350,1, bitdepth,10, transform,1"
+          "desc:GIGA-BYTE TECHNOLOGY CO. LTD. AORUS AD27QD 19320B000455, 2560x1440@144,3840x-280,1, bitdepth,10, transform,1"
           ",preferred,auto,1"
         ];
         workspace = [

modules/librespeed/default.nix

@@ -107,10 +107,10 @@ in {
       '';
       default = {};
       type = with types; nullOr (attrsOf (oneOf [
-        bool
+        (nullOr bool)
         int
         str
-        null
+        package
       ]));
     };
   };
@@ -153,14 +153,15 @@ in {
       assets = pkgs.runCommand "librespeed-assets" {
         preferLocal = true;
 
-        serverList = ''
+        serversList = ''
           function get_servers() {
             return ${builtins.toJSON cfg.servers}
           }
         '';
       } ''
         cp -r ${pkgs.librespeed-rust}/assets $out
-        cat >$out/server_list.js <<<"$serverList"
+        chmod 666 $out/servers_list.js
+        cat >$out/servers_list.js <<<"$serversList"
         substitute ${pkgs.librespeed-rust}/assets/index.html $out/index.html \
           --replace-fail "LibreSpeed Example" ${lib.escapeShellArg (lib.escapeXML cfg.pageTitle)} \
           --replace-fail "PUT@YOUR_EMAIL.HERE" ${lib.escapeShellArg (lib.escapeXML cfg.contactEmail)} \
@@ -173,8 +174,6 @@ in {
       base_url = mkDefault "backend";
       worker_threads = mkDefault "auto";
 
-      database_type = mkDefault "none";
-      database_file = mkIf (cfg.settings.database_type == "sqlite") mkDefault "/var/lib/librespeed/speedtest.sqlite";
 
       #librespeed-rust will fail to start if the following config parameters are omitted.
       ipinfo_api_key = mkIf (!cfg.secrets ? "ipinfo_api_key") "";
@@ -183,11 +182,14 @@ in {
       tls_cet_file = mkDefault "";
 
       enable_tls = mkDefault false;
+    } // rec {
+      database_type = mkDefault "none";
+      database_file = mkIf (database_type == "sqlite") "/var/lib/librespeed/speedtest.sqlite";
     };
 
     systemd.services = let
       configFile = let
-        anyToString = arg: if (lib.isBool arg) then
+        mapValue = arg: if (lib.isBool arg) then
           lib.boolToString arg
         else if (lib.isInt arg) then
           toString arg
@@ -195,8 +197,9 @@ in {
       in
         with lib; pipe cfg.settings [
           (filterAttrs (_: val: val != null))
-          (mapAttrs (name: val: "${path}=${anyToString val}"))
-          (concatLines attrValues)
+          (mapAttrs (name: val: "${name}=${mapValue val}"))
+          (attrValues)
+          (concatLines)
           (pkgs.writeText "${cfg.package.name}-config.toml")
       ];
     in {

pkgs/librespeed-rust/default.nix

@@ -32,5 +32,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/librespeed/speedtest-rust";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ snaki ];
+    mainProgram = "librespeed-rs";
   };
 }