jana/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch to deploy

Browse source
This commit is contained in:
Jana Dönszelmann 2026-03-03 11:10:24 +01:00
parent 1d06352181
commit 05928785b0
No known key found for this signature in database
4 changed files with 274 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

292
flake.lock generated
View file

@ -12,7 +12,7 @@
"ragenix", "ragenix",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_13" "systems": "systems_14"
}, },
"locked": { "locked": {
"lastModified": 1761656077, "lastModified": 1761656077,
@ -207,10 +207,30 @@
"type": "github" "type": "github"
} }
}, },
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_3",
"utils": "utils"
},
"locked": {
"lastModified": 1770019181,
"narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"dumpasm": { "dumpasm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1732916787, "lastModified": 1732916787,
@ -327,6 +347,22 @@
} }
}, },
"flake-compat_2": { "flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1747046372,
@ -380,7 +416,7 @@
}, },
"flake-utils_10": { "flake-utils_10": {
"inputs": { "inputs": {
"systems": "systems_11" "systems": "systems_12"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -398,7 +434,7 @@
}, },
"flake-utils_11": { "flake-utils_11": {
"inputs": { "inputs": {
"systems": "systems_14" "systems": "systems_15"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -416,7 +452,7 @@
}, },
"flake-utils_12": { "flake-utils_12": {
"inputs": { "inputs": {
"systems": "systems_15" "systems": "systems_16"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -434,7 +470,7 @@
}, },
"flake-utils_13": { "flake-utils_13": {
"inputs": { "inputs": {
"systems": "systems_16" "systems": "systems_17"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -452,7 +488,7 @@
}, },
"flake-utils_14": { "flake-utils_14": {
"inputs": { "inputs": {
"systems": "systems_17" "systems": "systems_18"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -470,7 +506,7 @@
}, },
"flake-utils_15": { "flake-utils_15": {
"inputs": { "inputs": {
"systems": "systems_18" "systems": "systems_19"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -488,7 +524,7 @@
}, },
"flake-utils_16": { "flake-utils_16": {
"inputs": { "inputs": {
"systems": "systems_19" "systems": "systems_20"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -524,7 +560,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -542,7 +578,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -560,7 +596,7 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -578,7 +614,7 @@
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -596,7 +632,7 @@
}, },
"flake-utils_7": { "flake-utils_7": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -614,7 +650,7 @@
}, },
"flake-utils_8": { "flake-utils_8": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_9"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -632,7 +668,7 @@
}, },
"flake-utils_9": { "flake-utils_9": {
"inputs": { "inputs": {
"systems": "systems_10" "systems": "systems_11"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -650,7 +686,7 @@
}, },
"harmonica": { "harmonica": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1738890519, "lastModified": 1738890519,
@ -732,14 +768,14 @@
"homepage": { "homepage": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1770464309, "lastModified": 1772058280,
"narHash": "sha256-GQh77HwhXATPkWCB10oDeb1q6qZ7KJrPqttNy9NTtLk=", "narHash": "sha256-8gZ6wh++43JAe6PH0hmm4Q8gPEScf0S7rkb0MmIxu2U=",
"owner": "jdonszelmann", "owner": "jdonszelmann",
"repo": "homepage", "repo": "homepage",
"rev": "72b2a7932aad8a896f52b788cece4379eefa6663", "rev": "ead7bebdfa71b207d2513d7f002e164d0b17a264",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -805,7 +841,7 @@
"mapf": { "mapf": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1757529600, "lastModified": 1757529600,
@ -826,7 +862,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_7" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1770927856, "lastModified": 1770927856,
@ -847,7 +883,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_8", "flake-utils": "flake-utils_8",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_9",
"nixpkgs-mozilla": "nixpkgs-mozilla" "nixpkgs-mozilla": "nixpkgs-mozilla"
}, },
"locked": { "locked": {
@ -867,7 +903,7 @@
"naersk": { "naersk": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1763384566, "lastModified": 1763384566,
@ -886,7 +922,7 @@
"naersk_2": { "naersk_2": {
"inputs": { "inputs": {
"fenix": "fenix_2", "fenix": "fenix_2",
"nixpkgs": "nixpkgs_16" "nixpkgs": "nixpkgs_17"
}, },
"locked": { "locked": {
"lastModified": 1752689277, "lastModified": 1752689277,
@ -908,7 +944,7 @@
"niri-unstable": [ "niri-unstable": [
"niri-unstable" "niri-unstable"
], ],
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_10",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-stable": "xwayland-satellite-stable",
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
@ -946,7 +982,7 @@
}, },
"niri-unstable": { "niri-unstable": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_11",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
@ -1029,7 +1065,7 @@
}, },
"nix-minecraft": { "nix-minecraft": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_10", "flake-utils": "flake-utils_10",
"nixpkgs": [ "nixpkgs": [
"p1n3appl3", "p1n3appl3",
@ -1162,6 +1198,22 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1757967192, "lastModified": 1757967192,
"narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=",
@ -1177,7 +1229,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_11": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1771932323, "lastModified": 1771932323,
"narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=", "narHash": "sha256-3PadsTzuMJT/x0KmiD/Me1GG6rW8kaHoWVduSs0ue7o=",
@ -1192,7 +1244,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_12": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1771369470, "lastModified": 1771369470,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
@ -1208,7 +1260,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": { "nixpkgs_14": {
"locked": { "locked": {
"lastModified": 1767379071, "lastModified": 1767379071,
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
@ -1224,7 +1276,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_14": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1722062969, "lastModified": 1722062969,
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
@ -1240,7 +1292,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_15": { "nixpkgs_16": {
"locked": { "locked": {
"lastModified": 1768564909, "lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@ -1256,7 +1308,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_16": { "nixpkgs_17": {
"locked": { "locked": {
"lastModified": 1752077645, "lastModified": 1752077645,
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@ -1272,7 +1324,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_17": { "nixpkgs_18": {
"locked": { "locked": {
"lastModified": 1755020227, "lastModified": 1755020227,
"narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=", "narHash": "sha256-gGmm+h0t6rY88RPTaIm3su95QvQIVjAJx558YUG4Id8=",
@ -1286,7 +1338,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_18": { "nixpkgs_19": {
"locked": { "locked": {
"lastModified": 1771931193, "lastModified": 1771931193,
"narHash": "sha256-IRPLf3y0HxdLirCVYoOYXQyoUBIM8llw7/96OHvyQoM=", "narHash": "sha256-IRPLf3y0HxdLirCVYoOYXQyoUBIM8llw7/96OHvyQoM=",
@ -1302,22 +1354,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_19": {
"locked": {
"lastModified": 1771207753,
"narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1759036355, "lastModified": 1759036355,
@ -1335,6 +1371,22 @@
} }
}, },
"nixpkgs_20": { "nixpkgs_20": {
"locked": {
"lastModified": 1771207753,
"narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_21": {
"locked": { "locked": {
"lastModified": 1710377395, "lastModified": 1710377395,
"narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=", "narHash": "sha256-KMubsUWtVr7L55pXMBibBDBdmk3xrjbBPduc0E8z28c=",
@ -1348,7 +1400,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_21": { "nixpkgs_22": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
@ -1365,6 +1417,22 @@
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": {
"lastModified": 1743014863,
"narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
@ -1380,7 +1448,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1738680400,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
@ -1396,7 +1464,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
@ -1412,7 +1480,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1721379653, "lastModified": 1721379653,
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
@ -1428,7 +1496,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1752077645, "lastModified": 1752077645,
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@ -1444,7 +1512,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1766070988, "lastModified": 1766070988,
"narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
@ -1460,29 +1528,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_9" "systems": "systems_10"
}, },
"locked": { "locked": {
"lastModified": 1771135771, "lastModified": 1771135771,
@ -1524,7 +1576,7 @@
"p1n3appl3", "p1n3appl3",
"nixpkgs" "nixpkgs"
], ],
"utils": "utils" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1760151712, "lastModified": 1760151712,
@ -1548,7 +1600,7 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_13",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"obs-gamepad": "obs-gamepad", "obs-gamepad": "obs-gamepad",
"ragenix": "ragenix", "ragenix": "ragenix",
@ -1574,7 +1626,7 @@
"pipethon": { "pipethon": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_11", "flake-utils": "flake-utils_11",
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_14"
}, },
"locked": { "locked": {
"lastModified": 1767634075, "lastModified": 1767634075,
@ -1658,7 +1710,7 @@
"impermanence": "impermanence", "impermanence": "impermanence",
"nix-index-database": "nix-index-database_2", "nix-index-database": "nix-index-database_2",
"nixos-hardware": "nixos-hardware_2", "nixos-hardware": "nixos-hardware_2",
"nixpkgs": "nixpkgs_14", "nixpkgs": "nixpkgs_15",
"ragenix": "ragenix_2" "ragenix": "ragenix_2"
}, },
"locked": { "locked": {
@ -1678,7 +1730,7 @@
"raw-data": { "raw-data": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_13", "flake-utils": "flake-utils_13",
"nixpkgs": "nixpkgs_15" "nixpkgs": "nixpkgs_16"
}, },
"locked": { "locked": {
"lastModified": 1768919451, "lastModified": 1768919451,
@ -1698,7 +1750,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_14", "flake-utils": "flake-utils_14",
"naersk": "naersk_2", "naersk": "naersk_2",
"nixpkgs": "nixpkgs_17", "nixpkgs": "nixpkgs_18",
"nixpkgs-mozilla": "nixpkgs-mozilla_2" "nixpkgs-mozilla": "nixpkgs-mozilla_2"
}, },
"locked": { "locked": {
@ -1719,6 +1771,7 @@
"inputs": { "inputs": {
"colmena": "colmena", "colmena": "colmena",
"compiler-construction-2021": "compiler-construction-2021", "compiler-construction-2021": "compiler-construction-2021",
"deploy-rs": "deploy-rs",
"dumpasm": "dumpasm", "dumpasm": "dumpasm",
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"firefox-sidebar-css": "firefox-sidebar-css", "firefox-sidebar-css": "firefox-sidebar-css",
@ -1733,7 +1786,7 @@
"mifg": "mifg", "mifg": "mifg",
"niri": "niri", "niri": "niri",
"niri-unstable": "niri-unstable", "niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_12",
"nixvim": "nixvim", "nixvim": "nixvim",
"noctalia": "noctalia", "noctalia": "noctalia",
"p1n3appl3": "p1n3appl3", "p1n3appl3": "p1n3appl3",
@ -1876,7 +1929,7 @@
"secrets": { "secrets": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_15", "flake-utils": "flake-utils_15",
"nixpkgs": "nixpkgs_18" "nixpkgs": "nixpkgs_19"
}, },
"locked": { "locked": {
"lastModified": 1769256063, "lastModified": 1769256063,
@ -1922,7 +1975,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_19" "nixpkgs": "nixpkgs_20"
}, },
"locked": { "locked": {
"lastModified": 1771889317, "lastModified": 1771889317,
@ -2134,6 +2187,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_20": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": { "systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -2195,21 +2263,6 @@
} }
}, },
"systems_7": { "systems_7": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_8": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -2224,6 +2277,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_8": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_9": { "systems_9": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -2242,7 +2310,7 @@
"t": { "t": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_16", "flake-utils": "flake-utils_16",
"nixpkgs": "nixpkgs_20" "nixpkgs": "nixpkgs_21"
}, },
"locked": { "locked": {
"lastModified": 1710410762, "lastModified": 1710410762,
@ -2260,7 +2328,7 @@
}, },
"totpal": { "totpal": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_21" "nixpkgs": "nixpkgs_22"
}, },
"locked": { "locked": {
"lastModified": 1737322813, "lastModified": 1737322813,
@ -2278,7 +2346,25 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_12" "systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"inputs": {
"systems": "systems_13"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,

86
flake.nix
View file

@ -2,21 +2,17 @@
description = "jana's server infrastructure"; description = "jana's server infrastructure";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs";
colmena.url = "github:zhaofengli/colmena";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
sops-nix.url = "github:Mic92/sops-nix";
vpn-confinement.url = "github:Maroka-chan/VPN-Confinement";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; # deployment
inputs.nixpkgs.follows = "nixpkgs"; colmena.url = "github:zhaofengli/colmena";
}; deploy-rs.url = "github:serokell/deploy-rs";
# websites # websites
homepage.url = "github:jdonszelmann/homepage"; homepage.url = "github:jdonszelmann/homepage";
totpal.url = "github:jdonszelmann/totpal"; totpal.url = "github:jdonszelmann/totpal";
harmonica.url = "git+ssh://git@github.com/jdonszelmann/harmonica-tabs"; harmonica.url = "git+ssh://git@github.com/jdonszelmann/harmonica-tabs";
@ -25,32 +21,32 @@
compiler-construction-2021.url = "git+ssh://forgejo@git.donsz.nl/jana/eelco-visser-compiler-construction.git"; compiler-construction-2021.url = "git+ssh://forgejo@git.donsz.nl/jana/eelco-visser-compiler-construction.git";
mifg.url = "git+ssh://forgejo@git.donsz.nl/jana/money.is.fckn.gay.git"; mifg.url = "git+ssh://forgejo@git.donsz.nl/jana/money.is.fckn.gay.git";
# server
raw-data.url = "git+ssh://forgejo@git.donsz.nl/jana/raw-data.git";
secrets.url = "git+ssh://forgejo@git.donsz.nl/jana/server-secrets.git"; secrets.url = "git+ssh://forgejo@git.donsz.nl/jana/server-secrets.git";
sops-nix.url = "github:Mic92/sops-nix";
vpn-confinement.url = "github:Maroka-chan/VPN-Confinement";
# home
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
t.url = "github:jdonszelmann/t-rs"; t.url = "github:jdonszelmann/t-rs";
dumpasm.url = "github:jdonszelmann/dumpasm"; dumpasm.url = "github:jdonszelmann/dumpasm";
kitty-search = { kitty-search = {
url = "github:trygveaa/kitty-kitten-search"; url = "github:trygveaa/kitty-kitten-search";
flake = false; flake = false;
}; };
jujutsu = { jujutsu = {
url = "github:martinvonz/jj"; url = "github:martinvonz/jj";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
p1n3appl3 = { p1n3appl3 = {
url = "github:p1n3appl3/config"; url = "github:p1n3appl3/config";
inputs.rahul-config.follows = "rahul-config"; inputs.rahul-config.follows = "rahul-config";
}; };
rahul-config.url = "github:jdonszelmann/nix-config"; rahul-config.url = "github:jdonszelmann/nix-config";
niri-unstable.url = "github:YaLTeR/niri"; niri-unstable.url = "github:YaLTeR/niri";
niri = { niri = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
@ -65,11 +61,15 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
pipethon.url = "git+ssh://forgejo@git.donsz.nl/jana/pipethon.git"; pipethon.url = "git+ssh://forgejo@git.donsz.nl/jana/pipethon.git";
firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs";
};
firefox-sidebar-css = { firefox-sidebar-css = {
url = "github:drannex/FirefoxSidebar"; url = "github:drannex/FirefoxSidebar";
flake = false; flake = false;
}; };
raw-data.url = "git+ssh://forgejo@git.donsz.nl/jana/raw-data.git";
}; };
outputs = outputs =
{ {
@ -80,6 +80,7 @@
sops-nix, sops-nix,
vpn-confinement, vpn-confinement,
home-manager, home-manager,
deploy-rs,
... ...
}@inputs: }@inputs:
let let
@ -95,8 +96,62 @@
}) })
]; ];
}; };
specialArgsForSystem = system: {
pkgs = pkgsForSystem system;
flakes = inputs;
inherit inputs;
inherit (inputs.secrets.packages.${system}) secrets;
};
in in
{ {
nixosConfigurations.fili = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [
inputs.home-manager.nixosModules.default
{ home-manager.extraSpecialArgs = specialArgs; }
./hosts/fili/configuration.nix
./users
./default-machine-config.nix
sops-nix.nixosModules.sops
vpn-confinement.nixosModules.default
];
specialArgs = specialArgsForSystem system;
};
nixosConfigurations.kili = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [
inputs.home-manager.nixosModules.default
{ home-manager.extraSpecialArgs = specialArgs; }
./hosts/kili/configuration.nix
./users
];
specialArgs = specialArgsForSystem system;
};
deploy.nodes.fili = {
hostname = "fili";
fastConnection = true;
profiles.system = {
user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.fili;
sshUser = "jana";
};
};
deploy.nodes.kili = {
hostname = "localhost";
fastConnection = true;
profiles.system = {
user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.kili;
sshUser = "jana";
};
};
colmenaHive = colmena.lib.makeHive self.outputs.colmena; colmenaHive = colmena.lib.makeHive self.outputs.colmena;
colmena = { colmena = {
@ -166,10 +221,11 @@
(pkgs.writeShellScriptBin "apply-local" '' (pkgs.writeShellScriptBin "apply-local" ''
colmena apply-local --sudo colmena apply-local --sudo
'') '')
deploy-rs.packages.${system}.deploy-rs
]; ];
shellHook = "exec $NIX_BUILD_SHELL"; shellHook = "exec $NIX_BUILD_SHELL";
}; };
packages = custom pkgs; custom-packages = custom pkgs;
formatter = pkgs.nixfmt; formatter = pkgs.nixfmt;
} }
); );

2
hosts/fili/services/metrics.nix
View file

@ -259,7 +259,7 @@ in
}; };
}; };
services.grafana = { services.grafana = {
enable = true; enable = false;
settings = { settings = {
server = { server = {

29
modules/users.nix
View file

@ -86,23 +86,20 @@ in
}) users; }) users;
home-manager.users = lib.mapAttrs ( home-manager.users = lib.mapAttrs (
name: value: name: value:
( (_: {
{ pkgs, lib, ... }: imports = (
{ [
imports = ( ./home-info.nix
[ ]
./home-info.nix ++ (map (program: program.home-config) valid-programs)
] );
++ (map (program: program.home-config) valid-programs)
);
home = { home = {
inherit stateVersion; inherit stateVersion;
username = name; username = name;
homeDirectory = "/home/${name}"; homeDirectory = "/home/${name}";
}; };
} })
)
) home-users; ) home-users;
} }
]); ]);