Compare commits
1 Commits
main
...
setup-git-
Author | SHA1 | Date | |
---|---|---|---|
48c59201e1
|
.mailmapjustfile
base
flake.lockflake.nixhosts
bekkalokk
services
bicep
services
bob
georg
kommode
services
gitea
customization
modules
packages
secrets/bicep
users
values.nix
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";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
11
base/nix.nix
11
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;
|
||||||
}
|
|
||||||
# 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;
|
"pvv-nix".flake = inputs.self;
|
||||||
})
|
};
|
||||||
];
|
|
||||||
nixPath = [
|
nixPath = [
|
||||||
"nixpkgs=${inputs.nixpkgs}"
|
"nixpkgs=${inputs.nixpkgs}"
|
||||||
"unstable=${inputs.nixpkgs-unstable}"
|
"unstable=${inputs.nixpkgs-unstable}"
|
||||||
|
@@ -1,33 +1,21 @@
|
|||||||
{ 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
|
||||||
@@ -35,5 +23,4 @@ in
|
|||||||
// { 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;
|
|
||||||
};
|
|
||||||
}
|
|
76
flake.lock
generated
76
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752113600,
|
"lastModified": 1745502102,
|
||||||
"narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=",
|
"narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "79264292b7e3482e5702932949de9cbb69fedf6d",
|
"rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -48,11 +48,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752258704,
|
"lastModified": 1746563623,
|
||||||
"narHash": "sha256-pRK99+MCgkeVptbJxXhVMXIXl8uwSdkZDpQzFi3OgkA=",
|
"narHash": "sha256-5DxgNFpSgxft/sWraZnHIUlb4S3Io73SVS7FZCbWSUY=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "9ff525339b62855d53a44b4dc0154a33ac19e44d",
|
"rev": "4e0408887f80e61a90286ff630a7855b828ae421",
|
||||||
"revCount": 48,
|
"revCount": 45,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"
|
"url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"
|
||||||
},
|
},
|
||||||
@@ -139,28 +139,34 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752439653,
|
"lastModified": 1745526780,
|
||||||
"narHash": "sha256-mG27U2CFuggpAuozOu/4XAMKaOtJxzJVzdEemjQEBgg=",
|
"narHash": "sha256-LXXYBmFPMQU2lTb6alKWfjgQs08BKn+txMNcgbu00hI=",
|
||||||
"rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
|
"owner": "NixOS",
|
||||||
"type": "tarball",
|
"repo": "nixpkgs",
|
||||||
"url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.806304.dfcd5b901dba/nixexprs.tar.xz"
|
"rev": "9204750b34cae1a8347ab4b5588115edfeebc6d7",
|
||||||
|
"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": 1752439402,
|
"lastModified": 1745688173,
|
||||||
"narHash": "sha256-xDfOnjnKStgsgcn9SFPgOV6qzwac4JvGKYyfR++49Pw=",
|
"narHash": "sha256-fgvG1O5JvSSjeQx+ea0DJ3GfMbLPVhAQta/DqQ2y6jc=",
|
||||||
"rev": "b47d4f01d4213715a1f09b999bab96bb6a5b675e",
|
"owner": "NixOS",
|
||||||
"type": "tarball",
|
"repo": "nixpkgs",
|
||||||
"url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre829909.b47d4f01d421/nixexprs.tar.xz"
|
"rev": "6a2957c7978b189202e03721aab901c0a9dc1e1a",
|
||||||
|
"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": {
|
||||||
@@ -170,11 +176,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742225512,
|
"lastModified": 1723850344,
|
||||||
"narHash": "sha256-OB0ndlrGLE5wMUeYP4lmxly9JUEpPCeZRQyMzITKCB0=",
|
"narHash": "sha256-aT37O9l9eclWEnqxASVNBL1dKwDHZUOqdbA4VO9DJvw=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "c4a6a02c84d8227abf00305dc995d7242176e6f6",
|
"rev": "38b66677ab8c01aee10cd59e745af9ce3ea88092",
|
||||||
"revCount": 21,
|
"revCount": 19,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git"
|
"url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git"
|
||||||
},
|
},
|
||||||
@@ -190,11 +196,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752865540,
|
"lastModified": 1741738148,
|
||||||
"narHash": "sha256-VYLXcV8FsaMTsmxISOejvBq76eA41yi7BCRNW1qGbV0=",
|
"narHash": "sha256-cJo6nbcJEOjkazkZ194NDnlsZe0W0wpxeUh2/886uC8=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "f732582d0d1389721ea2c91ab370ba2fb824d644",
|
"rev": "c1802e7cf27c7cf8b4890354c982a4eef5b11593",
|
||||||
"revCount": 496,
|
"revCount": 486,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/nettsiden.git"
|
"url": "https://git.pvv.ntnu.no/Projects/nettsiden.git"
|
||||||
},
|
},
|
||||||
@@ -227,11 +233,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752201818,
|
"lastModified": 1746498961,
|
||||||
"narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=",
|
"narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d",
|
"rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -247,11 +253,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751606940,
|
"lastModified": 1745310711,
|
||||||
"narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
|
"narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
|
"rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
20
flake.nix
20
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";
|
||||||
@@ -92,13 +92,9 @@
|
|||||||
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.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" {
|
||||||
@@ -115,6 +111,12 @@
|
|||||||
inputs.pvv-nettsiden.nixosModules.default
|
inputs.pvv-nettsiden.nixosModules.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
bob = stableNixosConfig "bob" {
|
||||||
|
modules = [
|
||||||
|
disko.nixosModules.disko
|
||||||
|
{ disko.devices.disk.disk1.device = "/dev/vda"; }
|
||||||
|
];
|
||||||
|
};
|
||||||
ildkule = stableNixosConfig "ildkule" { };
|
ildkule = stableNixosConfig "ildkule" { };
|
||||||
#ildkule-unstable = unstableNixosConfig "ildkule" { };
|
#ildkule-unstable = unstableNixosConfig "ildkule" { };
|
||||||
shark = stableNixosConfig "shark" { };
|
shark = stableNixosConfig "shark" { };
|
||||||
@@ -164,13 +166,12 @@
|
|||||||
snappymail = ./modules/snappymail.nix;
|
snappymail = ./modules/snappymail.nix;
|
||||||
robots-txt = ./modules/robots-txt.nix;
|
robots-txt = ./modules/robots-txt.nix;
|
||||||
gickup = ./modules/gickup;
|
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;
|
||||||
@@ -192,7 +193,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"
|
||||||
'';
|
'';
|
||||||
|
@@ -17,7 +17,7 @@ in
|
|||||||
zip = false;
|
zip = false;
|
||||||
keep = 10;
|
keep = 10;
|
||||||
bare = true;
|
bare = true;
|
||||||
lfs = false;
|
lfs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
instances = let
|
instances = let
|
||||||
@@ -47,19 +47,11 @@ in
|
|||||||
"any:glibc" = {
|
"any:glibc" = {
|
||||||
settings.url = "https://sourceware.org/git/glibc.git";
|
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
|
services.cgit = let
|
||||||
domain = "mirrors.pvv.ntnu.no";
|
domain = "bicep.pvv.ntnu.no";
|
||||||
in {
|
in {
|
||||||
${domain} = {
|
${domain} = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -81,7 +73,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts."mirrors.pvv.ntnu.no" = {
|
services.nginx.virtualHosts."bicep.pvv.ntnu.no" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
|
||||||
@@ -94,7 +86,7 @@ in
|
|||||||
in toString small-pvv-logo;
|
in toString small-pvv-logo;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services."fcgiwrap-cgit-mirrors.pvv.ntnu.no" = {
|
systemd.services."fcgiwrap-cgit-bicep.pvv.ntnu.no" = {
|
||||||
serviceConfig.BindReadOnlyPaths = [ cfg.dataDir ];
|
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}";
|
|
||||||
};
|
|
||||||
}
|
|
46
hosts/bob/configuration.nix
Normal file
46
hosts/bob/configuration.nix
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
{ config, fp, pkgs, values, ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
|
./hardware-configuration.nix
|
||||||
|
(fp /base)
|
||||||
|
(fp /misc/metrics-exporters.nix)
|
||||||
|
./disks.nix
|
||||||
|
|
||||||
|
(fp /misc/builder.nix)
|
||||||
|
];
|
||||||
|
|
||||||
|
sops.defaultSopsFile = fp /secrets/bob/bob.yaml;
|
||||||
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
|
sops.age.keyFile = "/var/lib/sops-nix/key.txt";
|
||||||
|
sops.age.generateKey = true;
|
||||||
|
|
||||||
|
boot.loader.grub = {
|
||||||
|
enable = true;
|
||||||
|
efiSupport = true;
|
||||||
|
efiInstallAsRemovable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.hostName = "bob"; # Define your hostname.
|
||||||
|
|
||||||
|
systemd.network.networks."30-all" = values.defaultNetworkConfig // {
|
||||||
|
matchConfig.Name = "en*";
|
||||||
|
DHCP = "yes";
|
||||||
|
gateway = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# List packages installed in system profile
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
];
|
||||||
|
|
||||||
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
# This value determines the NixOS release from which the default
|
||||||
|
# settings for stateful data, like file locations and database versions
|
||||||
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
# this value at the release version of the first install of this system.
|
||||||
|
# Before changing this value read the documentation for this option
|
||||||
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
|
system.stateVersion = "23.05"; # Did you read the comment?
|
||||||
|
|
||||||
|
}
|
39
hosts/bob/disks.nix
Normal file
39
hosts/bob/disks.nix
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
# Example to create a bios compatible gpt partition
|
||||||
|
{ lib, ... }:
|
||||||
|
{
|
||||||
|
disko.devices = {
|
||||||
|
disk.disk1 = {
|
||||||
|
device = lib.mkDefault "/dev/sda";
|
||||||
|
type = "disk";
|
||||||
|
content = {
|
||||||
|
type = "gpt";
|
||||||
|
partitions = {
|
||||||
|
boot = {
|
||||||
|
name = "boot";
|
||||||
|
size = "1M";
|
||||||
|
type = "EF02";
|
||||||
|
};
|
||||||
|
esp = {
|
||||||
|
name = "ESP";
|
||||||
|
size = "500M";
|
||||||
|
type = "EF00";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "vfat";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
root = {
|
||||||
|
name = "root";
|
||||||
|
size = "100%";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "ext4";
|
||||||
|
mountpoint = "/";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
24
hosts/bob/hardware-configuration.nix
Normal file
24
hosts/bob/hardware-configuration.nix
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_blk" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.ens3.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
}
|
@@ -25,26 +25,6 @@
|
|||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
services.spotifyd = {
|
|
||||||
enable = true;
|
|
||||||
settings.global = {
|
|
||||||
device_name = "georg";
|
|
||||||
use_mpris = false;
|
|
||||||
#dbus_type = "system";
|
|
||||||
#zeroconf_port = 1234;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [
|
|
||||||
# config.services.spotifyd.settings.zeroconf_port
|
|
||||||
5353 # spotifyd is its own mDNS service wtf
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
@@ -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"
|
|
||||||
|
@@ -57,6 +57,7 @@ in
|
|||||||
(lib.removePrefix "${repoType}:")
|
(lib.removePrefix "${repoType}:")
|
||||||
(lib.splitString "/")
|
(lib.splitString "/")
|
||||||
builtins.head
|
builtins.head
|
||||||
|
lib.toLower
|
||||||
];
|
];
|
||||||
|
|
||||||
repo = if repoType == "any"
|
repo = if repoType == "any"
|
||||||
@@ -65,11 +66,12 @@ in
|
|||||||
(lib.removePrefix "${repoType}:")
|
(lib.removePrefix "${repoType}:")
|
||||||
(lib.splitString "/")
|
(lib.splitString "/")
|
||||||
lib.last
|
lib.last
|
||||||
|
lib.toLower
|
||||||
];
|
];
|
||||||
|
|
||||||
slug = if repoType == "any"
|
slug = if repoType == "any"
|
||||||
then lib.toLower (builtins.replaceStrings [ ":" "/" ] [ "-" "-" ] submoduleName)
|
then builtins.replaceStrings [ ":" "/" ] [ "-" "-" ] submoduleName
|
||||||
else "${lib.toLower repoType}-${lib.toLower owner}-${lib.toLower repo}";
|
else "${repoType}-${owner}-${repo}";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
|
@@ -5,14 +5,6 @@ in
|
|||||||
{
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# TODO: run upon completion of cloning a repository
|
# 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)
|
# TODO: update symlink for one repo at a time (e.g. gickup-linktree@<instance>.service)
|
||||||
systemd.services."gickup-linktree" = {
|
systemd.services."gickup-linktree" = {
|
||||||
|
@@ -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,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";
|
|
||||||
};
|
|
||||||
}
|
|
@@ -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
|
||||||
];
|
];
|
||||||
|
@@ -41,6 +41,10 @@ in rec {
|
|||||||
ipv4 = pvv-ipv4 209;
|
ipv4 = pvv-ipv4 209;
|
||||||
ipv6 = pvv-ipv6 209;
|
ipv6 = pvv-ipv6 209;
|
||||||
};
|
};
|
||||||
|
bob = {
|
||||||
|
ipv4 = "129.241.152.254";
|
||||||
|
# ipv6 = ;
|
||||||
|
};
|
||||||
knutsen = {
|
knutsen = {
|
||||||
ipv4 = pvv-ipv4 191;
|
ipv4 = pvv-ipv4 191;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user