summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_sources/generated.json20
-rw-r--r--_sources/generated.nix20
-rw-r--r--flake.lock36
-rw-r--r--hosts/surtr/http/default.nix1
-rw-r--r--hosts/vidhar/default.nix3
-rw-r--r--hosts/vidhar/network/default.nix6
-rw-r--r--overlays/prometheus-lvm-exporter.nix2
-rw-r--r--overlays/spm/server/Spm/Server.hs4
-rw-r--r--system-profiles/networkmanager.nix2
9 files changed, 50 insertions, 44 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index d3b81268..eeb61f3e 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -41,7 +41,7 @@
41 }, 41 },
42 "etebase-py": { 42 "etebase-py": {
43 "cargoLocks": null, 43 "cargoLocks": null,
44 "date": "2022-07-06", 44 "date": "2022-12-11",
45 "extract": null, 45 "extract": null,
46 "name": "etebase-py", 46 "name": "etebase-py",
47 "passthru": null, 47 "passthru": null,
@@ -53,11 +53,11 @@
53 "name": null, 53 "name": null,
54 "owner": "etesync", 54 "owner": "etesync",
55 "repo": "etebase-py", 55 "repo": "etebase-py",
56 "rev": "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445", 56 "rev": "2f65a4120b28776cc376572ebc67d6b824e72464",
57 "sha256": "sha256-OSzOoL7o4rWYOK1OyxfpslOnNfnK5CKhdhiFEXz/WvY=", 57 "sha256": "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q=",
58 "type": "github" 58 "type": "github"
59 }, 59 },
60 "version": "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445" 60 "version": "2f65a4120b28776cc376572ebc67d6b824e72464"
61 }, 61 },
62 "lesspipe": { 62 "lesspipe": {
63 "cargoLocks": null, 63 "cargoLocks": null,
@@ -231,11 +231,11 @@
231 "pinned": false, 231 "pinned": false,
232 "src": { 232 "src": {
233 "name": null, 233 "name": null,
234 "sha256": "sha256-bytPqK2kvDrskbvmyybejUr1+RU6YdOgzmtqbKyfSNA=", 234 "sha256": "sha256-72pxbPjmhK/SQTNkv2RMUhsuGKFWs12KRQPMrE++Ek4=",
235 "type": "url", 235 "type": "url",
236 "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.1.tar.gz" 236 "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.2.tar.gz"
237 }, 237 },
238 "version": "0.3.1" 238 "version": "0.3.2"
239 }, 239 },
240 "psql-versioning": { 240 "psql-versioning": {
241 "cargoLocks": null, 241 "cargoLocks": null,
@@ -280,11 +280,11 @@
280 "pinned": false, 280 "pinned": false,
281 "src": { 281 "src": {
282 "name": null, 282 "name": null,
283 "sha256": "sha256-vf59Z23DSFQrzVk9VnpZZdUWgPOUgxNPnPoUJc8Kt2E=", 283 "sha256": "sha256-MlxC7sAP1ehFKHFCRg7vhjMY0VODkEqKyJxrDtTZCHQ=",
284 "type": "url", 284 "type": "url",
285 "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.1/UHK.Agent-2.0.1-linux-x86_64.AppImage" 285 "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.2/UHK.Agent-2.0.2-linux-x86_64.AppImage"
286 }, 286 },
287 "version": "2.0.1" 287 "version": "2.0.2"
288 }, 288 },
289 "v4l2loopback": { 289 "v4l2loopback": {
290 "cargoLocks": null, 290 "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 89857492..564f6cc4 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -29,15 +29,15 @@
29 }; 29 };
30 etebase-py = { 30 etebase-py = {
31 pname = "etebase-py"; 31 pname = "etebase-py";
32 version = "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445"; 32 version = "2f65a4120b28776cc376572ebc67d6b824e72464";
33 src = fetchFromGitHub ({ 33 src = fetchFromGitHub ({
34 owner = "etesync"; 34 owner = "etesync";
35 repo = "etebase-py"; 35 repo = "etebase-py";
36 rev = "ac3e5138a2e18dc11f77d9a75f07d4b8dd8c4445"; 36 rev = "2f65a4120b28776cc376572ebc67d6b824e72464";
37 fetchSubmodules = false; 37 fetchSubmodules = false;
38 sha256 = "sha256-OSzOoL7o4rWYOK1OyxfpslOnNfnK5CKhdhiFEXz/WvY="; 38 sha256 = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q=";
39 }); 39 });
40 date = "2022-07-06"; 40 date = "2022-12-11";
41 }; 41 };
42 lesspipe = { 42 lesspipe = {
43 pname = "lesspipe"; 43 pname = "lesspipe";
@@ -138,10 +138,10 @@
138 }; 138 };
139 prometheus-lvm-exporter = { 139 prometheus-lvm-exporter = {
140 pname = "prometheus-lvm-exporter"; 140 pname = "prometheus-lvm-exporter";
141 version = "0.3.1"; 141 version = "0.3.2";
142 src = fetchurl { 142 src = fetchurl {
143 url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.1.tar.gz"; 143 url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.3.2.tar.gz";
144 sha256 = "sha256-bytPqK2kvDrskbvmyybejUr1+RU6YdOgzmtqbKyfSNA="; 144 sha256 = "sha256-72pxbPjmhK/SQTNkv2RMUhsuGKFWs12KRQPMrE++Ek4=";
145 }; 145 };
146 }; 146 };
147 psql-versioning = { 147 psql-versioning = {
@@ -167,10 +167,10 @@
167 }; 167 };
168 uhk-agent = { 168 uhk-agent = {
169 pname = "uhk-agent"; 169 pname = "uhk-agent";
170 version = "2.0.1"; 170 version = "2.0.2";
171 src = fetchurl { 171 src = fetchurl {
172 url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.1/UHK.Agent-2.0.1-linux-x86_64.AppImage"; 172 url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v2.0.2/UHK.Agent-2.0.2-linux-x86_64.AppImage";
173 sha256 = "sha256-vf59Z23DSFQrzVk9VnpZZdUWgPOUgxNPnPoUJc8Kt2E="; 173 sha256 = "sha256-MlxC7sAP1ehFKHFCRg7vhjMY0VODkEqKyJxrDtTZCHQ=";
174 }; 174 };
175 }; 175 };
176 v4l2loopback = { 176 v4l2loopback = {
diff --git a/flake.lock b/flake.lock
index e73b3e25..840452c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,11 +80,11 @@
80 "utils": "utils_2" 80 "utils": "utils_2"
81 }, 81 },
82 "locked": { 82 "locked": {
83 "lastModified": 1668900402, 83 "lastModified": 1671335968,
84 "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=", 84 "narHash": "sha256-V7mjlh7brp70elokmml6XzHinpTilkQJjiYIGjEmSGs=",
85 "owner": "nix-community", 85 "owner": "nix-community",
86 "repo": "home-manager", 86 "repo": "home-manager",
87 "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44", 87 "rev": "37713c6b04b963d41664e03576f73a18c9b0d224",
88 "type": "github" 88 "type": "github"
89 }, 89 },
90 "original": { 90 "original": {
@@ -133,11 +133,11 @@
133 }, 133 },
134 "nixpkgs": { 134 "nixpkgs": {
135 "locked": { 135 "locked": {
136 "lastModified": 1668935927, 136 "lastModified": 1671400963,
137 "narHash": "sha256-N+ixZEWNw4YduHgj1egfUV6hlMeEi0TcWMMjU+jQU2Y=", 137 "narHash": "sha256-mJGp4Ys5lfxZkoxsiCgp97Atvplr1V5o+aLd19tE1WE=",
138 "owner": "NixOS", 138 "owner": "NixOS",
139 "repo": "nixpkgs", 139 "repo": "nixpkgs",
140 "rev": "713ec3b98fde68ef79544fa5293665a5b227fbdc", 140 "rev": "ba46d30d1f9a636f46fb7877008140984f5e7b75",
141 "type": "github" 141 "type": "github"
142 }, 142 },
143 "original": { 143 "original": {
@@ -147,18 +147,18 @@
147 "type": "github" 147 "type": "github"
148 } 148 }
149 }, 149 },
150 "nixpkgs-22_05": { 150 "nixpkgs-stable": {
151 "locked": { 151 "locked": {
152 "lastModified": 1668908668, 152 "lastModified": 1670146390,
153 "narHash": "sha256-oimCE4rY7Btuo/VYmA8khIyTHSMV7qUWTpz9w8yc9LQ=", 153 "narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=",
154 "owner": "NixOS", 154 "owner": "NixOS",
155 "repo": "nixpkgs", 155 "repo": "nixpkgs",
156 "rev": "b68a6a27adb452879ab66c0eaac0c133e32823b2", 156 "rev": "86370507cb20c905800527539fc049a2bf09c667",
157 "type": "github" 157 "type": "github"
158 }, 158 },
159 "original": { 159 "original": {
160 "owner": "NixOS", 160 "owner": "NixOS",
161 "ref": "release-22.05", 161 "ref": "release-22.11",
162 "repo": "nixpkgs", 162 "repo": "nixpkgs",
163 "type": "github" 163 "type": "github"
164 } 164 }
@@ -191,11 +191,11 @@
191 "pypi-deps-db": { 191 "pypi-deps-db": {
192 "flake": false, 192 "flake": false,
193 "locked": { 193 "locked": {
194 "lastModified": 1668931723, 194 "lastModified": 1670518748,
195 "narHash": "sha256-PYs7AOk+gFFhvAtuxG7GEN+MFH2drdv0Lowf/ZE9G2k=", 195 "narHash": "sha256-pfUce0zlRI+tzxPgvRSKkusjxDCBVjCpkcDKWboHa+U=",
196 "owner": "DavHau", 196 "owner": "DavHau",
197 "repo": "pypi-deps-db", 197 "repo": "pypi-deps-db",
198 "rev": "ff0e0f855d8560b7f094a58f4d22029d6379ba1c", 198 "rev": "e9571cac25d2f509e44fec9dc94a3703a40126ff",
199 "type": "github" 199 "type": "github"
200 }, 200 },
201 "original": { 201 "original": {
@@ -222,14 +222,14 @@
222 "nixpkgs": [ 222 "nixpkgs": [
223 "nixpkgs" 223 "nixpkgs"
224 ], 224 ],
225 "nixpkgs-22_05": "nixpkgs-22_05" 225 "nixpkgs-stable": "nixpkgs-stable"
226 }, 226 },
227 "locked": { 227 "locked": {
228 "lastModified": 1668915833, 228 "lastModified": 1670149631,
229 "narHash": "sha256-7VYPiDJZdGct8Nl3kKhg580XZfoRcViO+zUGPkfBsqM=", 229 "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=",
230 "owner": "Mic92", 230 "owner": "Mic92",
231 "repo": "sops-nix", 231 "repo": "sops-nix",
232 "rev": "f72e050c3ef148b1131a0d2df55385c045e4166b", 232 "rev": "da98a111623101c64474a14983d83dad8f09f93d",
233 "type": "github" 233 "type": "github"
234 }, 234 },
235 "original": { 235 "original": {
diff --git a/hosts/surtr/http/default.nix b/hosts/surtr/http/default.nix
index 939a54fb..858ad31b 100644
--- a/hosts/surtr/http/default.nix
+++ b/hosts/surtr/http/default.nix
@@ -26,7 +26,6 @@
26 26
27 client_body_temp_path /run/nginx-client-bodies; 27 client_body_temp_path /run/nginx-client-bodies;
28 ''; 28 '';
29 additionalModules = with pkgs.nginxModules; [ dav pam ];
30 }; 29 };
31 systemd.services.nginx = { 30 systemd.services.nginx = {
32 preStart = lib.mkForce config.services.nginx.preStart; 31 preStart = lib.mkForce config.services.nginx.preStart;
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 5c23dea2..7f780d9a 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -101,6 +101,9 @@ with lib;
101 options = "--delete-older-than 30d"; 101 options = "--delete-older-than 30d";
102 }; 102 };
103 }; 103 };
104 systemd.services."nix-daemon".serviceConfig = {
105 CPUQuota = "1200%";
106 };
104 107
105 powerManagement = { 108 powerManagement = {
106 enable = true; 109 enable = true;
diff --git a/hosts/vidhar/network/default.nix b/hosts/vidhar/network/default.nix
index 0cf17c0a..ddc5d78d 100644
--- a/hosts/vidhar/network/default.nix
+++ b/hosts/vidhar/network/default.nix
@@ -1,4 +1,6 @@
1{ pkgs, ... }: 1{ pkgs, lib, ... }:
2
3with lib;
2 4
3{ 5{
4 imports = [ ./dsl.nix ./bifrost ./dhcp ]; 6 imports = [ ./dsl.nix ./bifrost ./dhcp ];
@@ -57,7 +59,7 @@
57 59
58 services.resolved.enable = false; 60 services.resolved.enable = false;
59 61
60 systemd.services."systemd-networkd-wait-online".enable = false; 62 systemd.services."systemd-networkd-wait-online".enable = mkForce false;
61 63
62 environment.etc."dnssec-trust-anchors.d/root.positive".source = "${pkgs.dns-root-data}/root.ds"; 64 environment.etc."dnssec-trust-anchors.d/root.positive".source = "${pkgs.dns-root-data}/root.ds";
63 65
diff --git a/overlays/prometheus-lvm-exporter.nix b/overlays/prometheus-lvm-exporter.nix
index ead1e820..8568e24d 100644
--- a/overlays/prometheus-lvm-exporter.nix
+++ b/overlays/prometheus-lvm-exporter.nix
@@ -3,7 +3,7 @@
3 pname = "prometheus-lvm-exporter"; 3 pname = "prometheus-lvm-exporter";
4 inherit (sources.prometheus-lvm-exporter) version src; 4 inherit (sources.prometheus-lvm-exporter) version src;
5 5
6 vendorHash = "sha256-DyvUM3pP2P1IGfXKpkR5Y4CVcnSBsnNy0kd3WTjbWpg="; 6 vendorHash = "sha256-5rNrCkX+y8pItkpkvYO7uVgT/sIkUthwJ41RkMsefL4=";
7 7
8 doCheck = false; 8 doCheck = false;
9 9
diff --git a/overlays/spm/server/Spm/Server.hs b/overlays/spm/server/Spm/Server.hs
index 6bb9dfe6..e6a876cb 100644
--- a/overlays/spm/server/Spm/Server.hs
+++ b/overlays/spm/server/Spm/Server.hs
@@ -275,7 +275,9 @@ spmServer dom mbox = whoami
275 275
276 spmSql $ do 276 spmSql $ do
277 Entity mailboxMappingMailbox _ <- maybe (throwError err404) return <=< getBy $ UniqueMailbox mbox 277 Entity mailboxMappingMailbox _ <- maybe (throwError err404) return <=< getBy $ UniqueMailbox mbox
278 maybe (throwError err400{ errBody = "Address already claimed" }) (const $ return NoContent) =<< insertUnique MailboxMapping{mailboxMappingExtension = Nothing, mailboxMappingDomain = dom, mailboxMappingReject = False, ..} 278 insert_ MailboxMapping{mailboxMappingExtension = Nothing, mailboxMappingDomain = dom, mailboxMappingReject = False, ..}
279
280 return NoContent
279 281
280 listMappings = spmSql $ do 282 listMappings = spmSql $ do
281 Entity mailboxId _ <- maybe (throwError err404) return <=< getBy $ UniqueMailbox mbox 283 Entity mailboxId _ <- maybe (throwError err404) return <=< getBy $ UniqueMailbox mbox
diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix
index 878a12c4..437ee74c 100644
--- a/system-profiles/networkmanager.nix
+++ b/system-profiles/networkmanager.nix
@@ -19,7 +19,7 @@ with lib;
19 }; 19 };
20 20
21 systemd.services."NetworkManager-wait-online".enable = false; 21 systemd.services."NetworkManager-wait-online".enable = false;
22 systemd.services."systemd-networkd-wait-online".enable = false; 22 systemd.services."systemd-networkd-wait-online".enable = mkForce false;
23 23
24 services.resolved.enable = false; 24 services.resolved.enable = false;
25 25