summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/3modules/mb/default.nix2
-rw-r--r--krebs/3modules/permown.nix2
-rw-r--r--krebs/3modules/shadow.nix79
-rw-r--r--krebs/5pkgs/haskell/flameshot-once.nix6
-rw-r--r--krebs/5pkgs/simple/flameshot-once/profile.nix11
-rw-r--r--krebs/nixpkgs.json6
7 files changed, 98 insertions, 9 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 8b77dea7c..734d6c781 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -49,6 +49,7 @@ let
./rtorrent.nix
./secret.nix
./setuid.nix
+ ./shadow.nix
./syncthing.nix
./tinc.nix
./tinc_graphs.nix
diff --git a/krebs/3modules/mb/default.nix b/krebs/3modules/mb/default.nix
index bd9d5059a..c98db4b27 100644
--- a/krebs/3modules/mb/default.nix
+++ b/krebs/3modules/mb/default.nix
@@ -45,7 +45,7 @@ in {
"p1nk.r"
];
tinc.pubkey = ''
- ----BEGIN PUBLIC KEY-----
+ -----BEGIN PUBLIC KEY-----
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5YVML71oW3iJrzZKuX48
AKrGitO5zNvsAHOI8BVsGfZTyxAAZgG4OaDX45kr27K39NcBU43LdDD0I1yjNvGe
zAoL5MIiCPD/QR1kAvLmgpMUSqOVvrk+uoGLVt6dOGvxlOiG1AAaN0gA8Q0B/jZV
diff --git a/krebs/3modules/permown.nix b/krebs/3modules/permown.nix
index 63adb2236..fe293810c 100644
--- a/krebs/3modules/permown.nix
+++ b/krebs/3modules/permown.nix
@@ -88,7 +88,7 @@ with import <stockholm/lib>;
fi
done < "$paths"
'';
- PrivateTemp = true;
+ PrivateTmp = true;
Restart = "always";
RestartSec = 10;
UMask = plan.umask;
diff --git a/krebs/3modules/shadow.nix b/krebs/3modules/shadow.nix
new file mode 100644
index 000000000..cff66492d
--- /dev/null
+++ b/krebs/3modules/shadow.nix
@@ -0,0 +1,79 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }: let
+
+ cfg = config.krebs.shadow;
+
+ mergeShadowsJq = pkgs.writeJq "merge-shadows.jq" ''
+ def fields_3_to_9: ["1", "", "", "", "", "", ""];
+
+ def read_value:
+ split(":") |
+ if length == 9 then
+ if .[2:] == fields_3_to_9 then
+ .
+ else
+ error("unrecognized field contents")
+ end
+ elif length == 2 then
+ if .[1] | test("^\\$6\\$") then
+ . + fields_3_to_9
+ else
+ error("unrecognized hashed password")
+ end
+ else
+ error("unexpected field count: expected 9 or 2, got \(length)")
+ end;
+
+ def write_value:
+ join(":");
+
+ split("\n") |
+ map(select(length > 0) | read_value) |
+
+ reverse |
+ unique_by(.[0]) |
+ map(write_value) |
+ sort |
+
+ join("\n")
+ '';
+
+in {
+
+ options.krebs.shadow = {
+ enable = mkEnableOption "krebs.shadow" // {
+ default = cfg.overridesFile != null;
+ };
+ overridesFile = mkOption {
+ apply = x: if typeOf x == "path" then toString x else x;
+ default = null;
+ description = ''
+ Path to a file containing additional shadow entries, used for adding
+ encrypted passwords which should not be placed into the Nix store.
+
+ The overrides file may contain either regular shadow(5) entries like:
+
+ <code>&lt;login-name&gt;:&lt;hashed-password&gt;:1::::::</code>
+
+ Or shortened entries only containing login name and password like:
+
+ <code>&lt;login-name&gt;:&lt;hashed-password&gt</code>
+ '';
+ type = types.nullOr (types.either types.path types.absolute-pathname);
+ };
+ };
+
+ config = let
+ in mkIf cfg.enable {
+ system.activationScripts.users-tv = stringAfter [ "users" ] /* sh */ ''
+ (
+ set -efu
+ umask 77
+ ${pkgs.jq}/bin/jq -Rrs -f ${mergeShadowsJq} \
+ /etc/shadow ${cfg.overridesFile} > /etc/shadow~
+ ${pkgs.coreutils}/bin/mv /etc/shadow /etc/shadow-
+ ${pkgs.coreutils}/bin/mv /etc/shadow~ /etc/shadow
+ )
+ '';
+ };
+}
diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index 89b95ca07..5b369362e 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -4,11 +4,11 @@
}:
mkDerivation {
pname = "flameshot-once";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchgit {
url = "https://cgit.krebsco.de/flameshot-once";
- sha256 = "158ha1yyj3p3mdjjga62j91ml83nhrsg34xbg3dir5cb399j8pxx";
- rev = "9d688b6ffad14912bd1afe42555747cb3d213d95";
+ sha256 = "01c11dk8ss37awfn9xqsgx668dcrf4kvzfxlq7ycnqsnpbjjvm0a";
+ rev = "cebaefa37095e74ad2253c4e2f9d9ab390f88737";
fetchSubmodules = true;
};
isLibrary = false;
diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
index 7373da00a..8ea8a850c 100644
--- a/krebs/5pkgs/simple/flameshot-once/profile.nix
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -29,7 +29,7 @@ let
eval = evalModules {
modules = singleton {
- _file = toString ./config.nix;
+ _file = toString ./profile.nix;
imports = singleton config;
options = {
buttons = mkOption {
@@ -77,6 +77,14 @@ let
default = false;
type = types.bool;
};
+ timeout = mkOption {
+ default = 100;
+ description = ''
+ Maximum time in milliseconds allowed for the flameshot daemon to
+ react.
+ '';
+ type = types.positive;
+ };
};
};
};
@@ -125,5 +133,6 @@ in
pkgs.writeDash "flameshot.profile" ''
export FLAMESHOT_CAPTURE_PATH=${cfg.savePath}
+ export FLAMESHOT_ONCE_TIMEOUT=${toString cfg.timeout}
export XDG_CONFIG_HOME=${XDG_CONFIG_HOME}
''
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index d5ca0e21f..0bc3abf9c 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs-channels",
- "rev": "8ea36d732567c80b2d11eb029e10400fe85ca786",
- "date": "2019-04-18T22:37:03+01:00",
- "sha256": "1d59i55qwqd76n2d0hr1si26q333ydizkd91h8lfczb00xnr5pqn",
+ "rev": "cf3e277dd0bd710af0df667e9364f4bd80c72713",
+ "date": "2019-04-24T23:55:21+02:00",
+ "sha256": "1abyadl3sxf67yi65758hq6hf2j07afgp1fmkk7kd94dadx6r6f4",
"fetchSubmodules": false
}