summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/base-gui.nix2
-rw-r--r--makefu/2configs/default.nix2
-rw-r--r--makefu/2configs/extra-fonts.nix14
-rw-r--r--makefu/2configs/printer.nix2
-rw-r--r--makefu/2configs/urlwatch.nix1
5 files changed, 18 insertions, 3 deletions
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 43b37cd8..55dd4457 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -41,7 +41,7 @@ in
fonts = {
enableCoreFonts = true;
enableFontDir = true;
- enableGhostscriptFonts = false;
+ enableGhostscriptFonts = true;
fonts = [ pkgs.terminus_font ];
};
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 1ad7f071..6d5a2f68 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu;
source = let
inherit (config.krebs.build) host user;
- ref = "53a2baa"; # unstable @ 2017-02-28
+ ref = "73a6832"; # unstable @ 2017-03-24
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{
diff --git a/makefu/2configs/extra-fonts.nix b/makefu/2configs/extra-fonts.nix
new file mode 100644
index 00000000..7b3a5f19
--- /dev/null
+++ b/makefu/2configs/extra-fonts.nix
@@ -0,0 +1,14 @@
+ { pkgs, ... }:
+ {
+ fonts = {
+ enableFontDir = true;
+ enableGhostscriptFonts = true;
+ fonts = with pkgs; [
+ inconsolata # monospaced
+ ubuntu_font_family # Ubuntu fonts
+ unifont # some international languages
+ dejavu_fonts
+ terminus_font
+ ];
+ };
+ }
diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index 7c7b00ab..509ed512 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -5,7 +5,7 @@
enable = true;
drivers = [
pkgs.samsungUnifiedLinuxDriver
- pkgs.dymo-cups-drivers
+ pkgs.cups-dymo
];
};
diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index 20eb031a..6402b364 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -19,6 +19,7 @@
https://api.github.com/repos/embray/d2to1/tags
https://api.github.com/repos/dorimanx/exfat-nofuse/commits
https://api.github.com/repos/dorimanx/exfat-nofuse/tags
+ https://api.github.com/repos/radare/radare2/tags
];
};
}