Compare changes

Choose any two refs to compare.

Changed files
+69 -81
global
overlays
systems
koumakan
services
databases
scm
renko
+1
.gitignore
···
# balls
result
+
result-*
.direnv/
*.qcow2
+47 -57
flake.lock
···
"flake-compat": {
"flake": false,
"locked": {
-
"lastModified": 1747046372,
-
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+
"lastModified": 1761588595,
+
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
-
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
···
"zon2nix": "zon2nix"
},
"locked": {
-
"lastModified": 1764953050,
-
"narHash": "sha256-TkMjYCGm6FHflVQadN6mx1+3lWzY4wl+3U40lfvTroQ=",
+
"lastModified": 1765577799,
+
"narHash": "sha256-u7p0NFD83XrA5UZmtUVW7WQpdCsVYa7Flo430cVStd8=",
"owner": "ghostty-org",
"repo": "ghostty",
-
"rev": "08c9661683edc1e9e63d8e6abd469a68faaee575",
+
"rev": "7a1ff7779b6b4106ecc9349efb4e1f6afdb1ba4e",
"type": "github"
},
"original": {
···
]
},
"locked": {
-
"lastModified": 1764866045,
-
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
+
"lastModified": 1765605144,
+
"narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
"owner": "nix-community",
"repo": "home-manager",
-
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
+
"rev": "90b62096f099b73043a747348c11dbfcfbdea949",
"type": "github"
},
"original": {
···
"inputs": {
"nix": "nix",
"nix-eval-jobs": "nix-eval-jobs",
-
"nixpkgs": "nixpkgs_4"
+
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1764105837,
···
"lastModified": 1731402384,
"narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=",
"type": "tarball",
-
"url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"
+
"url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip"
},
"original": {
"type": "tarball",
-
"url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"
+
"url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip"
}
},
"indigo": {
···
"inputs": {
"flake-compat": "flake-compat_3",
"nix-update-soopy": "nix-update-soopy",
-
"nixpkgs": "nixpkgs_5",
+
"nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
-
"lastModified": 1764144136,
-
"narHash": "sha256-EqViuxH+g4lo5GlcQ5UjkIIdIF3tjF3K9gdmyXWt9gQ=",
+
"lastModified": 1765558006,
+
"narHash": "sha256-8o8J6YJgx7ZLZJfXlKL/upDyGuRFoTOTKeaLT4ZgUHw=",
"owner": "soopyc",
"repo": "mystia",
-
"rev": "ecf8e23ef3d0f4687043154a51056b1c5cba144e",
+
"rev": "5b177c1b32e2f671c1b4b92f0d71ec2a6a55fa9a",
"type": "github"
},
"original": {
···
]
},
"locked": {
-
"lastModified": 1765080594,
-
"narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=",
+
"lastModified": 1765267181,
+
"narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
"owner": "nix-community",
"repo": "nix-index-database",
-
"rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754",
+
"rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
"type": "github"
},
"original": {
···
},
"nixos-hardware": {
"locked": {
-
"lastModified": 1764729408,
-
"narHash": "sha256-BnwVvpidFX9hPwRkHuHw2y5ZgJWNeoHKd2fj2qls9NM=",
+
"lastModified": 1765610993,
+
"narHash": "sha256-pnnhKVObp3L6dWR9vsLAo7s1HliNW5x4CDyph+v7x3w=",
"owner": "soopyc",
"repo": "nixos-hardware",
-
"rev": "c45404cdfb6c4eb9d99f88e383c703db6e5db442",
+
"rev": "c880f92af869077edeed4bd8649a2de86fddd5d7",
"type": "github"
},
"original": {
···
},
"nixpkgs_2": {
"locked": {
-
"lastModified": 315532800,
-
"narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
-
"rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
+
"lastModified": 1763191728,
+
"narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=",
+
"rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
"type": "tarball",
-
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
+
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz"
},
"original": {
"type": "tarball",
···
},
"nixpkgs_3": {
"locked": {
-
"lastModified": 1758360447,
-
"narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
-
"rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
-
"type": "tarball",
-
"url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
-
},
-
"original": {
-
"type": "tarball",
-
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-
}
-
},
-
"nixpkgs_4": {
-
"locked": {
"lastModified": 1764020296,
"narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
"owner": "NixOS",
···
"type": "github"
}
},
-
"nixpkgs_5": {
+
"nixpkgs_4": {
"locked": {
"lastModified": 1763966396,
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
···
"type": "indirect"
}
},
-
"nixpkgs_6": {
+
"nixpkgs_5": {
"locked": {
-
"lastModified": 1764983851,
-
"narHash": "sha256-pyyfJp6Q80D0YhEuuP/qzasUZjoK3C3PrCp8BPWcDZE=",
-
"rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
+
"lastModified": 1765311797,
+
"narHash": "sha256-3bKCEc1JWOn8aj48H1yHKU6WDw0eSU2t7cKCL3FC+Lo=",
+
"rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
"type": "tarball",
-
"url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.1056.d9bc5c7dceb3/nixexprs.tar.xz"
+
"url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.1335.09eb77e94fa2/nixexprs.tar.xz"
},
"original": {
"type": "tarball",
···
"mystia": "mystia",
"nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware",
-
"nixpkgs": "nixpkgs_6",
+
"nixpkgs": "nixpkgs_5",
"sops-nix": "sops-nix",
"tangled-core": "tangled-core",
"treefmt-nix": "treefmt-nix_3",
···
]
},
"locked": {
-
"lastModified": 1765079830,
-
"narHash": "sha256-i9GMbBLkeZ7MVvy7+aAuErXkBkdRylHofrAjtpUPKt8=",
+
"lastModified": 1765553226,
+
"narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=",
"owner": "Mic92",
"repo": "sops-nix",
-
"rev": "aeb517262102f13683d7a191c7e496b34df8d24c",
+
"rev": "496a6f625f63b780ce849891868f2fad22fd49c6",
"type": "github"
},
"original": {
···
"sqlite-lib-src": "sqlite-lib-src"
},
"locked": {
-
"lastModified": 1765013052,
-
"narHash": "sha256-hPhegxFBoEHcKWoydEQGO5ew4CPJkSg8OCrvR+ZfSyg=",
+
"lastModified": 1765553661,
+
"narHash": "sha256-sj9NLGdgfXanu3wnqFg6BfWyFG1UsQ46O5UwQ2120is=",
"ref": "refs/heads/master",
-
"rev": "442e2ab1b4dc3a8a75910abc564da55a639a495c",
-
"revCount": 1720,
+
"rev": "92ded47ecdfd0606aa15f78dde0014af18bcc06a",
+
"revCount": 1732,
"type": "git",
"url": "https://tangled.org/@tangled.sh/core"
},
···
]
},
"locked": {
-
"lastModified": 1760401936,
-
"narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
+
"lastModified": 1763295135,
+
"narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=",
"owner": "mitchellh",
"repo": "zig-overlay",
-
"rev": "365085b6652259753b598d43b723858184980bbe",
+
"rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a",
"type": "github"
},
"original": {
···
},
"zon2nix": {
"inputs": {
-
"nixpkgs": "nixpkgs_3"
+
"nixpkgs": [
+
"ghostty",
+
"nixpkgs"
+
]
},
"locked": {
"lastModified": 1758405547,
+1 -1
global/overlays/default.nix
···
-
_: []
+
_: [ ]
# inputs: [
# # we can probably live without an overlay?
# # inputs.mystia.overlays.default
+16 -20
systems/koumakan/services/databases/postgresql.nix
···
host all all ::1/128 scram-sha-256
'';
-
settings =
-
let
-
credsDir = "/run/credentials/postgresql.service";
-
in
-
{
-
listen_addresses = pkgs.lib.mkForce "*";
-
max_connections = 200;
-
password_encryption = "scram-sha-256";
+
settings = {
+
listen_addresses = pkgs.lib.mkForce "*";
+
max_connections = 200;
+
password_encryption = "scram-sha-256";
-
log_line_prefix = "%m [%p] %h ";
-
# ssl = "on";
-
# ssl_cert_file = "${credsDir}/cert.pem";
-
# ssl_key_file = "${credsDir}/key.pem";
+
log_line_prefix = "%m [%p] %h ";
+
# ssl = "on";
+
# ssl_cert_file = "${credsDir}/cert.pem";
+
# ssl_key_file = "${credsDir}/key.pem";
-
log_hostname = true;
-
datestyle = "iso, dmy";
-
log_timezone = "Asia/Hong_Kong";
-
timezone = "Asia/Hong_Kong";
-
default_text_search_config = "pg_catalog.english";
+
log_hostname = true;
+
datestyle = "iso, dmy";
+
log_timezone = "Asia/Hong_Kong";
+
timezone = "Asia/Hong_Kong";
+
default_text_search_config = "pg_catalog.english";
-
max_wal_size = "2GB";
-
min_wal_size = "80MB";
-
};
+
max_wal_size = "2GB";
+
min_wal_size = "80MB";
+
};
};
users.users.postgres.useDefaultShell = lib.mkForce false;
+3 -2
systems/koumakan/services/scm/forgejo.nix
···
ENABLE_NOTIFY_MAIL = true;
REGISTER_EMAIL_CONFIRM = true;
-
DISABLE_REGISTRATION = false;
+
DISABLE_REGISTRATION = false; # need to be false to enable any sort of reg.
+
ENABLE_INTERNAL_SIGNIN = true; # we have gatekeeper setup now and working, this can be turned off.
ALLOW_ONLY_EXTERNAL_REGISTRATION = true;
ENABLE_CAPTCHA = true;
···
# Logging {{{
log = {
ROOT_PATH = "/var/log/forgejo/";
-
"logger.router.MODE" = "";
+
LOGGER_ROUTER_MODE = "";
};
# }}}
+1 -1
systems/renko/configuration.nix
···
];
networking.firewall = {
-
allowedTCPPorts = [ 59153 ];
+
allowedTCPPorts = [ 59153 5515 ];
allowedTCPPortRanges = [
{
from = 25560;