mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2025-07-16 20:22:40 +02:00
Compare commits
1 Commits
a0dc9922b2
...
31b89c7049
| Author | SHA1 | Date | |
|---|---|---|---|
|
31b89c7049 |
25
.mailmap
25
.mailmap
@ -1,25 +0,0 @@
|
|||||||
Daniel Løvbrøtte Olsen <danio@pvv.ntnu.no> <daniel.olsen99@gmail.com>
|
|
||||||
Daniel Løvbrøtte Olsen <danio@pvv.ntnu.no> Daniel <danio@pvv.ntnu.no>
|
|
||||||
Daniel Løvbrøtte Olsen <danio@pvv.ntnu.no> Daniel Lovbrotte Olsen <danio@pvv.ntnu.no>
|
|
||||||
Daniel Løvbrøtte Olsen <danio@pvv.ntnu.no> Daniel Olsen <danio@pvv.ntnu.no>
|
|
||||||
Daniel Løvbrøtte Olsen <danio@pvv.ntnu.no> danio <danio@pvv.ntnu.no>
|
|
||||||
Daniel Løvbrøtte Olsen <danio@pvv.ntnu.no> Daniel Olsen <danio@bicep.pvv.ntnu.no>
|
|
||||||
|
|
||||||
|
|
||||||
Øystein Kristoffer Tveit <oysteikt@pvv.ntnu.no> h7x4 <h7x4@nani.wtf>
|
|
||||||
Øystein Kristoffer Tveit <oysteikt@pvv.ntnu.no> Øystein Tveit <oysteikt@pvv.ntnu.no>
|
|
||||||
Øystein Kristoffer Tveit <oysteikt@pvv.ntnu.no> oysteikt <oysteikt@pvv.ntnu.no>
|
|
||||||
Øystein Kristoffer Tveit <oysteikt@pvv.ntnu.no> Øystein <oysteikt@pvv.org>
|
|
||||||
Øystein Kristoffer Tveit <oysteikt@pvv.ntnu.no> Oystein Kristoffer Tveit <oysteikt@pvv.ntnu.no>
|
|
||||||
|
|
||||||
Felix Albrigtsen <felixalb@pvv.ntnu.no> <felix@albrigtsen.it>
|
|
||||||
Felix Albrigtsen <felixalb@pvv.ntnu.no> <felixalbrigtsen@gmail.com>
|
|
||||||
Felix Albrigtsen <felixalb@pvv.ntnu.no> felixalb <felixalb@pvv.ntnu.no>
|
|
||||||
|
|
||||||
Peder Bergebakken Sundt <pederbs@pvv.ntnu.no> <pbsds@hotmail.com>
|
|
||||||
|
|
||||||
Adrian Gunnar Lauterer <adriangl@pvv.ntnu.no> Adrian G L <adrian@lauterer.it>
|
|
||||||
Adrian Gunnar Lauterer <adriangl@pvv.ntnu.no> Adrian Gunnar Lauterer <adrian@lauterer.it>
|
|
||||||
|
|
||||||
Fredrik Robertsen <frero@pvv.ntnu.no> frero <frero@pvv.ntnu.no>
|
|
||||||
Fredrik Robertsen <frero@pvv.ntnu.no> fredrikr79 <fredrikrobertsen7@gmail.com>
|
|
||||||
@ -7,10 +7,8 @@
|
|||||||
|
|
||||||
./networking.nix
|
./networking.nix
|
||||||
./nix.nix
|
./nix.nix
|
||||||
./vm.nix
|
|
||||||
|
|
||||||
./services/acme.nix
|
./services/acme.nix
|
||||||
./services/uptimed.nix
|
|
||||||
./services/auto-upgrade.nix
|
./services/auto-upgrade.nix
|
||||||
./services/dbus.nix
|
./services/dbus.nix
|
||||||
./services/fwupd.nix
|
./services/fwupd.nix
|
||||||
@ -78,3 +76,4 @@
|
|||||||
# Trusted users on the nix builder machines
|
# Trusted users on the nix builder machines
|
||||||
users.groups."nix-builder-users".name = "nix-builder-users";
|
users.groups."nix-builder-users".name = "nix-builder-users";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
17
base/nix.nix
17
base/nix.nix
@ -1,4 +1,4 @@
|
|||||||
{ lib, config, inputs, ... }:
|
{ inputs, ... }:
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
gc = {
|
gc = {
|
||||||
@ -21,16 +21,11 @@
|
|||||||
** use the same channel the system
|
** use the same channel the system
|
||||||
** was built with
|
** was built with
|
||||||
*/
|
*/
|
||||||
registry = lib.mkMerge [
|
registry = {
|
||||||
{
|
"nixpkgs".flake = inputs.nixpkgs;
|
||||||
"nixpkgs".flake = inputs.nixpkgs;
|
"nixpkgs-unstable".flake = inputs.nixpkgs-unstable;
|
||||||
"nixpkgs-unstable".flake = inputs.nixpkgs-unstable;
|
"pvv-nix".flake = inputs.self;
|
||||||
}
|
};
|
||||||
# We avoid the reference to self in vmVariant to get a stable system .outPath for equivalence testing
|
|
||||||
(lib.mkIf (!config.virtualisation.isVmVariant) {
|
|
||||||
"pvv-nix".flake = inputs.self;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
nixPath = [
|
nixPath = [
|
||||||
"nixpkgs=${inputs.nixpkgs}"
|
"nixpkgs=${inputs.nixpkgs}"
|
||||||
"unstable=${inputs.nixpkgs-unstable}"
|
"unstable=${inputs.nixpkgs-unstable}"
|
||||||
|
|||||||
@ -1,39 +1,26 @@
|
|||||||
{ config, inputs, pkgs, lib, ... }:
|
{ inputs, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
inputUrls = lib.mapAttrs (input: value: value.url) (import "${inputs.self}/flake.nix").inputs;
|
|
||||||
in
|
|
||||||
|
|
||||||
{
|
{
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
flake = "git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git";
|
flake = "git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git";
|
||||||
flags = [
|
flags = [
|
||||||
"--refresh"
|
|
||||||
"--no-write-lock-file"
|
|
||||||
# --update-input is deprecated since nix 2.22, and removed in lix 2.90
|
# --update-input is deprecated since nix 2.22, and removed in lix 2.90
|
||||||
# as such we instead use --override-input combined with --refresh
|
|
||||||
# https://git.lix.systems/lix-project/lix/issues/400
|
# https://git.lix.systems/lix-project/lix/issues/400
|
||||||
] ++ (lib.pipe inputUrls [
|
"--refresh"
|
||||||
(lib.intersectAttrs {
|
"--override-input" "nixpkgs" "github:nixos/nixpkgs/nixos-24.11-small"
|
||||||
nixpkgs = { };
|
"--override-input" "nixpkgs-unstable" "github:nixos/nixpkgs/nixos-unstable-small"
|
||||||
nixpkgs-unstable = { };
|
"--no-write-lock-file"
|
||||||
})
|
];
|
||||||
(lib.mapAttrsToList (input: url: ["--override-input" input url]))
|
|
||||||
lib.concatLists
|
|
||||||
]);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# workaround for https://github.com/NixOS/nix/issues/6895
|
# workaround for https://github.com/NixOS/nix/issues/6895
|
||||||
# via https://git.lix.systems/lix-project/lix/issues/400
|
# via https://git.lix.systems/lix-project/lix/issues/400
|
||||||
environment.etc = lib.mkIf (!config.virtualisation.isVmVariant) {
|
environment.etc."current-system-flake-inputs.json".source
|
||||||
"current-system-flake-inputs.json".source
|
= pkgs.writers.writeJSON "flake-inputs.json" (
|
||||||
= pkgs.writers.writeJSON "flake-inputs.json" (
|
lib.flip lib.mapAttrs inputs (name: input:
|
||||||
lib.flip lib.mapAttrs inputs (name: input:
|
# inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like a derivation
|
||||||
# inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like a derivation
|
lib.removeAttrs (input.sourceInfo or {}) [ "outPath" ]
|
||||||
lib.removeAttrs (input.sourceInfo or {}) [ "outPath" ]
|
// { store-path = input.outPath; } # comment this line if you don't want to retain a store reference to the flake inputs
|
||||||
// { store-path = input.outPath; } # comment this line if you don't want to retain a store reference to the flake inputs
|
)
|
||||||
)
|
);
|
||||||
);
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,14 +20,14 @@
|
|||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
|
|
||||||
appendConfig = ''
|
appendConfig = ''
|
||||||
# pcre_jit on;
|
pcre_jit on;
|
||||||
worker_processes auto;
|
worker_processes auto;
|
||||||
worker_rlimit_nofile 100000;
|
worker_rlimit_nofile 100000;
|
||||||
'';
|
'';
|
||||||
eventsConfig = ''
|
eventsConfig = ''
|
||||||
worker_connections 2048;
|
worker_connections 2048;
|
||||||
use epoll;
|
use epoll;
|
||||||
# multi_accept on;
|
multi_accept on;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,59 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.uptimed;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.services.uptimed.settings = lib.mkOption {
|
|
||||||
description = "";
|
|
||||||
default = { };
|
|
||||||
type = lib.types.submodule {
|
|
||||||
freeformType = with lib.types; attrsOf (either str (listOf str));
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
services.uptimed = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
settings = let
|
|
||||||
stateDir = "/var/lib/uptimed";
|
|
||||||
in {
|
|
||||||
PIDFILE = "${stateDir}/pid";
|
|
||||||
SENDMAIL = lib.mkDefault "${pkgs.system-sendmail}/bin/sendmail -t";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.uptimed = lib.mkIf (cfg.enable) {
|
|
||||||
serviceConfig = let
|
|
||||||
uptimed = pkgs.uptimed.overrideAttrs (prev: {
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace Makefile.am \
|
|
||||||
--replace-fail '$(sysconfdir)/uptimed.conf' '/var/lib/uptimed/uptimed.conf'
|
|
||||||
substituteInPlace src/Makefile.am \
|
|
||||||
--replace-fail '$(sysconfdir)/uptimed.conf' '/var/lib/uptimed/uptimed.conf'
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
|
|
||||||
in {
|
|
||||||
Type = "notify";
|
|
||||||
|
|
||||||
ExecStart = lib.mkForce "${uptimed}/sbin/uptimed -f";
|
|
||||||
|
|
||||||
BindReadOnlyPaths = let
|
|
||||||
configFile = lib.pipe cfg.settings [
|
|
||||||
(lib.mapAttrsToList
|
|
||||||
(k: v:
|
|
||||||
if builtins.isList v
|
|
||||||
then lib.mapConcatStringsSep "\n" (v': "${k}=${v'}") v
|
|
||||||
else "${k}=${v}")
|
|
||||||
)
|
|
||||||
(lib.concatStringsSep "\n")
|
|
||||||
(pkgs.writeText "uptimed.conf")
|
|
||||||
];
|
|
||||||
in [
|
|
||||||
"${configFile}:/var/lib/uptimed/uptimed.conf"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
15
base/vm.nix
15
base/vm.nix
@ -1,15 +0,0 @@
|
|||||||
{ lib, ... }:
|
|
||||||
|
|
||||||
# This enables
|
|
||||||
# lib.mkIf (!config.virtualisation.isVmVariant) { ... }
|
|
||||||
|
|
||||||
{
|
|
||||||
options.virtualisation.isVmVariant = lib.mkOption {
|
|
||||||
description = "`true` if system is build with 'nixos-rebuild build-vm'";
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
config.virtualisation.vmVariant = {
|
|
||||||
virtualisation.isVmVariant = true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
68
flake.lock
generated
68
flake.lock
generated
@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745502102,
|
"lastModified": 1741786315,
|
||||||
"narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
|
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
|
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -48,11 +48,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746563623,
|
"lastModified": 1736545379,
|
||||||
"narHash": "sha256-5DxgNFpSgxft/sWraZnHIUlb4S3Io73SVS7FZCbWSUY=",
|
"narHash": "sha256-PeTTmGumdOX3rd6OKI7QMCrZovCDkrckZbcHr+znxWA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "4e0408887f80e61a90286ff630a7855b828ae421",
|
"rev": "74f5316121776db2769385927ec0d0c2cc2b23e4",
|
||||||
"revCount": 45,
|
"revCount": 42,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"
|
"url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"
|
||||||
},
|
},
|
||||||
@ -124,11 +124,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743881366,
|
"lastModified": 1736531400,
|
||||||
"narHash": "sha256-ScGA2IHPk9ugf9bqEZnp+YB/OJgrkZblnG/XLEKvJAo=",
|
"narHash": "sha256-+X/HVI1AwoPcud28wI35XRrc1kDgkYdDUGABJBAkxDI=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "db2e4becf1b11e5dfd33de12a90a7d089fcf68ec",
|
"rev": "e4dafd06b3d7e9e6e07617766e9c3743134571b7",
|
||||||
"revCount": 11,
|
"revCount": 7,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git"
|
"url": "https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git"
|
||||||
},
|
},
|
||||||
@ -139,28 +139,34 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752247770,
|
"lastModified": 1741969460,
|
||||||
"narHash": "sha256-WDk5Sx9JWr8A+EPfkTLEcVNrBlY700rSNH8nm/oaVGY=",
|
"narHash": "sha256-SCNxTTBfMJV7XuTcLUfdAd6cgCGsazzi+DoPrceQrZ0=",
|
||||||
"rev": "739c8f530a2c5e0b9eefc8019d201654264cb974",
|
"owner": "NixOS",
|
||||||
"type": "tarball",
|
"repo": "nixpkgs",
|
||||||
"url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.806236.739c8f530a2c/nixexprs.tar.xz"
|
"rev": "68612419aa6c9fd5b178b81e6fabbdf46d300ea4",
|
||||||
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"owner": "NixOS",
|
||||||
"url": "https://nixos.org/channels/nixos-25.05-small/nixexprs.tar.xz"
|
"ref": "nixos-24.11-small",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748588304,
|
"lastModified": 1741960758,
|
||||||
"narHash": "sha256-YCnUqO9k39p0oMIBndxYTbu8m0fOA/KVcq3IekXPy9c=",
|
"narHash": "sha256-pSGMbfkxF7TSeco54W+B1q+g22YCVp1qXHgtrdgtyR4=",
|
||||||
"rev": "b8af95f4cf511c5f056b463c3a45d2b63c7cfb03",
|
"owner": "NixOS",
|
||||||
"type": "tarball",
|
"repo": "nixpkgs",
|
||||||
"url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre807945.b8af95f4cf51/nixexprs.tar.xz?rev=b8af95f4cf511c5f056b463c3a45d2b63c7cfb03"
|
"rev": "845dc1e9cbc2e48640b8968af58b4a19db67aa8f",
|
||||||
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"owner": "NixOS",
|
||||||
"url": "https://nixos.org/channels/nixos-unstable-small/nixexprs.tar.xz"
|
"ref": "nixos-unstable-small",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pvv-calendar-bot": {
|
"pvv-calendar-bot": {
|
||||||
@ -227,11 +233,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746498961,
|
"lastModified": 1729391507,
|
||||||
"narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=",
|
"narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba",
|
"rev": "784981a9feeba406de38c1c9a3decf966d853cca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -247,11 +253,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745310711,
|
"lastModified": 1741861888,
|
||||||
"narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
|
"narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
|
"rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
16
flake.nix
16
flake.nix
@ -2,8 +2,8 @@
|
|||||||
description = "PVV System flake";
|
description = "PVV System flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "https://nixos.org/channels/nixos-25.05-small/nixexprs.tar.xz";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small"; # remember to also update the url in base/services/auto-upgrade.nix
|
||||||
nixpkgs-unstable.url = "https://nixos.org/channels/nixos-unstable-small/nixexprs.tar.xz";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
||||||
|
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -91,14 +91,9 @@
|
|||||||
modules = [
|
modules = [
|
||||||
inputs.matrix-next.nixosModules.default
|
inputs.matrix-next.nixosModules.default
|
||||||
inputs.pvv-calendar-bot.nixosModules.default
|
inputs.pvv-calendar-bot.nixosModules.default
|
||||||
self.nixosModules.gickup
|
|
||||||
self.nixosModules.matrix-ooye
|
|
||||||
];
|
];
|
||||||
overlays = [
|
overlays = [
|
||||||
inputs.pvv-calendar-bot.overlays.x86_64-linux.default
|
inputs.pvv-calendar-bot.overlays.x86_64-linux.default
|
||||||
(final: prev: {
|
|
||||||
inherit (self.packages.${prev.system}) out-of-your-element;
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
bekkalokk = stableNixosConfig "bekkalokk" {
|
bekkalokk = stableNixosConfig "bekkalokk" {
|
||||||
@ -178,14 +173,12 @@
|
|||||||
snakeoil-certs = ./modules/snakeoil-certs.nix;
|
snakeoil-certs = ./modules/snakeoil-certs.nix;
|
||||||
snappymail = ./modules/snappymail.nix;
|
snappymail = ./modules/snappymail.nix;
|
||||||
robots-txt = ./modules/robots-txt.nix;
|
robots-txt = ./modules/robots-txt.nix;
|
||||||
gickup = ./modules/gickup;
|
|
||||||
matrix-ooye = ./modules/matrix-ooye.nix;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells = forAllSystems (system: {
|
devShells = forAllSystems (system: {
|
||||||
default = nixpkgs-unstable.legacyPackages.${system}.callPackage ./shell.nix { };
|
default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { };
|
||||||
cuda = let
|
cuda = let
|
||||||
cuda-pkgs = import nixpkgs-unstable {
|
cuda-pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
@ -207,7 +200,6 @@
|
|||||||
|
|
||||||
simplesamlphp = pkgs.callPackage ./packages/simplesamlphp { };
|
simplesamlphp = pkgs.callPackage ./packages/simplesamlphp { };
|
||||||
|
|
||||||
out-of-your-element = pkgs.callPackage ./packages/out-of-your-element.nix { };
|
|
||||||
} //
|
} //
|
||||||
(lib.pipe null [
|
(lib.pipe null [
|
||||||
(_: pkgs.callPackage ./packages/mediawiki-extensions { })
|
(_: pkgs.callPackage ./packages/mediawiki-extensions { })
|
||||||
|
|||||||
@ -214,11 +214,11 @@ in {
|
|||||||
"= /favicon.ico".alias = pkgs.runCommandLocal "mediawiki-favicon.ico" {
|
"= /favicon.ico".alias = pkgs.runCommandLocal "mediawiki-favicon.ico" {
|
||||||
buildInputs = with pkgs; [ imagemagick ];
|
buildInputs = with pkgs; [ imagemagick ];
|
||||||
} ''
|
} ''
|
||||||
magick \
|
convert \
|
||||||
${fp /assets/logo_blue_regular.png} \
|
|
||||||
-resize x64 \
|
-resize x64 \
|
||||||
-gravity center \
|
-gravity center \
|
||||||
-crop 64x64+0+0 \
|
-crop 64x64+0+0 \
|
||||||
|
${fp /assets/logo_blue_regular.png} \
|
||||||
-flatten \
|
-flatten \
|
||||||
-colors 256 \
|
-colors 256 \
|
||||||
-background transparent \
|
-background transparent \
|
||||||
|
|||||||
@ -53,7 +53,7 @@ in {
|
|||||||
|
|
||||||
echo "Creating thumbnail for $fname"
|
echo "Creating thumbnail for $fname"
|
||||||
mkdir -p $(dirname ".thumbnails/$fname")
|
mkdir -p $(dirname ".thumbnails/$fname")
|
||||||
magick -define jpeg:size=200x200 "$fname" -thumbnail 300 -auto-orient ".thumbnails/$fname.png" ||:
|
convert -define jpeg:size=200x200 "$fname" -thumbnail 300 -auto-orient ".thumbnails/$fname.png" ||:
|
||||||
touch -m -d "$(date -R -r "$fname")" ".thumbnails/$fname.png"
|
touch -m -d "$(date -R -r "$fname")" ".thumbnails/$fname.png"
|
||||||
done <<< "$images"
|
done <<< "$images"
|
||||||
'';
|
'';
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
./services/nginx
|
./services/nginx
|
||||||
|
|
||||||
./services/calendar-bot.nix
|
./services/calendar-bot.nix
|
||||||
./services/git-mirrors
|
|
||||||
./services/mysql.nix
|
./services/mysql.nix
|
||||||
./services/postgres.nix
|
./services/postgres.nix
|
||||||
|
|
||||||
|
|||||||
@ -1,100 +0,0 @@
|
|||||||
{ config, pkgs, lib, fp, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.gickup;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
sops.secrets."gickup/github-token" = {
|
|
||||||
owner = "gickup";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.gickup = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
dataDir = "/data/gickup";
|
|
||||||
|
|
||||||
destinationSettings = {
|
|
||||||
structured = true;
|
|
||||||
zip = false;
|
|
||||||
keep = 10;
|
|
||||||
bare = true;
|
|
||||||
lfs = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
instances = let
|
|
||||||
defaultGithubConfig = {
|
|
||||||
settings.token_file = config.sops.secrets."gickup/github-token".path;
|
|
||||||
};
|
|
||||||
defaultGitlabConfig = {
|
|
||||||
# settings.token_file = ...
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
"github:Git-Mediawiki/Git-Mediawiki" = defaultGithubConfig;
|
|
||||||
"github:NixOS/nixpkgs" = defaultGithubConfig;
|
|
||||||
"github:go-gitea/gitea" = defaultGithubConfig;
|
|
||||||
"github:heimdal/heimdal" = defaultGithubConfig;
|
|
||||||
"github:saltstack/salt" = defaultGithubConfig;
|
|
||||||
"github:typst/typst" = defaultGithubConfig;
|
|
||||||
"github:unmojang/FjordLauncher" = defaultGithubConfig;
|
|
||||||
"github:unmojang/drasl" = defaultGithubConfig;
|
|
||||||
"github:yushijinhun/authlib-injector" = defaultGithubConfig;
|
|
||||||
|
|
||||||
"gitlab:mx-puppet/discord/better-discord.js" = defaultGitlabConfig;
|
|
||||||
"gitlab:mx-puppet/discord/discord-markdown" = defaultGitlabConfig;
|
|
||||||
"gitlab:mx-puppet/discord/matrix-discord-parser" = defaultGitlabConfig;
|
|
||||||
"gitlab:mx-puppet/discord/mx-puppet-discord" = defaultGitlabConfig;
|
|
||||||
"gitlab:mx-puppet/mx-puppet-bridge" = defaultGitlabConfig;
|
|
||||||
|
|
||||||
"any:glibc" = {
|
|
||||||
settings.url = "https://sourceware.org/git/glibc.git";
|
|
||||||
};
|
|
||||||
|
|
||||||
"any:out-of-your-element" = {
|
|
||||||
settings.url = "https://gitdab.com/cadence/out-of-your-element.git";
|
|
||||||
};
|
|
||||||
|
|
||||||
"any:out-of-your-element-module" = {
|
|
||||||
settings.url = "https://cgit.rory.gay/nix/OOYE-module.git";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.cgit = let
|
|
||||||
domain = "mirrors.pvv.ntnu.no";
|
|
||||||
in {
|
|
||||||
${domain} = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.callPackage (fp /packages/cgit.nix) { };
|
|
||||||
group = "gickup";
|
|
||||||
scanPath = "${cfg.dataDir}/linktree";
|
|
||||||
settings = {
|
|
||||||
enable-commit-graph = true;
|
|
||||||
enable-follow-links = true;
|
|
||||||
enable-http-clone = true;
|
|
||||||
enable-remote-branches = true;
|
|
||||||
clone-url = "https://${domain}/$CGIT_REPO_URL";
|
|
||||||
remove-suffix = true;
|
|
||||||
root-title = "PVVSPPP";
|
|
||||||
root-desc = "PVV Speiler Praktisk og Prominent Programvare";
|
|
||||||
snapshots = "all";
|
|
||||||
logo = "/PVV-logo.png";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."mirrors.pvv.ntnu.no" = {
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
|
|
||||||
locations."= /PVV-logo.png".alias = let
|
|
||||||
small-pvv-logo = pkgs.runCommandLocal "pvv-logo-96x96" {
|
|
||||||
nativeBuildInputs = [ pkgs.imagemagick ];
|
|
||||||
} ''
|
|
||||||
magick '${fp /assets/logo_blue_regular.svg}' -resize 96x96 PNG:"$out"
|
|
||||||
'';
|
|
||||||
in toString small-pvv-logo;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."fcgiwrap-cgit-mirrors.pvv.ntnu.no" = {
|
|
||||||
serviceConfig.BindReadOnlyPaths = [ cfg.dataDir ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -9,8 +9,7 @@
|
|||||||
./coturn.nix
|
./coturn.nix
|
||||||
./mjolnir.nix
|
./mjolnir.nix
|
||||||
|
|
||||||
# ./discord.nix
|
./discord.nix
|
||||||
./out-of-your-element.nix
|
|
||||||
./hookshot
|
./hookshot
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@ -45,7 +45,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
services.mx-puppet-discord.enable = false;
|
services.mx-puppet-discord.enable = true;
|
||||||
services.mx-puppet-discord.settings = {
|
services.mx-puppet-discord.settings = {
|
||||||
bridge = {
|
bridge = {
|
||||||
bindAddress = "localhost";
|
bindAddress = "localhost";
|
||||||
|
|||||||
@ -1,66 +0,0 @@
|
|||||||
{ config, pkgs, fp, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.matrix-ooye;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
users.groups.keys-matrix-registrations = { };
|
|
||||||
|
|
||||||
sops.secrets = {
|
|
||||||
"matrix/ooye/as_token" = {
|
|
||||||
sopsFile = fp /secrets/bicep/matrix.yaml;
|
|
||||||
key = "ooye/as_token";
|
|
||||||
};
|
|
||||||
"matrix/ooye/hs_token" = {
|
|
||||||
sopsFile = fp /secrets/bicep/matrix.yaml;
|
|
||||||
key = "ooye/hs_token";
|
|
||||||
};
|
|
||||||
"matrix/ooye/discord_token" = {
|
|
||||||
sopsFile = fp /secrets/bicep/matrix.yaml;
|
|
||||||
key = "ooye/discord_token";
|
|
||||||
};
|
|
||||||
"matrix/ooye/discord_client_secret" = {
|
|
||||||
sopsFile = fp /secrets/bicep/matrix.yaml;
|
|
||||||
key = "ooye/discord_client_secret";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.matrix-ooye = {
|
|
||||||
enable = true;
|
|
||||||
homeserver = "https://matrix.pvv.ntnu.no";
|
|
||||||
homeserverName = "pvv.ntnu.no";
|
|
||||||
discordTokenPath = config.sops.secrets."matrix/ooye/discord_token".path;
|
|
||||||
discordClientSecretPath = config.sops.secrets."matrix/ooye/discord_client_secret".path;
|
|
||||||
bridgeOrigin = "https://ooye.pvv.ntnu.no";
|
|
||||||
|
|
||||||
enableSynapseIntegration = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."matrix-synapse" = {
|
|
||||||
after = [
|
|
||||||
"matrix-ooye-pre-start.service"
|
|
||||||
"network-online.target"
|
|
||||||
];
|
|
||||||
requires = [ "matrix-ooye-pre-start.service" ];
|
|
||||||
serviceConfig = {
|
|
||||||
LoadCredential = [
|
|
||||||
"matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml"
|
|
||||||
];
|
|
||||||
ExecStartPre = [
|
|
||||||
"+${pkgs.coreutils}/bin/cp /run/credentials/matrix-synapse.service/matrix-ooye-registration ${config.services.matrix-synapse-next.dataDir}/ooye-registration.yaml"
|
|
||||||
"+${pkgs.coreutils}/bin/chown matrix-synapse:keys-matrix-registrations ${config.services.matrix-synapse-next.dataDir}/ooye-registration.yaml"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.matrix-synapse-next.settings = {
|
|
||||||
app_service_config_files = [
|
|
||||||
"${config.services.matrix-synapse-next.dataDir}/ooye-registration.yaml"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."ooye.pvv.ntnu.no" = {
|
|
||||||
forceSSL = true;
|
|
||||||
enableACME = true;
|
|
||||||
locations."/".proxyPass = "http://localhost:${cfg.socket}";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
(fp /modules/grzegorz.nix)
|
(fp /modules/grzegorz.nix)
|
||||||
];
|
];
|
||||||
services.spotifyd.enable = true;
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
|||||||
@ -3,12 +3,7 @@ let
|
|||||||
cfg = config.services.gitea;
|
cfg = config.services.gitea;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
services.gitea-themes = {
|
services.gitea-themes.monokai = pkgs.gitea-theme-monokai;
|
||||||
monokai = pkgs.gitea-theme-monokai;
|
|
||||||
earl-grey = pkgs.gitea-theme-earl-grey;
|
|
||||||
pitch-black = pkgs.gitea-theme-pitch-black;
|
|
||||||
catppuccin = pkgs.gitea-theme-catppuccin;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.gitea-customization = lib.mkIf cfg.enable {
|
systemd.services.gitea-customization = lib.mkIf cfg.enable {
|
||||||
description = "Install extra customization in gitea's CUSTOM_DIR";
|
description = "Install extra customization in gitea's CUSTOM_DIR";
|
||||||
|
|||||||
57
justfile
57
justfile
@ -1,56 +1,25 @@
|
|||||||
set positional-arguments # makes variables accesible as $1 $2 $@
|
|
||||||
export GUM_FILTER_HEIGHT := "15"
|
export GUM_FILTER_HEIGHT := "15"
|
||||||
nom := `if [[ -t 1 ]] && command -v nom >/dev/null; then echo nom; else echo nix; fi`
|
nom := `if command -v nom >/dev/null; then echo nom; else echo nix; fi`
|
||||||
nix_eval_opts := "--log-format raw --option warn-dirty false"
|
|
||||||
|
|
||||||
@_default:
|
@_default:
|
||||||
just "$(gum choose --ordered --header "Pick a recipie..." $(just --summary --unsorted))"
|
just "$(gum choose --ordered --header "Pick a recipie..." $(just --summary --unsorted))"
|
||||||
|
|
||||||
check *_:
|
check:
|
||||||
nix flake check --keep-going "$@"
|
nix flake check --keep-going
|
||||||
|
|
||||||
build-machine machine=`just _a_machine` *_:
|
build-machine machine=`just _a_machine`:
|
||||||
{{nom}} build .#nixosConfigurations.{{ machine }}.config.system.build.toplevel "${@:2}"
|
{{nom}} build .#nixosConfigurations.{{ machine }}.config.system.build.toplevel
|
||||||
|
|
||||||
run-vm machine=`just _a_machine` *_:
|
run-vm machine=`just _a_machine`:
|
||||||
nixos-rebuild build-vm --flake .#{{ machine }} "${@:2}"
|
nixos-rebuild build-vm --flake .#{{ machine }}
|
||||||
QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::8081-:443,hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
|
QEMU_NET_OPTS="hostfwd=tcp::8080-:80,hostfwd=tcp::8081-:443,hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
|
||||||
|
|
||||||
@update-inputs *_:
|
@update-inputs:
|
||||||
@git reset flake.lock
|
nix eval .#inputs --apply builtins.attrNames --json \
|
||||||
@git restore flake.lock
|
| jq '.[]' -r \
|
||||||
nix eval {{nix_eval_opts}} --file flake.nix --apply 'x: builtins.attrNames x.inputs' --json \
|
| gum choose --no-limit --height=15 \
|
||||||
| { printf "%s\n" --commit-lock-file; jq '.[]' -r | grep -vxF "self" ||:; } \
|
| xargs -L 1 nix flake lock --update-input
|
||||||
| gum choose --no-limit --header "Choose extra arguments:" \
|
|
||||||
| tee >(xargs -d'\n' echo + nix flake update "$@" >&2) \
|
|
||||||
| xargs -d'\n' nix flake update "$@"
|
|
||||||
|
|
||||||
@repl $machine=`just _a_machine` *_:
|
|
||||||
set -v; nixos-rebuild --flake .#"$machine" repl "${@:2}"
|
|
||||||
|
|
||||||
@eval $machine=`just _a_machine` $attrpath="system.build.toplevel.outPath" *_:
|
|
||||||
set -v; nix eval {{nix_eval_opts}} ".#nixosConfigurations.\"$machine\".config.$attrpath" --show-trace "${@:3}"
|
|
||||||
|
|
||||||
@eval-vm $machine=`just _a_machine` $attrpath="system.build.toplevel.outPath" *_:
|
|
||||||
just eval "$machine" "virtualisation.vmVariant.$attrpath" "${@:3}"
|
|
||||||
|
|
||||||
|
|
||||||
# helpers
|
|
||||||
|
|
||||||
[no-exit-message]
|
|
||||||
_a_machine:
|
_a_machine:
|
||||||
#!/usr/bin/env -S sh -euo pipefail
|
nix eval .#nixosConfigurations --apply builtins.attrNames --json | jq .[] -r | gum filter
|
||||||
machines="$(
|
|
||||||
nix eval {{nix_eval_opts}} .#nixosConfigurations --apply builtins.attrNames --json | jq .[] -r
|
|
||||||
)"
|
|
||||||
[ -n "$machines" ] || { echo >&2 "ERROR: no machines found"; false; }
|
|
||||||
if [ -s .direnv/vars/last-machine.txt ]; then
|
|
||||||
machines="$(
|
|
||||||
grep <<<"$machines" -xF "$(cat .direnv/vars/last-machine.txt)" ||:
|
|
||||||
grep <<<"$machines" -xFv "$(cat .direnv/vars/last-machine.txt)" ||:
|
|
||||||
)"
|
|
||||||
fi
|
|
||||||
choice="$(gum filter <<<"$machines")"
|
|
||||||
mkdir -p .direnv/vars
|
|
||||||
cat <<<"$choice" >.direnv/vars/last-machine.txt
|
|
||||||
cat <<<"$choice"
|
|
||||||
|
|||||||
@ -1,310 +0,0 @@
|
|||||||
{ config, pkgs, lib, utils, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.gickup;
|
|
||||||
format = pkgs.formats.yaml { };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
./set-description.nix
|
|
||||||
./hardlink-files.nix
|
|
||||||
./import-from-toml.nix
|
|
||||||
./update-linktree.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
options.services.gickup = {
|
|
||||||
enable = lib.mkEnableOption "gickup, a git repository mirroring service";
|
|
||||||
|
|
||||||
package = lib.mkPackageOption pkgs "gickup" { };
|
|
||||||
gitPackage = lib.mkPackageOption pkgs "git" { };
|
|
||||||
gitLfsPackage = lib.mkPackageOption pkgs "git-lfs" { };
|
|
||||||
|
|
||||||
dataDir = lib.mkOption {
|
|
||||||
type = lib.types.path;
|
|
||||||
description = "The directory to mirror repositories to.";
|
|
||||||
default = "/var/lib/gickup";
|
|
||||||
example = "/data/gickup";
|
|
||||||
};
|
|
||||||
|
|
||||||
destinationSettings = lib.mkOption {
|
|
||||||
description = ''
|
|
||||||
Settings for destination local, see gickup configuration file
|
|
||||||
|
|
||||||
Note that `path` will be set automatically to `/var/lib/gickup`
|
|
||||||
'';
|
|
||||||
type = lib.types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
};
|
|
||||||
default = { };
|
|
||||||
example = {
|
|
||||||
structured = true;
|
|
||||||
zip = false;
|
|
||||||
keep = 10;
|
|
||||||
bare = true;
|
|
||||||
lfs = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
instances = lib.mkOption {
|
|
||||||
type = lib.types.attrsOf (lib.types.submodule (submoduleInputs@{ name, ... }: let
|
|
||||||
submoduleName = name;
|
|
||||||
|
|
||||||
nameParts = rec {
|
|
||||||
repoType = builtins.head (lib.splitString ":" submoduleName);
|
|
||||||
|
|
||||||
owner = if repoType == "any"
|
|
||||||
then null
|
|
||||||
else lib.pipe submoduleName [
|
|
||||||
(lib.removePrefix "${repoType}:")
|
|
||||||
(lib.splitString "/")
|
|
||||||
builtins.head
|
|
||||||
];
|
|
||||||
|
|
||||||
repo = if repoType == "any"
|
|
||||||
then null
|
|
||||||
else lib.pipe submoduleName [
|
|
||||||
(lib.removePrefix "${repoType}:")
|
|
||||||
(lib.splitString "/")
|
|
||||||
lib.last
|
|
||||||
];
|
|
||||||
|
|
||||||
slug = if repoType == "any"
|
|
||||||
then lib.toLower (builtins.replaceStrings [ ":" "/" ] [ "-" "-" ] submoduleName)
|
|
||||||
else "${lib.toLower repoType}-${lib.toLower owner}-${lib.toLower repo}";
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
options = {
|
|
||||||
interval = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "daily";
|
|
||||||
example = "weekly";
|
|
||||||
description = ''
|
|
||||||
Specification (in the format described by {manpage}`systemd.time(7)`) of the time
|
|
||||||
interval at which to run the service.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
type = lib.mkOption {
|
|
||||||
type = lib.types.enum [
|
|
||||||
"github"
|
|
||||||
"gitlab"
|
|
||||||
"gitea"
|
|
||||||
"gogs"
|
|
||||||
"bitbucket"
|
|
||||||
"onedev"
|
|
||||||
"sourcehut"
|
|
||||||
"any"
|
|
||||||
];
|
|
||||||
example = "github";
|
|
||||||
default = nameParts.repoType;
|
|
||||||
description = ''
|
|
||||||
The type of the repository to mirror.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
owner = lib.mkOption {
|
|
||||||
type = with lib.types; nullOr str;
|
|
||||||
example = "go-gitea";
|
|
||||||
default = nameParts.owner;
|
|
||||||
description = ''
|
|
||||||
The owner of the repository to mirror (if applicable)
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
repo = lib.mkOption {
|
|
||||||
type = with lib.types; nullOr str;
|
|
||||||
example = "gitea";
|
|
||||||
default = nameParts.repo;
|
|
||||||
description = ''
|
|
||||||
The name of the repository to mirror (if applicable)
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
slug = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = nameParts.slug;
|
|
||||||
example = "github-go-gitea-gitea";
|
|
||||||
description = ''
|
|
||||||
The slug of the repository to mirror.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
description = lib.mkOption {
|
|
||||||
type = with lib.types; nullOr str;
|
|
||||||
example = "A project which does this and that";
|
|
||||||
description = ''
|
|
||||||
A description of the project. This isn't used directly by gickup for anything,
|
|
||||||
but can be useful if gickup is used together with cgit or similar.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
settings = lib.mkOption {
|
|
||||||
description = "Instance specific settings, see gickup configuration file";
|
|
||||||
type = lib.types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
};
|
|
||||||
default = { };
|
|
||||||
example = {
|
|
||||||
username = "gickup";
|
|
||||||
password = "hunter2";
|
|
||||||
wiki = true;
|
|
||||||
issues = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
users.users.gickup = {
|
|
||||||
isSystemUser = true;
|
|
||||||
group = "gickup";
|
|
||||||
home = "/var/lib/gickup";
|
|
||||||
};
|
|
||||||
|
|
||||||
users.groups.gickup = { };
|
|
||||||
|
|
||||||
services.gickup.destinationSettings.path = "/var/lib/gickup/raw";
|
|
||||||
|
|
||||||
systemd.tmpfiles.settings."10-gickup" = lib.mkIf (cfg.dataDir != "/var/lib/gickup") {
|
|
||||||
${cfg.dataDir}.d = {
|
|
||||||
user = "gickup";
|
|
||||||
group = "gickup";
|
|
||||||
mode = "0755";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.slices."system-gickup" = {
|
|
||||||
description = "Gickup git repository mirroring service";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.targets.gickup = {
|
|
||||||
description = "Gickup git repository mirroring service";
|
|
||||||
wants = map ({ slug, ... }: "gickup@${slug}.service") (lib.attrValues cfg.instances);
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers = {
|
|
||||||
"gickup@" = {
|
|
||||||
description = "Gickup git repository mirroring service for %i";
|
|
||||||
|
|
||||||
timerConfig = {
|
|
||||||
OnCalendar = "daily";
|
|
||||||
RandomizedDelaySec = "1h";
|
|
||||||
Persistent = true;
|
|
||||||
AccuracySec = "1s";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
//
|
|
||||||
# Overrides for mirrors which are not "daily"
|
|
||||||
(lib.pipe cfg.instances [
|
|
||||||
builtins.attrValues
|
|
||||||
(builtins.filter (instance: instance.interval != "daily"))
|
|
||||||
(map ({ slug, interval, ... }: {
|
|
||||||
name = "gickup@${slug}";
|
|
||||||
value = {
|
|
||||||
overrideStrategy = "asDropin";
|
|
||||||
timerConfig.OnCalendar = interval;
|
|
||||||
};
|
|
||||||
}))
|
|
||||||
builtins.listToAttrs
|
|
||||||
]);
|
|
||||||
|
|
||||||
systemd.targets.timers.wants = map ({ slug, ... }: "gickup@${slug}.timer") (lib.attrValues cfg.instances);
|
|
||||||
|
|
||||||
systemd.services = {
|
|
||||||
"gickup@" = let
|
|
||||||
configDir = lib.pipe cfg.instances [
|
|
||||||
(lib.mapAttrsToList (name: instance: {
|
|
||||||
name = "${instance.slug}.yml";
|
|
||||||
path = format.generate "gickup-configuration-${name}.yml" {
|
|
||||||
destination.local = [ cfg.destinationSettings ];
|
|
||||||
source.${instance.type} = [
|
|
||||||
(
|
|
||||||
(lib.optionalAttrs (instance.type != "any") {
|
|
||||||
user = instance.owner;
|
|
||||||
includeorgs = [ instance.owner ];
|
|
||||||
include = [ instance.repo ];
|
|
||||||
})
|
|
||||||
//
|
|
||||||
instance.settings
|
|
||||||
)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}))
|
|
||||||
(pkgs.linkFarm "gickup-configuration-files")
|
|
||||||
];
|
|
||||||
in {
|
|
||||||
description = "Gickup git repository mirroring service for %i";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
|
|
||||||
path = [
|
|
||||||
cfg.gitPackage
|
|
||||||
cfg.gitLfsPackage
|
|
||||||
];
|
|
||||||
|
|
||||||
restartIfChanged = false;
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = "'${pkgs.gickup}/bin/gickup' '${configDir}/%i.yml'";
|
|
||||||
ExecStartPost = "";
|
|
||||||
|
|
||||||
User = "gickup";
|
|
||||||
Group = "gickup";
|
|
||||||
|
|
||||||
BindPaths = lib.optionals (cfg.dataDir != "/var/lib/gickup") [
|
|
||||||
"${cfg.dataDir}:/var/lib/gickup"
|
|
||||||
];
|
|
||||||
|
|
||||||
Slice = "system-gickup.slice";
|
|
||||||
|
|
||||||
SyslogIdentifier = "gickup-%i";
|
|
||||||
StateDirectory = "gickup";
|
|
||||||
# WorkingDirectory = "gickup";
|
|
||||||
# RuntimeDirectory = "gickup";
|
|
||||||
# RuntimeDirectoryMode = "0700";
|
|
||||||
|
|
||||||
# https://discourse.nixos.org/t/how-to-prevent-custom-systemd-service-from-restarting-on-nixos-rebuild-switch/43431
|
|
||||||
RemainAfterExit = true;
|
|
||||||
|
|
||||||
# Hardening options
|
|
||||||
AmbientCapabilities = [];
|
|
||||||
LockPersonality = true;
|
|
||||||
NoNewPrivileges = true;
|
|
||||||
PrivateDevices = true;
|
|
||||||
PrivateMounts = true;
|
|
||||||
PrivateTmp = true;
|
|
||||||
PrivateUsers = true;
|
|
||||||
ProcSubset = "pid";
|
|
||||||
ProtectClock = true;
|
|
||||||
ProtectControlGroups = true;
|
|
||||||
ProtectHome = true;
|
|
||||||
ProtectHostname = true;
|
|
||||||
ProtectKernelLogs = true;
|
|
||||||
ProtectKernelModules = true;
|
|
||||||
ProtectKernelTunables = true;
|
|
||||||
# ProtectProc = "invisible";
|
|
||||||
# ProtectSystem = "strict";
|
|
||||||
RemoveIPC = true;
|
|
||||||
RestrictAddressFamilies = [
|
|
||||||
"AF_INET"
|
|
||||||
"AF_INET6"
|
|
||||||
];
|
|
||||||
RestrictNamespaces = true;
|
|
||||||
RestrictRealtime = true;
|
|
||||||
RestrictSUIDSGID = true;
|
|
||||||
SystemCallArchitectures = "native";
|
|
||||||
# SystemCallFilter = [
|
|
||||||
# "@system-service"
|
|
||||||
# "~@resources"
|
|
||||||
# "~@privileged"
|
|
||||||
# ];
|
|
||||||
UMask = "0002";
|
|
||||||
CapabilityBoundingSet = [];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.gickup;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
# TODO: add a service that will look at the backed up files and hardlink
|
|
||||||
# the ones that have a matching hash together to save space. This can
|
|
||||||
# either run routinely (i.e. trigger by systemd-timer), or be activated
|
|
||||||
# whenever a gickup@<slug>.service finishes. The latter is probably better.
|
|
||||||
|
|
||||||
# systemd.services."gickup-hardlink" = {
|
|
||||||
# serviceConfig = {
|
|
||||||
# Type = "oneshot";
|
|
||||||
# ExecStart = let
|
|
||||||
# script = pkgs.writeShellApplication {
|
|
||||||
# name = "gickup-hardlink-files.sh";
|
|
||||||
# runtimeInputs = [ pkgs.coreutils pkgs.jdupes ];
|
|
||||||
# text = ''
|
|
||||||
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
# in lib.getExe script;
|
|
||||||
|
|
||||||
# User = "gickup";
|
|
||||||
# Group = "gickup";
|
|
||||||
|
|
||||||
# BindPaths = lib.optionals (cfg.dataDir != "/var/lib/gickup") [
|
|
||||||
# "${cfg.dataDir}:/var/lib/gickup"
|
|
||||||
# ];
|
|
||||||
|
|
||||||
# Slice = "system-gickup.slice";
|
|
||||||
|
|
||||||
# StateDirectory = "gickup";
|
|
||||||
|
|
||||||
# # Hardening options
|
|
||||||
# # TODO:
|
|
||||||
# PrivateNetwork = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.gickup;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
# TODO: import cfg.instances from a toml file to make it easier for non-nix users
|
|
||||||
# to add repositories to mirror
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.gickup;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
# TODO: create .git/description files for each repo where cfg.instances.<instance>.description is set
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.services.gickup;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
# TODO: run upon completion of cloning a repository
|
|
||||||
systemd.timers."gickup-linktree" = {
|
|
||||||
wantedBy = [ "timers.target" ];
|
|
||||||
timerConfig = {
|
|
||||||
OnCalendar = "daily";
|
|
||||||
Persistent = true;
|
|
||||||
Unit = "gickup-linktree.service";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# TODO: update symlink for one repo at a time (e.g. gickup-linktree@<instance>.service)
|
|
||||||
systemd.services."gickup-linktree" = {
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = let
|
|
||||||
script = pkgs.writeShellApplication {
|
|
||||||
name = "gickup-update-symlink-tree.sh";
|
|
||||||
runtimeInputs = [
|
|
||||||
pkgs.coreutils
|
|
||||||
pkgs.findutils
|
|
||||||
];
|
|
||||||
text = ''
|
|
||||||
shopt -s nullglob
|
|
||||||
|
|
||||||
for repository in ./*/*/*; do
|
|
||||||
REPOSITORY_RELATIVE_DIRS=''${repository#"./"}
|
|
||||||
|
|
||||||
echo "Checking $REPOSITORY_RELATIVE_DIRS"
|
|
||||||
|
|
||||||
declare -a REVISIONS
|
|
||||||
readarray -t REVISIONS < <(find "$repository" -mindepth 1 -maxdepth 1 -printf "%f\n" | sort --numeric-sort --reverse)
|
|
||||||
|
|
||||||
if [[ "''${#REVISIONS[@]}" == 0 ]]; then
|
|
||||||
echo "Found no revisions for $repository, continuing"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
LAST_REVISION="''${REVISIONS[0]}"
|
|
||||||
SYMLINK_PATH="../linktree/''${REPOSITORY_RELATIVE_DIRS}"
|
|
||||||
|
|
||||||
mkdir -p "$(dirname "$SYMLINK_PATH")"
|
|
||||||
|
|
||||||
EXPECTED_SYMLINK_TARGET=$(realpath "''${repository}/''${LAST_REVISION}")
|
|
||||||
EXISTING_SYMLINK_TARGET=$(realpath "$SYMLINK_PATH" || echo "<none>")
|
|
||||||
|
|
||||||
if [[ "$EXISTING_SYMLINK_TARGET" != "$EXPECTED_SYMLINK_TARGET" ]]; then
|
|
||||||
echo "Updating symlink for $REPOSITORY_RELATIVE_DIRS"
|
|
||||||
rm "$SYMLINK_PATH" ||:
|
|
||||||
ln -rs "$EXPECTED_SYMLINK_TARGET" "$SYMLINK_PATH"
|
|
||||||
else
|
|
||||||
echo "Symlink already up to date, continuing..."
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "---"
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in lib.getExe script;
|
|
||||||
|
|
||||||
User = "gickup";
|
|
||||||
Group = "gickup";
|
|
||||||
|
|
||||||
BindPaths = lib.optionals (cfg.dataDir != "/var/lib/gickup") [
|
|
||||||
"${cfg.dataDir}:/var/lib/gickup"
|
|
||||||
];
|
|
||||||
|
|
||||||
Slice = "system-gickup.slice";
|
|
||||||
|
|
||||||
StateDirectory = "gickup";
|
|
||||||
WorkingDirectory = "/var/lib/gickup/raw";
|
|
||||||
|
|
||||||
# Hardening options
|
|
||||||
# TODO:
|
|
||||||
PrivateNetwork = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -13,11 +13,6 @@ in {
|
|||||||
enablePipewire = true;
|
enablePipewire = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.restart-greg-ng = {
|
|
||||||
script = "systemctl --user restart greg-ng.service";
|
|
||||||
startAt = "*-*-* 06:30:00";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.grzegorz-webui = {
|
services.grzegorz-webui = {
|
||||||
enable = true;
|
enable = true;
|
||||||
listenAddr = "localhost";
|
listenAddr = "localhost";
|
||||||
@ -46,15 +41,6 @@ in {
|
|||||||
allow 2001:700:300:1900::/64;
|
allow 2001:700:300:1900::/64;
|
||||||
deny all;
|
deny all;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
locations."/docs" = {
|
|
||||||
proxyPass = "http://${grg.settings.host}:${toString grg.settings.port}";
|
|
||||||
};
|
|
||||||
|
|
||||||
locations."/api" = {
|
|
||||||
proxyPass = "http://${grg.settings.host}:${toString grg.settings.port}";
|
|
||||||
proxyWebsockets = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"${machine}-backend.pvv.ntnu.no" = {
|
"${machine}-backend.pvv.ntnu.no" = {
|
||||||
|
|||||||
@ -1,211 +0,0 @@
|
|||||||
# Original from: https://cgit.rory.gay/nix/OOYE-module.git/
|
|
||||||
|
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
cfg = config.services.matrix-ooye;
|
|
||||||
mkStringOption =
|
|
||||||
name: default:
|
|
||||||
lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = default;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
services.matrix-ooye = {
|
|
||||||
enable = lib.mkEnableOption "Enable OOYE service";
|
|
||||||
package = lib.mkOption {
|
|
||||||
type = lib.types.package;
|
|
||||||
default = pkgs.out-of-your-element;
|
|
||||||
};
|
|
||||||
appserviceId = mkStringOption "The ID of the appservice." "ooye";
|
|
||||||
homeserver = mkStringOption "The homeserver to connect to." "http://localhost:8006";
|
|
||||||
homeserverName = mkStringOption "The name of the homeserver to connect to." "localhost";
|
|
||||||
namespace = mkStringOption "The prefix to use for the MXIDs/aliases of bridged users/rooms. Should end with a _!" "_ooye_";
|
|
||||||
discordTokenPath = mkStringOption "The path to the discord token file." "/etc/ooye-discord-token";
|
|
||||||
discordClientSecretPath = mkStringOption "The path to the discord token file." "/etc/ooye-discord-client-secret";
|
|
||||||
socket = mkStringOption "The socket to listen on, can either be a port number or a unix socket path." "6693";
|
|
||||||
bridgeOrigin = mkStringOption "The web frontend URL for the bridge, defaults to http://localhost:{socket}" "";
|
|
||||||
|
|
||||||
enableSynapseIntegration = lib.mkEnableOption "Enable Synapse integration";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = lib.mkIf cfg.enable (
|
|
||||||
let
|
|
||||||
baseConfig = pkgs.writeText "matrix-ooye-config.json" (
|
|
||||||
builtins.toJSON {
|
|
||||||
id = cfg.appserviceId;
|
|
||||||
namespaces = {
|
|
||||||
users = [
|
|
||||||
{
|
|
||||||
exclusive = true;
|
|
||||||
regex = "@${cfg.namespace}.*:${cfg.homeserverName}";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
aliases = [
|
|
||||||
{
|
|
||||||
exclusive = true;
|
|
||||||
regex = "#${cfg.namespace}.*:${cfg.homeserverName}";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
protocols = [ "discord" ];
|
|
||||||
sender_localpart = "${cfg.namespace}bot";
|
|
||||||
rate_limited = false;
|
|
||||||
socket = cfg.socket; # Can either be a TCP port or a unix socket path
|
|
||||||
url = if (lib.hasPrefix "/" cfg.socket) then "unix:${cfg.socket}" else "http://localhost:${cfg.socket}";
|
|
||||||
ooye = {
|
|
||||||
server_name = cfg.homeserverName;
|
|
||||||
namespace_prefix = cfg.namespace;
|
|
||||||
max_file_size = 5000000;
|
|
||||||
content_length_workaround = false;
|
|
||||||
include_user_id_in_mxid = true;
|
|
||||||
server_origin = cfg.homeserver;
|
|
||||||
bridge_origin = if (cfg.bridgeOrigin == "") then "http://localhost:${cfg.socket}" else cfg.bridgeOrigin;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
script = pkgs.writeScript "matrix-ooye-pre-start.sh" ''
|
|
||||||
#!${lib.getExe pkgs.bash}
|
|
||||||
REGISTRATION_FILE=registration.yaml
|
|
||||||
|
|
||||||
id
|
|
||||||
echo "Before if statement"
|
|
||||||
stat ''${REGISTRATION_FILE}
|
|
||||||
|
|
||||||
if [[ ! -f ''${REGISTRATION_FILE} ]]; then
|
|
||||||
echo "No registration file found at '$REGISTRATION_FILE'"
|
|
||||||
cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE}
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "After if statement"
|
|
||||||
stat ''${REGISTRATION_FILE}
|
|
||||||
|
|
||||||
AS_TOKEN=$(${lib.getExe pkgs.jq} -r .as_token ''${REGISTRATION_FILE})
|
|
||||||
HS_TOKEN=$(${lib.getExe pkgs.jq} -r .hs_token ''${REGISTRATION_FILE})
|
|
||||||
DISCORD_TOKEN=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_token)
|
|
||||||
DISCORD_CLIENT_SECRET=$(cat /run/credentials/matrix-ooye-pre-start.service/discord_client_secret)
|
|
||||||
|
|
||||||
# Check if we have all required tokens
|
|
||||||
if [[ -z "$AS_TOKEN" || "$AS_TOKEN" == "null" ]]; then
|
|
||||||
AS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64)
|
|
||||||
echo "Generated new AS token: ''${AS_TOKEN}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z "$HS_TOKEN" || "$HS_TOKEN" == "null" ]]; then
|
|
||||||
HS_TOKEN=$(${lib.getExe pkgs.openssl} rand -hex 64)
|
|
||||||
echo "Generated new HS token: ''${HS_TOKEN}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z "$DISCORD_TOKEN" ]]; then
|
|
||||||
echo "No Discord token found at '${cfg.discordTokenPath}'"
|
|
||||||
echo "You can find this on the 'Bot' tab of your Discord application."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z "$DISCORD_CLIENT_SECRET" ]]; then
|
|
||||||
echo "No Discord client secret found at '${cfg.discordTokenPath}'"
|
|
||||||
echo "You can find this on the 'OAuth2' tab of your Discord application."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
shred -u ''${REGISTRATION_FILE}
|
|
||||||
cp --no-preserve=mode,ownership ${baseConfig} ''${REGISTRATION_FILE}
|
|
||||||
|
|
||||||
${lib.getExe pkgs.jq} '.as_token = "'$AS_TOKEN'" | .hs_token = "'$HS_TOKEN'" | .ooye.discord_token = "'$DISCORD_TOKEN'" | .ooye.discord_client_secret = "'$DISCORD_CLIENT_SECRET'"' ''${REGISTRATION_FILE} > ''${REGISTRATION_FILE}.tmp
|
|
||||||
|
|
||||||
shred -u ''${REGISTRATION_FILE}
|
|
||||||
mv ''${REGISTRATION_FILE}.tmp ''${REGISTRATION_FILE}
|
|
||||||
'';
|
|
||||||
|
|
||||||
in
|
|
||||||
{
|
|
||||||
warnings =
|
|
||||||
lib.optionals ((builtins.substring (lib.stringLength cfg.namespace - 1) 1 cfg.namespace) != "_") [
|
|
||||||
"OOYE namespace does not end with an underscore! This is recommended to have better ID formatting. Provided: '${cfg.namespace}'"
|
|
||||||
]
|
|
||||||
++ lib.optionals ((builtins.substring 0 1 cfg.namespace) != "_") [
|
|
||||||
"OOYE namespace does not start with an underscore! This is recommended to avoid conflicts with registered users. Provided: '${cfg.namespace}'"
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.systemPackages = [ cfg.package ];
|
|
||||||
|
|
||||||
systemd.services."matrix-ooye-pre-start" = {
|
|
||||||
enable = true;
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = script;
|
|
||||||
WorkingDirectory = "/var/lib/matrix-ooye";
|
|
||||||
StateDirectory = "matrix-ooye";
|
|
||||||
DynamicUser = true;
|
|
||||||
RemainAfterExit = true;
|
|
||||||
Type = "oneshot";
|
|
||||||
|
|
||||||
LoadCredential = [
|
|
||||||
"discord_token:${cfg.discordTokenPath}"
|
|
||||||
"discord_client_secret:${cfg.discordClientSecretPath}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."matrix-ooye" = {
|
|
||||||
enable = true;
|
|
||||||
description = "Out of Your Element - a Discord bridge for Matrix.";
|
|
||||||
|
|
||||||
wants = [
|
|
||||||
"network-online.target"
|
|
||||||
"matrix-synapse.service"
|
|
||||||
"conduit.service"
|
|
||||||
"dendrite.service"
|
|
||||||
];
|
|
||||||
after = [
|
|
||||||
"matrix-ooye-pre-start.service"
|
|
||||||
"network-online.target"
|
|
||||||
];
|
|
||||||
requires = [ "matrix-ooye-pre-start.service" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = lib.getExe config.services.matrix-ooye.package;
|
|
||||||
WorkingDirectory = "/var/lib/matrix-ooye";
|
|
||||||
StateDirectory = "matrix-ooye";
|
|
||||||
#ProtectSystem = "strict";
|
|
||||||
#ProtectHome = true;
|
|
||||||
#PrivateTmp = true;
|
|
||||||
#NoNewPrivileges = true;
|
|
||||||
#PrivateDevices = true;
|
|
||||||
Restart = "on-failure";
|
|
||||||
DynamicUser = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."matrix-synapse" = lib.mkIf cfg.enableSynapseIntegration {
|
|
||||||
|
|
||||||
after = [
|
|
||||||
"matrix-ooye-pre-start.service"
|
|
||||||
"network-online.target"
|
|
||||||
];
|
|
||||||
requires = [ "matrix-ooye-pre-start.service" ];
|
|
||||||
serviceConfig = {
|
|
||||||
LoadCredential = [
|
|
||||||
"matrix-ooye-registration:/var/lib/matrix-ooye/registration.yaml"
|
|
||||||
];
|
|
||||||
ExecStartPre = [
|
|
||||||
"+${pkgs.coreutils}/bin/cp /run/credentials/matrix-synapse.service/matrix-ooye-registration ${config.services.matrix-synapse.dataDir}/ooye-registration.yaml"
|
|
||||||
"+${pkgs.coreutils}/bin/chown matrix-synapse:matrix-synapse ${config.services.matrix-synapse.dataDir}/ooye-registration.yaml"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.matrix-synapse.settings.app_service_config_files = lib.mkIf cfg.enableSynapseIntegration [
|
|
||||||
"${config.services.matrix-synapse.dataDir}/ooye-registration.yaml"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
{ cgit, fetchurl, ... }:
|
|
||||||
let
|
|
||||||
pname = cgit.pname;
|
|
||||||
commit = "09d24d7cd0b7e85633f2f43808b12871bb209d69";
|
|
||||||
in
|
|
||||||
cgit.overrideAttrs (_: {
|
|
||||||
version = "1.2.3-unstable-2024.07.16";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${commit}.tar.xz";
|
|
||||||
hash = "sha256-gfgjAXnWRqVCP+4cmYOVdB/3OFOLJl2WBOc3bFVDsjw=";
|
|
||||||
};
|
|
||||||
|
|
||||||
# cgit is tightly coupled with git and needs a git source tree to build.
|
|
||||||
# IMPORTANT: Remember to check which git version cgit needs on every version
|
|
||||||
# bump (look for "GIT_VER" in the top-level Makefile).
|
|
||||||
gitSrc = fetchurl {
|
|
||||||
url = "mirror://kernel/software/scm/git/git-2.46.0.tar.xz";
|
|
||||||
hash = "sha256-fxI0YqKLfKPr4mB0hfcWhVTCsQ38FVx+xGMAZmrCf5U=";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
fetchgit,
|
|
||||||
makeWrapper,
|
|
||||||
nodejs,
|
|
||||||
buildNpmPackage,
|
|
||||||
}:
|
|
||||||
buildNpmPackage {
|
|
||||||
pname = "delete-your-element";
|
|
||||||
version = "3.1-unstable-2025-06-23";
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://git.pvv.ntnu.no/Drift/delete-your-element.git";
|
|
||||||
rev = "67658bf68026918163a2e5c2a30007364c9b2d2d";
|
|
||||||
sha256 = "sha256-jSQ588kwvAYCe6ogmO+jDB6Hi3ACJ/3+rC8M94OVMNw=";
|
|
||||||
};
|
|
||||||
npmDepsHash = "sha256-HNHEGez8X7CsoGYXqzB49o1pcCImfmGYIw9QKF2SbHo=";
|
|
||||||
dontNpmBuild = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [makeWrapper];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out/share
|
|
||||||
cp -a . $out/share/ooye
|
|
||||||
makeWrapper ${nodejs}/bin/node $out/bin/matrix-ooye --add-flags $out/share/ooye/start.js
|
|
||||||
makeWrapper ${nodejs}/bin/node $out/bin/matrix-ooye-addbot --add-flags $out/share/ooye/addbot.js
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Matrix-Discord bridge with modern features.";
|
|
||||||
homepage = "https://gitdab.com/cadence/out-of-your-element";
|
|
||||||
longDescription = ''
|
|
||||||
Modern Matrix-to-Discord appservice bridge, created by @cadence:cadence.moe.
|
|
||||||
'';
|
|
||||||
license = licenses.gpl3;
|
|
||||||
# maintainers = with maintainers; [ RorySys ];
|
|
||||||
mainProgram = "matrix-ooye";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -3,8 +3,6 @@ calendar-bot:
|
|||||||
mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str]
|
mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str]
|
||||||
mysql:
|
mysql:
|
||||||
password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str]
|
password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str]
|
||||||
gickup:
|
|
||||||
github-token: ENC[AES256_GCM,data:H/yBDLIvEXunmaUha3c2vUWKLRIbl9QrC0t13AQDRCTnrvhabeiUFLNxZ/F+4B6sZ2aPSgZoB69WwnHvh1wLdiFp1qLWKW/jQPvzZOxE4n+jXrnSOutUWktbPzVj,iv:KFW4jRru93JIl9doVFtcNkJDWp89NlzWjPDflHxcL/U=,tag:YtgyRxkoZO9MkuP3DJh7zA==,type:str]
|
|
||||||
sops:
|
sops:
|
||||||
kms: []
|
kms: []
|
||||||
gcp_kms: []
|
gcp_kms: []
|
||||||
@ -65,8 +63,8 @@ sops:
|
|||||||
cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX
|
cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX
|
||||||
0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg==
|
0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-05-07T21:34:48Z"
|
lastmodified: "2024-08-15T21:18:33Z"
|
||||||
mac: ENC[AES256_GCM,data:n6GHD+nQmZL17WvUZiMCBLRHbtpoKU6U8o/Oraj0VSRi/pQ74QWGVEcIX87kFjBvR2C+UPd3KwXzjQHhjUfHpz9EjIGi6tXLTTo8K3ptd2wCL8MW418TVO4KV+BFmHGT4kwlbdoqaJ2SA7HcfXNaC68e/2CTXhtkLpIwGXtYWJA=,iv:iC5QX/JMwno4mBljPdorNmcQSD2wy/wOYvGrUoC2yzg=,tag:GuFNQ6+d6o9DYC6Do/IEqQ==,type:str]
|
mac: ENC[AES256_GCM,data:uR5HgeDAYqoqB9kk1V6p0T30+v6WpQJi4+qIeCDRnoUPnQKUVR10hvBhICck+E+Uh8p+tGhM6Uf3YrAJAV0ZCUiNJjtwDJQQLUDT53vdOAXN4xADCQqNuhgVwVMaruoTheEiwOswRuhFeEwy0gBj3Ze2pu47lueHYclmEzumLeQ=,iv:t0UyXN2YaR2m7M/pV2wTLJG5wVfqTIUs7wSQMmyeTVw=,tag:O7dIffzrDAXz3kGx5uazhw==,type:str]
|
||||||
pgp:
|
pgp:
|
||||||
- created_at: "2024-08-04T00:03:40Z"
|
- created_at: "2024-08-04T00:03:40Z"
|
||||||
enc: |-
|
enc: |-
|
||||||
@ -89,4 +87,4 @@ sops:
|
|||||||
-----END PGP MESSAGE-----
|
-----END PGP MESSAGE-----
|
||||||
fp: F7D37890228A907440E1FD4846B9228E814A2AAC
|
fp: F7D37890228A907440E1FD4846B9228E814A2AAC
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.9.4
|
version: 3.9.0
|
||||||
|
|||||||
@ -9,15 +9,14 @@ mjolnir:
|
|||||||
discord:
|
discord:
|
||||||
as_token: ENC[AES256_GCM,data:cnPZjBbODZUA1p0kLNeWpKh1oGkDPxDw/g7163XnoRCIgpqk,iv:Uu4L36uDPMBgzdXE2Lt9U0qrBSl3Xuufh1313BD8B/U=,tag:nTm6s7IGd4vNzZ95mfxDpA==,type:str]
|
as_token: ENC[AES256_GCM,data:cnPZjBbODZUA1p0kLNeWpKh1oGkDPxDw/g7163XnoRCIgpqk,iv:Uu4L36uDPMBgzdXE2Lt9U0qrBSl3Xuufh1313BD8B/U=,tag:nTm6s7IGd4vNzZ95mfxDpA==,type:str]
|
||||||
hs_token: ENC[AES256_GCM,data:UzcaNsJtJPKvFT4gQDNfat0nmyJzmQ6OcSI73pANibzOVrWl,iv:ujgRM2jb1rbeloPB4UPLBEvQ7uue4a+bHiqsZAHIqtk=,tag:uIfuaTWSTeVvpQx5o28HPA==,type:str]
|
hs_token: ENC[AES256_GCM,data:UzcaNsJtJPKvFT4gQDNfat0nmyJzmQ6OcSI73pANibzOVrWl,iv:ujgRM2jb1rbeloPB4UPLBEvQ7uue4a+bHiqsZAHIqtk=,tag:uIfuaTWSTeVvpQx5o28HPA==,type:str]
|
||||||
ooye:
|
|
||||||
hs_token: ENC[AES256_GCM,data:QBrdRt4ozAh2XYJtssm82uHlk9aGO1Nr0fEZetmWfLvmw52FZEq8ijyKOgwS6uTcndMi4gGKkq9r4eapLwcMdQ==,iv:VHOAqxR1WGzZ9dmNx+FmjGAKRpUFjWOwyOVmgDswpE0=,tag:k5it/yx7pOfGbJXZUlV69Q==,type:str]
|
|
||||||
as_token: ENC[AES256_GCM,data:RMkY0xVj14FwDbYaAysSmzB0IlJuk0ucicNhhTmVAEgiU05PxWG+qk3/elFcaFwaXRFgQQtVyGFZEcK5gpE9hA==,iv:8JgNrTe7GQqPMdUCxEaxJ9qV7Uec2fkYBmF9LmH4X3o=,tag:tRnFpRAZs9kO3u2SDMwNnA==,type:str]
|
|
||||||
discord_token: ENC[AES256_GCM,data:6rzv3glW03jcYiJ7sAvDcvDmQHs9iVbV11tIFwgD3GuTkVn6mbAoQhjUaz3zpb/OeoGt+j/pCBRlZgk=,iv:JwkqLpeGYhgwLX7SACNh0AUO53XSx9IKgncI0+KkvyU=,tag:30C0X9nVSlEYPITVzuN0qA==,type:str]
|
|
||||||
discord_client_secret: ENC[AES256_GCM,data:wbM7bPZCWa2+UNUqXi27fP0ppdinRkEC4N9KB68TJzg=,iv:Y2j+8oI+kI7DMrBfFU3G5HtFWguNxDpxbNvJkpK5lQs=,tag:GntocbTCybCVqZ2T3lNSIQ==,type:str]
|
|
||||||
hookshot:
|
hookshot:
|
||||||
as_token: ENC[AES256_GCM,data:L4vEw5r4RhcgritOeDTLHN5E/dM=,iv:pC8BLzxf6NaVAGsotoq6chOceBVdMLvrsQn1LGw9H9w=,tag:SI3CDFHAvgQZEvf/oms3EA==,type:str]
|
as_token: ENC[AES256_GCM,data:L4vEw5r4RhcgritOeDTLHN5E/dM=,iv:pC8BLzxf6NaVAGsotoq6chOceBVdMLvrsQn1LGw9H9w=,tag:SI3CDFHAvgQZEvf/oms3EA==,type:str]
|
||||||
hs_token: ENC[AES256_GCM,data:2ufSJfYzzAB5IO+edwKSra5d/+M=,iv:cmTycGzNL+IeRRKZGbkhTtiksYTtbxED0k0B5haFw7k=,tag:FmWe5sGi9rlapUeAE6lKvg==,type:str]
|
hs_token: ENC[AES256_GCM,data:2ufSJfYzzAB5IO+edwKSra5d/+M=,iv:cmTycGzNL+IeRRKZGbkhTtiksYTtbxED0k0B5haFw7k=,tag:FmWe5sGi9rlapUeAE6lKvg==,type:str]
|
||||||
sops:
|
sops:
|
||||||
|
kms: []
|
||||||
|
gcp_kms: []
|
||||||
|
azure_kv: []
|
||||||
|
hc_vault: []
|
||||||
age:
|
age:
|
||||||
- recipient: age1sl43gc9cw939z5tgha2lpwf0xxxgcnlw7w4xem4sqgmt2pt264vq0dmwx2
|
- recipient: age1sl43gc9cw939z5tgha2lpwf0xxxgcnlw7w4xem4sqgmt2pt264vq0dmwx2
|
||||||
enc: |
|
enc: |
|
||||||
@ -73,8 +72,8 @@ sops:
|
|||||||
WEh5NFN6SFF1TlltdWFWTGw4MHRHUkUKrKIvC87xjEmwxPQhH8dN+ZuaJTCgPY28
|
WEh5NFN6SFF1TlltdWFWTGw4MHRHUkUKrKIvC87xjEmwxPQhH8dN+ZuaJTCgPY28
|
||||||
pR62KxmoKFICLTHPpYP3euiAx5M9BWvgvCnA/US/5klpk8MtlreNFA==
|
pR62KxmoKFICLTHPpYP3euiAx5M9BWvgvCnA/US/5klpk8MtlreNFA==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-06-21T21:23:24Z"
|
lastmodified: "2024-10-13T23:30:01Z"
|
||||||
mac: ENC[AES256_GCM,data:bEJoCzxph/MOnTOJKdrRiQmbVWmAgsKy8vbD5YBeWagWUCJPDAZNDFLzEzmPvt0jDBol04JosrSIKZS1JzJIIm0zRkcOWSqERQCgjgtGdAYmfp0V6ddseDUVfKlZYJDkt6Bdkqg+9LzrP8dDVm2tMDXpo8vzs02o9dTYFm7imVQ=,iv:buP/297JMfvEm9+IdMWRGV7AgZwF0+G6Z2YIeYw/z1o=,tag:+zG612MJA4Ui8CZBgxM+AQ==,type:str]
|
mac: ENC[AES256_GCM,data:vdsAZmg7gPqzeucBhLhPemtRVkcxRecIdB6PXZ4paU+Uv5UorBKcTZ3jseN2cLi6ot3ycTIm+UI6uhlCy87vAJVynVJhuJS+ICFRS2+DfoVyuttLjZQGC2sr3+dEBHxIH7sZJSo9PIzbIWw3qHrpOPAZj0//1pFyp/k15k3vidM=,iv:jWtV+WAPt08lgdrVvtXOl35rDB4QflkZWuGBW1+ESyw=,tag:YxSHncZZOAW5uDxXtb/krw==,type:str]
|
||||||
pgp:
|
pgp:
|
||||||
- created_at: "2024-08-04T00:03:46Z"
|
- created_at: "2024-08-04T00:03:46Z"
|
||||||
enc: |-
|
enc: |-
|
||||||
@ -97,4 +96,4 @@ sops:
|
|||||||
-----END PGP MESSAGE-----
|
-----END PGP MESSAGE-----
|
||||||
fp: F7D37890228A907440E1FD4846B9228E814A2AAC
|
fp: F7D37890228A907440E1FD4846B9228E814A2AAC
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.10.2
|
version: 3.8.1
|
||||||
|
|||||||
@ -13,6 +13,7 @@
|
|||||||
bottom
|
bottom
|
||||||
eza
|
eza
|
||||||
neovim
|
neovim
|
||||||
|
diskonaut
|
||||||
ripgrep
|
ripgrep
|
||||||
tmux
|
tmux
|
||||||
];
|
];
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user