summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/urlwatch.nix4
-rw-r--r--krebs/5pkgs/simple/python-dnsstamps.nix21
-rw-r--r--tv/1systems/xu/config.nix4
3 files changed, 24 insertions, 5 deletions
diff --git a/krebs/3modules/urlwatch.nix b/krebs/3modules/urlwatch.nix
index 43535b08f..0b7a71db5 100644
--- a/krebs/3modules/urlwatch.nix
+++ b/krebs/3modules/urlwatch.nix
@@ -189,8 +189,8 @@ let
'';
};
};
- users.extraUsers = singleton {
- inherit (user) name uid;
+ users.users.${user.name} = {
+ inherit (user) uid;
home = cfg.dataDir;
createHome = true;
};
diff --git a/krebs/5pkgs/simple/python-dnsstamps.nix b/krebs/5pkgs/simple/python-dnsstamps.nix
new file mode 100644
index 000000000..18d08fec8
--- /dev/null
+++ b/krebs/5pkgs/simple/python-dnsstamps.nix
@@ -0,0 +1,21 @@
+{ python3Packages, lib }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "dnsstamps";
+ version = "1.3.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ hash = "sha256:1v334glljw60h9v739jgl8hmyldaawbpv55bbhwq1hcwm5lvdk13";
+ };
+
+ postInstall = ''
+ mv $out/bin/dnsstamp.py $out/bin/dnsstamp
+ '';
+
+ meta = {
+ description = "Create and parse DNS stamps with ease";
+ homepage = "https://github.com/chrisss404/python-dnsstamps";
+ license = lib.licenses.mit;
+ };
+}
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 33f9539c9..503142b96 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -113,9 +113,7 @@ with import <stockholm/lib>;
boot.initrd.luks = {
cryptoModules = [ "aes" "sha512" "xts" ];
- devices = [
- { name = "xuca"; device = "/dev/sda2"; }
- ];
+ devices.xuca.device = "/dev/sda2";
};
fileSystems = {