summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-11-14 09:24:59 +0100
committertv <tv@krebsco.de>2018-11-14 09:24:59 +0100
commitf2ca6be6a73df133d127b5b3efe100ff9a3cbd9b (patch)
tree695890a3eb0886b875cd640ae22edfb4b5207caa /makefu
parent81c0315a925c7891a86cf6d556426cc060ebb2fa (diff)
parent424e6d50af975c929d09f35d434295a823168db0 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/0tests/data/secrets/hass/darksky.apikey0
-rw-r--r--makefu/2configs/fetchWallpaper.nix2
-rw-r--r--makefu/2configs/hw/smartcard.nix7
-rw-r--r--makefu/nixpkgs.json8
4 files changed, 10 insertions, 7 deletions
diff --git a/makefu/0tests/data/secrets/hass/darksky.apikey b/makefu/0tests/data/secrets/hass/darksky.apikey
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/makefu/0tests/data/secrets/hass/darksky.apikey
diff --git a/makefu/2configs/fetchWallpaper.nix b/makefu/2configs/fetchWallpaper.nix
index 16a7a13b2..f63417e8f 100644
--- a/makefu/2configs/fetchWallpaper.nix
+++ b/makefu/2configs/fetchWallpaper.nix
@@ -8,7 +8,7 @@
timerConfig = {
OnCalendar = "*:0/30";
};
- url = "http://prism.r/realwallpaper-sat-krebs.png";
+ url = "http://prism.r/realwallpaper-krebs.png";
};
}
diff --git a/makefu/2configs/hw/smartcard.nix b/makefu/2configs/hw/smartcard.nix
index 1e9bca53b..b66b70098 100644
--- a/makefu/2configs/hw/smartcard.nix
+++ b/makefu/2configs/hw/smartcard.nix
@@ -2,12 +2,15 @@
{
services.pcscd = {
enable = true;
- plugins = with pkgs; [ ifdnfc ccid ];
+ plugins = with pkgs;
+ [ #ifdnfc
+ ccid
+ ];
};
environment.systemPackages = with pkgs; [
# need to run ifdnfc-activate before usage
- ifdnfc
+ # ifdnfc
# pcsc_scan
pcsctools
];
diff --git a/makefu/nixpkgs.json b/makefu/nixpkgs.json
index c5cd0ac30..73798f44d 100644
--- a/makefu/nixpkgs.json
+++ b/makefu/nixpkgs.json
@@ -1,7 +1,7 @@
{
"url": "https://github.com/makefu/nixpkgs",
- "rev": "86fb1e9ae6ba6dfedc814b82abd8db5cfa4f4687",
- "date": "2018-10-07T23:33:42+02:00",
- "sha256": "015yxs3qj299mgqfmz5vgszj2gxqwazifsdsjw6xadris3ri41d3",
- "fetchSubmodules": true
+ "rev": "bf46294e4cf20649182f76fc9200a48436f5874a",
+ "date": "2018-09-18T02:20:45+02:00",
+ "sha256": "13900gack7pgf5a7c11x30rzb3s0kjpbm2z2g8fw4720cr9lkd94",
+ "fetchSubmodules": false
}