summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/power-action.nix3
-rw-r--r--makefu/0tests/data/secrets/hass/adbkey0
-rw-r--r--makefu/2configs/home-manager/taskwarrior.nix25
m---------submodules/nix-writers0
-rw-r--r--tv/5pkgs/simple/utsushi.nix5
5 files changed, 29 insertions, 4 deletions
diff --git a/krebs/3modules/power-action.nix b/krebs/3modules/power-action.nix
index f405482de..78f2b8ebd 100644
--- a/krebs/3modules/power-action.nix
+++ b/krebs/3modules/power-action.nix
@@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-
+with lib;
let
cfg = config.krebs.power-action;
diff --git a/makefu/0tests/data/secrets/hass/adbkey b/makefu/0tests/data/secrets/hass/adbkey
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/makefu/0tests/data/secrets/hass/adbkey
diff --git a/makefu/2configs/home-manager/taskwarrior.nix b/makefu/2configs/home-manager/taskwarrior.nix
new file mode 100644
index 000000000..8ad16dcf2
--- /dev/null
+++ b/makefu/2configs/home-manager/taskwarrior.nix
@@ -0,0 +1,25 @@
+{pkgs, ... }:
+let
+ loc = "/home/makefu/.task";
+in {
+ state = [ "${loc}/keys" ];
+ home-manager.users.makefu.programs.taskwarrior = {
+ enable = true;
+ dataLocation = loc;
+ config = {
+ default.command = "list";
+ taskd = {
+ server = "gum:53589";
+ certificate = "${loc}/keys/public.crt";
+ key = "${loc}/keys/private.key";
+ ca = "${loc}/keys/ca.crt";
+ credentials = "home/makefu/0e6c8146-1ddb-4906-9369-8f77e34cdf84";
+ };
+ context = {
+ work = "tags:work";
+ shack = "tags:shack";
+ home = "tags:home";
+ };
+ };
+ };
+}
diff --git a/submodules/nix-writers b/submodules/nix-writers
-Subproject fc8a3802a0777a5f43a9a2fe0f5848ecaeb555a
+Subproject d856f05daff9cd726d1e798f1bb9a18eecbe2f5
diff --git a/tv/5pkgs/simple/utsushi.nix b/tv/5pkgs/simple/utsushi.nix
index e61dd188f..55e8800a6 100644
--- a/tv/5pkgs/simple/utsushi.nix
+++ b/tv/5pkgs/simple/utsushi.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/imagescanv3/debian/imagescan_${meta.version}.orig.tar.gz";
- sha256 = "12mzq3wc8gzdma84pjs5gb0gp8mga13wax5g7vjfrzq8pjyqrnmw";
+ sha256 = "1gmiimwkcyzbkfr25vzqczjhgh90fgxd96agbnkpf9gah1mpd6qj";
};
preConfigure = ''
@@ -172,6 +172,7 @@ stdenv.mkDerivation rec {
"--with-boost=${boost}"
"--with-magick"
"--with-magick-pp"
+ "--with-udev-confdir=$(out)/etc/udev"
]
++ stdenv.lib.optionals guiSupport [
"--with-gtkmm"
@@ -202,6 +203,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.tv ];
platforms = stdenv.lib.platforms.linux;
- version = "3.48.0";
+ version = "3.54.0";
};
}