qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkgs/promnesia: add a few more deps and the user services

Browse Source
This commit is contained in:
Aaron Bieber 2023-02-06 13:25:57 -07:00
parent 7a27fcc8f1
commit 7b52221bef
No known key found for this signature in database
4 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, options, pkgs, isUnstable, ... }:
{ config, lib, options, pkgs, isUnstable, xinlib, ... }:
let
managementKey =

2
flake.nix
View File

@ -264,7 +264,7 @@
pdm-pep517 setuptools setuptools-scm;
inherit (pkgs.python39Packages)
appdirs tzlocal more-itertools pytz sqlalchemy urlextract fastapi
uvicorn websockets uvloop httptools watchfiles;
uvicorn websockets uvloop httptools watchfiles decorator click;
inherit (pkgs.python39Packages) lxml mistletoe logzero;
};
tailscaleSystray =

40
gui/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, xinlib, ... }:
let
rage = pkgs.writeScriptBin "rage" (import ../bins/rage.nix { inherit pkgs; });
rpr = pkgs.writeScriptBin "rpr" (import ../bins/rpr.nix {
@ -6,6 +6,30 @@ let
inherit (pkgs) gh;
inherit (pkgs) tea;
});
promnesia = pkgs.callPackage ../pkgs/promnesia.nix {
inherit pkgs;
inherit (pkgs.python39Packages) buildPythonPackage fetchPypi;
inherit (pkgs.python39Packages) pdm-pep517 setuptools setuptools-scm;
inherit (pkgs.python39Packages)
appdirs tzlocal more-itertools pytz sqlalchemy urlextract fastapi uvicorn
websockets uvloop httptools watchfiles;
inherit (pkgs.python39Packages) lxml mistletoe logzero;
};
promnesiaService = {
promnesia = {
description = "Service for promnesia.server";
wantedBy = [ "multi-user.target" ];
script = ''
${promnesia}/bin/promnesia serve
'';
};
};
jobs = [{
name = "promnesia-index";
script = "${promnesia}/bin/promnesia index";
startAt = "*:0/30";
path = [ promnesia ];
}];
in with lib; {
imports = [ ./gnome.nix ./kde.nix ./xfce.nix ./arcan.nix ];
@ -58,6 +82,10 @@ in with lib; {
"electron-18.1.0" # obsidian
];
systemd.user.services =
(lib.listToAttrs (builtins.map xinlib.jobToService jobs))
// promnesiaService;
environment.systemPackages = with pkgs; [
brave
vlc
@ -65,15 +93,7 @@ in with lib; {
rage
rpr
(callPackage ../pkgs/tailscale-systray.nix { })
(callPackage ../pkgs/promnesia.nix {
inherit pkgs;
inherit (pkgs.python39Packages) buildPythonPackage fetchPypi;
inherit (pkgs.python39Packages) pdm-pep517 setuptools setuptools-scm;
inherit (pkgs.python39Packages)
appdirs tzlocal more-itertools pytz sqlalchemy urlextract fastapi
uvicorn websockets uvloop httptools watchfiles;
inherit (pkgs.python39Packages) lxml mistletoe logzero;
})
promnesia
];
programs = {

15
pkgs/promnesia.nix
View File

@ -1,8 +1,20 @@
{ lib, buildPythonPackage, fetchPypi, pdm-pep517, setuptools, setuptools-scm
, appdirs, tzlocal, more-itertools, pytz, sqlalchemy, urlextract, fastapi
, websockets, uvloop, httptools, watchfiles, uvicorn, lxml, mistletoe, logzero
, ... }:
, decorator, click, ... }:
let
HPI = buildPythonPackage rec {
pname = "HPI";
version = "0.0.20200417";
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ pytz appdirs more-itertools decorator click];
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cozMmfBF7D1qCZFjf48wRQaeN4MhdHAAxS8tGp/krK8=";
};
};
cachew = buildPythonPackage rec {
pname = "cachew";
version = "0.11.0";
@ -30,6 +42,7 @@ in buildPythonPackage rec {
# Optional
# bs4 lxml mistletoe logzero
propagatedBuildInputs = [
HPI
cachew
fastapi
httptools