mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-04-05 15:37:33 +02:00
Compare commits
8 Commits
28a4824964
...
3c1e9e6229
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c1e9e6229 | ||
|
|
4e5e649361 | ||
|
|
e2575f9b71 | ||
|
|
af838e1ac4 | ||
|
|
5ee5544749 | ||
|
|
0ecf6b0449 | ||
|
|
ef1fba7009 | ||
|
|
9e3bc0e9fe |
12
flake.lock
generated
12
flake.lock
generated
@@ -492,16 +492,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770887951,
|
"lastModified": 1773832647,
|
||||||
"narHash": "sha256-6LGqM9yhONtfCXHtPNn3S0GFsmB2dCchyozHDevwmiQ=",
|
"narHash": "sha256-VZVQDwqDmMGJcJ8WnD6Ug+DTV0b6S2DKHkdj3QvFO+w=",
|
||||||
"ref": "main",
|
"ref": "stable_deps",
|
||||||
"rev": "911063041f24d594a772a2a699d71d3d94953ce8",
|
"rev": "9bdaaf6c5180309b7810bb72f9e717a7c3b2a504",
|
||||||
"revCount": 101,
|
"revCount": 102,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
|
"url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"ref": "main",
|
"ref": "stable_deps",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
|
"url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
dibbler.url = "git+https://git.pvv.ntnu.no/Projects/dibbler.git?ref=main";
|
dibbler.url = "git+https://git.pvv.ntnu.no/Projects/dibbler.git?ref=main";
|
||||||
dibbler.inputs.nixpkgs.follows = "nixpkgs";
|
dibbler.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
worblehat.url = "git+https://git.pvv.ntnu.no/Projects/worblehat.git?ref=main";
|
worblehat.url = "git+https://git.pvv.ntnu.no/Projects/worblehat.git?ref=stable_deps";
|
||||||
worblehat.inputs.nixpkgs.follows = "nixpkgs";
|
worblehat.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
matrix-next.url = "github:dali99/nixos-matrix-modules/v0.8.0";
|
matrix-next.url = "github:dali99/nixos-matrix-modules/v0.8.0";
|
||||||
@@ -200,11 +200,6 @@
|
|||||||
[
|
[
|
||||||
inputs.dibbler.overlays.default
|
inputs.dibbler.overlays.default
|
||||||
inputs.worblehat.overlays.default
|
inputs.worblehat.overlays.default
|
||||||
(final: prev: {
|
|
||||||
inherit (nixpkgs-unstable.legacyPackages."x86_64-linux".pythonPackages) click;
|
|
||||||
inherit (nixpkgs-unstable.legacyPackages."x86_64-linux".pythonPackages) alembic;
|
|
||||||
inherit (nixpkgs-unstable.legacyPackages."x86_64-linux".pythonPackages) flask-admin;
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
shark = stableNixosConfig "shark" { };
|
shark = stableNixosConfig "shark" { };
|
||||||
|
|||||||
@@ -123,6 +123,18 @@ in
|
|||||||
groups.drumknotty = { };
|
groups.drumknotty = { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.worblehat.settings = {
|
||||||
|
logging = {
|
||||||
|
debug = true;
|
||||||
|
dbug_sql = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
database = {
|
||||||
|
type = "sqlite";
|
||||||
|
sqlite.path = "./worblehat.sqlite";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
services.dibbler.settings.database = lib.mkIf cfg.createLocalDatabase {
|
services.dibbler.settings.database = lib.mkIf cfg.createLocalDatabase {
|
||||||
type = "postgresql";
|
type = "postgresql";
|
||||||
postgresql.host = "/run/postgresql";
|
postgresql.host = "/run/postgresql";
|
||||||
@@ -249,7 +261,7 @@ in
|
|||||||
|
|
||||||
# Session name
|
# Session name
|
||||||
"-S"
|
"-S"
|
||||||
"drumknotty"
|
"${cfg.screenSessionName}"
|
||||||
|
|
||||||
# Window name
|
# Window name
|
||||||
"-t"
|
"-t"
|
||||||
@@ -265,7 +277,7 @@ in
|
|||||||
in
|
in
|
||||||
"${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.dibblerPackage} ${dibblerArgs} loop";
|
"${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.dibblerPackage} ${dibblerArgs} loop";
|
||||||
ExecStartPost = [
|
ExecStartPost = [
|
||||||
"${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} -t worblehat ${lib.getExe cfg.worblehatPackage} ${worblehatArgs} cli"
|
"${lib.getExe' cfg.screenPackage "screen"} -S ${cfg.screenSessionName} -X screen -t worblehat ${lib.getExe cfg.worblehatPackage} ${worblehatArgs} cli"
|
||||||
]
|
]
|
||||||
++ lib.optionals (cfg.limitScreenWidth != null) [
|
++ lib.optionals (cfg.limitScreenWidth != null) [
|
||||||
"${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} width ${toString cfg.limitScreenWidth}"
|
"${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} width ${toString cfg.limitScreenWidth}"
|
||||||
|
|||||||
Reference in New Issue
Block a user