diff options
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/baseX.nix | 36 | ||||
| -rw-r--r-- | lass/2configs/binary-cache/server.nix | 8 | ||||
| -rw-r--r-- | lass/2configs/nfs-dl.nix | 8 | ||||
| -rw-r--r-- | lass/2configs/websites/sqlBackup.nix | 8 |
4 files changed, 53 insertions, 7 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 1185be9d4..baf93ffe5 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -91,6 +91,10 @@ in { xorg.xhost xsel zathura + (pkgs.writeDashBin "screenshot" '' + ${pkgs.flameshot-once}/bin/flameshot-once + ${pkgs.klem}/bin/klem + '') ]; fonts.fonts = with pkgs; [ @@ -147,4 +151,36 @@ in { krebs.xresources.enable = true; lass.screenlock.enable = true; + + lass.klem = { + kpaste.script = pkgs.writeDash "kpaste-wrapper" '' + ${pkgs.kpaste}/bin/kpaste \ + | ${pkgs.coreutils}/bin/tail -1 \ + | ${pkgs.coreutils}/bin/tr -d '\r\n' + ''; + go = { + target = "STRING"; + script = "${pkgs.goify}/bin/goify"; + }; + "go.lassul.us" = { + target = "STRING"; + script = pkgs.writeDash "go.lassul.us" '' + export GO_HOST='go.lassul.us' + ${pkgs.goify}/bin/goify + ''; + }; + qrcode = { + target = "image"; + script = pkgs.writeDash "zbar" '' + ${pkgs.zbar}/bin/zbarimg -q - + ''; + }; + ocr = { + target = "image"; + script = pkgs.writeDash "gocr" '' + ${pkgs.netpbm}/bin/pngtopnm - \ + | ${pkgs.gocr}/bin/gocr - + ''; + }; + }; } diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix index d3775b5df..9b91035a8 100644 --- a/lass/2configs/binary-cache/server.nix +++ b/lass/2configs/binary-cache/server.nix @@ -9,8 +9,12 @@ }; systemd.services.nix-serve = { - requires = ["secret.service"]; - after = ["secret.service"]; + after = [ + config.krebs.secret.files.nix-serve-key.service + ]; + partOf = [ + config.krebs.secret.files.nix-serve-key.service + ]; }; krebs.secret.files.nix-serve-key = { path = "/run/secret/nix-serve.key"; diff --git a/lass/2configs/nfs-dl.nix b/lass/2configs/nfs-dl.nix index ba53321b9..91b026455 100644 --- a/lass/2configs/nfs-dl.nix +++ b/lass/2configs/nfs-dl.nix @@ -3,17 +3,19 @@ device = "prism.w:/export/download"; fsType = "nfs"; options = [ - "timeo=14" + #"timeo=14" "noauto" "noatime" "nodiratime" - "noac" - "nocto" + #"noac" + #"nocto" "x-systemd.automount" "x-systemd.device-timeout=1" "x-systemd.idle-timeout=1min" "x-systemd.requires=retiolum.service" "x-systemd.requires=wpa_supplicant.service" + "user" + "_netdev" ]; }; } diff --git a/lass/2configs/websites/sqlBackup.nix b/lass/2configs/websites/sqlBackup.nix index 10a6e4643..c9783bece 100644 --- a/lass/2configs/websites/sqlBackup.nix +++ b/lass/2configs/websites/sqlBackup.nix @@ -14,8 +14,12 @@ }; systemd.services.mysql = { - requires = [ "secret.service" ]; - after = [ "secret.service" ]; + after = [ + config.krebs.secret.files.mysql_rootPassword.service + ]; + partOf = [ + config.krebs.secret.files.mysql_rootPassword.service + ]; }; lass.mysqlBackup = { |