clerie/nixfiles
1
0
Fork 0
Code

Update from updated-inputs-2025-04-08-01-03

Browse Source
This commit is contained in:
Flake Update Bot 2025-04-08 03:03:53 +02:00
commit db20e572b5
32 changed files with 45 additions and 73 deletions

6
flake.lock generated

@ -533,11 +533,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1743827369,
"narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
"lastModified": 1743964447,
"narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "42a1c966be226125b48c384171c44c651c236c22",
"rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
"type": "github"
},
"original": {

3
hosts/_iso/configuration.nix

@ -13,9 +13,6 @@
# https://github.com/NixOS/nixpkgs/issues/327187
boot.initrd.systemd.enable = false;
networking.useDHCP = false;
systemd.network.enable = true;
networking.hostName = "isowo";
isoImage.isoBaseName = lib.mkForce "nixos-isowo";

3
hosts/aluminium/configuration.nix

@ -18,9 +18,6 @@
terminal_output serial
";
networking.useDHCP = false;
systemd.network.enable = true;
profiles.clerie.wg-clerie = {
enable = true;
ipv6s = [ "2a01:4f8:c0c:15f1::8106/128" ];

3
hosts/astatine/configuration.nix

@ -18,9 +18,6 @@
terminal_output serial
";
networking.useDHCP = false;
systemd.network.enable = true;
profiles.clerie.wg-clerie = {
enable = true;
ipv6s = [ "2a01:4f8:c0c:15f1::8108/128" ];

3
hosts/beryllium/configuration.nix

@ -20,9 +20,6 @@
networking.hostName = "beryllium";
networking.useDHCP = false;
systemd.network.enable = true;
networking.firewall.enable = false;
profiles.clerie.wg-clerie = {

2
hosts/carbon/configuration.nix

@ -22,6 +22,8 @@
./wg-clerie.nix
];
profiles.clerie.common-networking.enable = false;
boot.kernelParams = [ "console=ttyS0,115200n8" ];
boot.loader.grub.enable = true;

3
hosts/clerie-backup/configuration.nix

@ -13,9 +13,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens18";
address = [

1
hosts/dn42-il-gw1/configuration.nix

@ -7,7 +7,6 @@
];
profiles.clerie.mercury-vm.enable = true;
profiles.clerie.common-networking.enable = true;
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";

1
hosts/dn42-il-gw5/configuration.nix

@ -7,7 +7,6 @@
];
profiles.clerie.mercury-vm.enable = true;
profiles.clerie.common-networking.enable = true;
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";

1
hosts/dn42-il-gw6/configuration.nix

@ -7,7 +7,6 @@
];
profiles.clerie.cybercluster-vm.enable = true;
profiles.clerie.common-networking.enable = true;
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";

1
hosts/dn42-ildix-clerie/configuration.nix

@ -7,7 +7,6 @@
];
profiles.clerie.mercury-vm.enable = true;
profiles.clerie.common-networking.enable = true;
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";

1
hosts/dn42-ildix-service/configuration.nix

@ -10,7 +10,6 @@
];
profiles.clerie.mercury-vm.enable = true;
profiles.clerie.common-networking.enable = true;
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;

3
hosts/gatekeeper/configuration.nix

@ -12,9 +12,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
address = [
"2a01:4f8:c0c:15f1::1/64"

3
hosts/hydra-1/configuration.nix

@ -22,9 +22,6 @@
"aarch64-linux"
];
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens18";
address = [

3
hosts/hydra-2/configuration.nix

@ -18,9 +18,6 @@
"aarch64-linux"
];
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens18";
address = [

2
hosts/krypton/network.nix

@ -1,8 +1,6 @@
{ ... }:
{
profiles.clerie.common-networking.enable = true;
profiles.clerie.wg-clerie = {
enable = true;
ipv6s = [ "2a01:4f8:c0c:15f1::8011/128" ];

3
hosts/mail-2/configuration.nix

@ -13,9 +13,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
address = [
"2a01:4f8:1c1c:9577::1/64"

3
hosts/monitoring-3/configuration.nix

@ -18,9 +18,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens19";
address = [

3
hosts/nonat/configuration.nix

@ -12,9 +12,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens18";
address = [

3
hosts/osmium/configuration.nix

@ -20,9 +20,6 @@
"aarch64-linux"
];
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens19";
address = [

3
hosts/palladium/configuration.nix

@ -30,9 +30,6 @@
boot.swraid.enable = true;
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "enp3s0";
address = [

2
hosts/porter/configuration.nix

@ -12,8 +12,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens3";
address = [

3
hosts/storage-2/configuration.nix

@ -15,9 +15,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.Name = "ens18";
address = [

3
hosts/tungsten/configuration.nix

@ -18,9 +18,6 @@
terminal_output serial
";
networking.useDHCP = false;
systemd.network.enable = true;
networking.hostName = "tungsten";
profiles.clerie.wg-clerie = {

3
hosts/web-2/configuration.nix

@ -33,9 +33,6 @@
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
networking.useDHCP = false;
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
address = [
"2a01:4f8:c0c:c580::1/64"

2
hosts/zinc/configuration.nix

@ -11,8 +11,6 @@
./programs.nix
];
profiles.clerie.common-networking.enable = true;
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

10
pkgs/clerie-update-nixfiles/clerie-cleanup-branches.nix Normal file

@ -0,0 +1,10 @@
{ pkgs, ... }:
pkgs.writeShellApplication {
name = "clerie-cleanup-branches";
text = builtins.readFile ./clerie-cleanup-branches.sh;
runtimeInputs = with pkgs; [
git
];
}

7
pkgs/clerie-update-nixfiles/clerie-cleanup-branches.sh Executable file

@ -0,0 +1,7 @@
#!/usr/bin/env bash
# Removes all branches from origin starting with updated-inputs-* except the 8 newest ones
git fetch origin --prune
git branch -r | sed "s/^ *//g" | grep "^origin/updated-inputs-" | sort | head -n -8 | sed "s/^origin\///g" | xargs git push origin --delete

26
pkgs/git-show-link/git-show-link.py

@ -1,6 +1,7 @@
#!/usr/bin/env python3
import argparse
from dataclasses import dataclass
import re
import subprocess
@ -8,17 +9,26 @@ REMOTE_TYPES = [
{
# github
"match": re.compile(r'git@github.com:(?P<username>[\w\.-]+)/(?P<project>[\w\.-]+).git'),
"format-branch": lambda g, b: f"https://github.com/{g['username']}/{g['project']}/tree/{b}/",
"format-commit": lambda g, c: f"https://github.com/{g['username']}/{g['project']}/commit/{c}/",
"format-branch": lambda g: f"https://github.com/{g.username}/{g.project}/tree/{g.branch}/",
"format-commit": lambda g: f"https://github.com/{g.username}/{g.project}/commit/{g.commit}/",
},
{
# gitea
"match": re.compile(r'(?P<gituser>[\w\.-]+)@(?P<host>[\w\.-]+):(?P<username>[\w\.-]+)/(?P<project>[\w\.-]+).git'),
"format-branch": lambda g, b: f"https://{g['host']}/{g['username']}/{g['project']}/src/branch/{b}/",
"format-commit": lambda g, c: f"https://{g['host']}/{g['username']}/{g['project']}/commit/{c}/",
"format-branch": lambda g: f"https://{g.host}/{g.username}/{g.project}/src/branch/{g.branch}/",
"format-commit": lambda g: f"https://{g.host}/{g.username}/{g.project}/commit/{g.commit}/",
},
]
@dataclass
class FormatArgs:
gituser: str = None
host: str = None
username: str = None
project: str = None
commit: str = None
branch: str = None
def get_remote_branch():
s = subprocess.run(["git", "status", "--porcelain", "-uno", "-b", "--no-ahead-behind"], capture_output=True, text=True)
@ -71,13 +81,15 @@ def main():
if m is None:
continue
g = m.groupdict()
g = FormatArgs(**m.groupdict())
if args.display_branch:
print(remote_type["format-branch"](g, r["branch"]))
g.branch = r["branch"]
print(remote_type["format-branch"](g))
else:
commit = get_last_commit()
print(remote_type["format-commit"](g, commit))
g.commit = commit
print(remote_type["format-commit"](g))
break

1
pkgs/pkgs.nix

@ -1,5 +1,6 @@
{
clerie-backup = final: prev: final.callPackage ./clerie-backup {};
clerie-cleanup-branches = final: prev: final.callPackage ./clerie-update-nixfiles/clerie-cleanup-branches.nix {};
clerie-keys = final: prev: final.callPackage ./clerie-keys {};
clerie-system-remote-install = final: prev: final.callPackage ./clerie-system-remote-install {};
clerie-system-upgrade = final: prev: final.callPackage ./clerie-system-upgrade/clerie-system-upgrade.nix {};

2
profiles/common-dns/default.nix

@ -16,7 +16,7 @@ with lib;
# Do not use any DNS servers as fallback
services.resolved.fallbackDns = [];
networking.networkmanager.dns = "systemd-networkd";
networking.networkmanager.dns = "systemd-resolved";
};
}

5
profiles/common/default.nix

@ -10,10 +10,9 @@ with lib;
config = mkIf config.profiles.clerie.common.enable {
profiles.clerie.common-dns.enable = true;
profiles.clerie.common-dns.enable = mkDefault true;
# Disabled while we are still in transition
#profiles.clerie.common-network.enable = true;
profiles.clerie.common-networking.enable = mkDefault true;
};
}