microbin n stuff
This commit is contained in:
parent
0ad4595074
commit
78ae5135d5
3 changed files with 6 additions and 19 deletions
|
@ -17,6 +17,7 @@
|
|||
easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git";
|
||||
meowsite.url = "git+https://gitlab.com/obsidianical/meowsite.git";
|
||||
wordsofgod.url = "git+https://gitlab.com/obsidianical/wordsofgod.git";
|
||||
microbin-fork.url = "git+https://gitlab.com/obsidianical/microbin.git";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-stable, home-manager, nixos-hardware, mac-brcm-fw, ... }@inputs: {
|
||||
|
|
|
@ -1,25 +1,11 @@
|
|||
{ inputs, config, pkgs, ... }:
|
||||
let
|
||||
microbin = pkgs.rustPlatform.buildRustPackage rec {
|
||||
pname = "microbin";
|
||||
version = "1.2.0";
|
||||
|
||||
# GitHub sources do not have Cargo.lock
|
||||
src = pkgs.fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dZClslUTUchx+sOJzFG8wiAgyW/0RcCKfKYklKfVrzM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-fBbChu5iy/2H/8IYCwd1OwxplGPZAmkd8z8xD7Uc0vo=";
|
||||
};
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [ microbin ];
|
||||
{
|
||||
environment.systemPackages = [ inputs.microbin-fork.defaultPackage."x86_64-linux" ];
|
||||
systemd.services.microbin = {
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment = {
|
||||
MICROBIN_AUTH_USERNAME = "jade";
|
||||
MICROBIN_AUTH_PASSWORD = builtins.readFile ../secret-data/mb-pass;
|
||||
#MICROBIN_AUTH_USERNAME = "jade";
|
||||
MICROBIN_HASH_IDS = "";
|
||||
MICROBIN_EDITABLE = "";
|
||||
MICROBIN_PRIVATE = "";
|
||||
|
@ -27,7 +13,7 @@ in {
|
|||
MICROBIN_PUBLIC_PATH = "https://s10e.de";
|
||||
MICROBIN_QR = "";
|
||||
};
|
||||
script = "${pkgs.microbin}/bin/microbin";
|
||||
script = "${inputs.microbin-fork.defaultPackage."x86_64-linux"}/bin/microbin";
|
||||
#scriptArgs = "--auth-password ${builtins.readFile ../secret-data/mb-pass} --auth-username jade --editable --hash-ids --no-listing --highlightsyntax --public-path https://s10e.de --qr";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
};
|
||||
"wolke.schrottkatze.de" = {
|
||||
group = "nginx";
|
||||
keyType = "rsa2048";
|
||||
keyType = "rsa2047";
|
||||
};
|
||||
"s10e.de" = {
|
||||
group = "nginx";
|
||||
|
|
Loading…
Reference in a new issue