Compare commits

..

8 Commits

Author SHA1 Message Date
Vegard Bieker Matthey
3c1e9e6229 stub: worblehat settings 2026-03-18 13:39:47 +01:00
Vegard Bieker Matthey
4e5e649361 start worblehat correctly 2026-03-18 13:14:54 +01:00
Vegard Bieker Matthey
e2575f9b71 use variable for screen session 2026-03-18 12:56:01 +01:00
Vegard Bieker Matthey
af838e1ac4 Revert "maybe fix starting worblehat"
This reverts commit 5ee5544749.
2026-03-18 12:44:09 +01:00
Vegard Bieker Matthey
5ee5544749 maybe fix starting worblehat 2026-03-18 12:37:45 +01:00
Vegard Bieker Matthey
0ecf6b0449 test stable worblehat 2026-03-18 12:19:32 +01:00
Vegard Bieker Matthey
ef1fba7009 use unstable python packages 2026-03-18 11:55:06 +01:00
Vegard Bieker Matthey
9e3bc0e9fe test overriding python packages 2026-03-18 11:37:55 +01:00
3 changed files with 21 additions and 14 deletions

12
flake.lock generated
View File

@@ -492,16 +492,16 @@
]
},
"locked": {
"lastModified": 1770887951,
"narHash": "sha256-6LGqM9yhONtfCXHtPNn3S0GFsmB2dCchyozHDevwmiQ=",
"ref": "main",
"rev": "911063041f24d594a772a2a699d71d3d94953ce8",
"revCount": 101,
"lastModified": 1773832647,
"narHash": "sha256-VZVQDwqDmMGJcJ8WnD6Ug+DTV0b6S2DKHkdj3QvFO+w=",
"ref": "stable_deps",
"rev": "9bdaaf6c5180309b7810bb72f9e717a7c3b2a504",
"revCount": 102,
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
},
"original": {
"ref": "main",
"ref": "stable_deps",
"type": "git",
"url": "https://git.pvv.ntnu.no/Projects/worblehat.git"
}

View File

@@ -23,7 +23,7 @@
dibbler.url = "git+https://git.pvv.ntnu.no/Projects/dibbler.git?ref=main";
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";
matrix-next.url = "github:dali99/nixos-matrix-modules/v0.8.0";
@@ -200,11 +200,6 @@
[
inputs.dibbler.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" { };

View File

@@ -123,6 +123,18 @@ in
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 {
type = "postgresql";
postgresql.host = "/run/postgresql";
@@ -249,7 +261,7 @@ in
# Session name
"-S"
"drumknotty"
"${cfg.screenSessionName}"
# Window name
"-t"
@@ -265,7 +277,7 @@ in
in
"${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.dibblerPackage} ${dibblerArgs} loop";
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.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} width ${toString cfg.limitScreenWidth}"