diff options
| -rw-r--r-- | npins/sources.json | 34 | ||||
| -rw-r--r-- | system/linde.nix | 3 | ||||
| -rw-r--r-- | system/mba.nix | 1 | ||||
| -rw-r--r-- | system/settings/dev.nix | 3 | ||||
| -rw-r--r-- | system/settings/programs/docker.nix | 5 | ||||
| -rw-r--r-- | system/settings/services/git-server.nix | 21 |
6 files changed, 32 insertions, 35 deletions
diff --git a/npins/sources.json b/npins/sources.json index 1b095326..50a6cb5a 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -20,9 +20,9 @@ "repo": "nix-darwin" }, "branch": "master", - "revision": "ec12b88104d6c117871fad55e931addac4626756", - "url": "https://github.com/lnl7/nix-darwin/archive/ec12b88104d6c117871fad55e931addac4626756.tar.gz", - "hash": "1c1v6r77majxhs8a9gz3czqnsf94hy28bwk7kq50879cc2cw7cb4" + "revision": "0f89b73f41eaa1dde67b291452c181d9a75f10dd", + "url": "https://github.com/lnl7/nix-darwin/archive/0f89b73f41eaa1dde67b291452c181d9a75f10dd.tar.gz", + "hash": "0w1ayw0sna9x0w7d1q6dqb835svc9r3jlb4nd17v7xrfbjv50czm" }, "emacs-overlay": { "type": "Git", @@ -32,9 +32,9 @@ "repo": "emacs-overlay" }, "branch": "master", - "revision": "6b14b1346a81aba358b2fe747e9f3de0e205945d", - "url": "https://github.com/nix-community/emacs-overlay/archive/6b14b1346a81aba358b2fe747e9f3de0e205945d.tar.gz", - "hash": "19llv3cqaq23gy6pxq79slp3nkrnrfw28qrlxc1bg1xpqmcybx4z" + "revision": "91c8f1140e9286f71f1fd38f7dc608d774798f64", + "url": "https://github.com/nix-community/emacs-overlay/archive/91c8f1140e9286f71f1fd38f7dc608d774798f64.tar.gz", + "hash": "09vkwkyfds398m56zp1n22x87qyrnlblpmmzg22shlbya5m7hk62" }, "home-manager": { "type": "Git", @@ -44,9 +44,9 @@ "repo": "home-manager" }, "branch": "master", - "revision": "59ce796b2563e19821361abbe2067c3bb4143a7d", - "url": "https://github.com/nix-community/home-manager/archive/59ce796b2563e19821361abbe2067c3bb4143a7d.tar.gz", - "hash": "0mc4mi23mds8c9r50r8f50sczcpb6fwgml2bcypld57micw8fxxn" + "revision": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "url": "https://github.com/nix-community/home-manager/archive/6b7ce96f34b324e4e104abc30d06955d216bac71.tar.gz", + "hash": "1a11mp5jpqqblgpgijvlq0zy6776minxb7qg3fls4q1qp3f202wh" }, "nix-index-database": { "type": "Git", @@ -68,15 +68,15 @@ "repo": "nixos-hardware" }, "branch": "master", - "revision": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", - "url": "https://github.com/NixOS/nixos-hardware/archive/a59f00f5ac65b19382617ba00f360f8bc07ed3ac.tar.gz", - "hash": "1a6sr6b0gma5b7cklfhpgl02qgv7b3if8dv3y7rmc48iigaab7rf" + "revision": "da0aa7b533d49e6319c603e07b46a5690082f65f", + "url": "https://github.com/NixOS/nixos-hardware/archive/da0aa7b533d49e6319c603e07b46a5690082f65f.tar.gz", + "hash": "1pm57khbq1i7g4j99g0q2jf3qvqx60mxfprkznij0h8jyjnba33g" }, "nixpkgs": { "type": "Channel", "name": "nixos-unstable", - "url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre645454.2741b4b489b5/nixexprs.tar.xz", - "hash": "1lqa1zb6bkh2kjiv2g9439mh4rzfpmflw6rjkc4gj0ww56lizf7r" + "url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre647193.9f4128e00b0a/nixexprs.tar.xz", + "hash": "02ixm7pzl0jzanv7lmwfzqg7znjmq3wwads1l8r94xhln758lm1z" }, "nur": { "type": "Git", @@ -86,9 +86,9 @@ "repo": "NUR" }, "branch": "master", - "revision": "0575d7fb334ea662a0a03620780c87df0612eb9a", - "url": "https://github.com/nix-community/NUR/archive/0575d7fb334ea662a0a03620780c87df0612eb9a.tar.gz", - "hash": "1xn5zihi8r7m7mlnplacidkqhy84ylv21x9zrgcfqjdrhr2m8pbm" + "revision": "b621db2713da7c77c40476ad0a622ef9e8e69f6a", + "url": "https://github.com/nix-community/NUR/archive/b621db2713da7c77c40476ad0a622ef9e8e69f6a.tar.gz", + "hash": "1knylgrqxjk380gnlrs55hmk57fgcfbbi7m0zf7ys306wd8adf3j" } }, "version": 3 diff --git a/system/linde.nix b/system/linde.nix index c0af9144..ee680eb0 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -943,6 +943,9 @@ in enable = true; initialClusterState = "existing"; dataDir = "/var/lib/etcd"; # TODO backup + extraConf = { + AUTO_COMPACTION_RETENTION = "1h"; + }; }; services.dex = diff --git a/system/mba.nix b/system/mba.nix index cc8c81da..b1a17922 100644 --- a/system/mba.nix +++ b/system/mba.nix @@ -14,7 +14,6 @@ networking = { hostName = "mba"; }; - services.tailscale.enable = true; services.activate-system.enable = true; diff --git a/system/settings/dev.nix b/system/settings/dev.nix index 7d2e6193..b1817914 100644 --- a/system/settings/dev.nix +++ b/system/settings/dev.nix @@ -1,9 +1,6 @@ { ... }: { services.caddy = { enable = true; - globalConfig = '' - auto_https disable_redirects - ''; virtualHosts = let local_tls = '' diff --git a/system/settings/programs/docker.nix b/system/settings/programs/docker.nix index 29c2ac73..bbe0e4fc 100644 --- a/system/settings/programs/docker.nix +++ b/system/settings/programs/docker.nix @@ -18,9 +18,4 @@ }; }; }; - # TODO: autoPrune doesn't affect rootless - # systemd.timers.docker-prune.timerConfig = { - # Persistent = true; - # RandomizedDelaySec = 1800; - # }; } diff --git a/system/settings/services/git-server.nix b/system/settings/services/git-server.nix index e8fe6360..72c441f5 100644 --- a/system/settings/services/git-server.nix +++ b/system/settings/services/git-server.nix @@ -64,13 +64,16 @@ let mkMirrorWants = repo: map (target: "mirror-to-${target}@${repo}.path"); in { - services.fcgiwrap = { - enable = true; - user = "gitolite"; - group = "gitolite"; - preforkProcesses = 2; - socketType = "tcp6"; - socketAddress = "[::1]:9000"; + services.fcgiwrap.gitolite = { + process = { + user = "gitolite"; + group = "gitolite"; + prefork = 2; + }; + socket = { + type = "tcp6"; + address = "[::1]:9000"; + }; }; services.gitolite = { enable = true; @@ -114,8 +117,8 @@ in services.caddy.virtualHosts = { "git.alanpearce.eu" = let - fcgi = config.services.fcgiwrap; - fcgisocket = "${fcgi.socketType}/${fcgi.socketAddress}"; + fcgi = config.services.fcgiwrap.gitolite; + fcgisocket = "${fcgi.socket.type}/${fcgi.socket.address}"; in { useACMEHost = "alanpearce.eu"; |