summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/backup.nix2
-rw-r--r--makefu/2configs/base-gui.nix7
-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.nix2
6 files changed, 23 insertions, 6 deletions
diff --git a/makefu/2configs/backup.nix b/makefu/2configs/backup.nix
index 280dc1df4..9ed890326 100644
--- a/makefu/2configs/backup.nix
+++ b/makefu/2configs/backup.nix
@@ -29,7 +29,7 @@ let
};
in {
krebs.backup.plans = {
- wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
+ # wry-to-omo_root = defaultPull config.krebs.hosts.wry "/";
gum-to-omo_root = defaultPull config.krebs.hosts.gum "/";
};
}
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 43b37cd8c..ba4c551b3 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 ];
};
@@ -62,7 +62,7 @@ in
cat |derp <<EOF
XTerm*background: black
XTerm*foreground: white
- XTerm*FaceName : Terminus:pixelsize=14
+ XTerm*FaceName : xft:xos4 Terminus:pixelsize=14
URxvt*termName: rxvt
URxvt*saveLines: 10000
@@ -74,7 +74,8 @@ in
URxvt.background: black
URxvt.urgentOnBell: true
URxvt.visualBell: false
- URxvt.font : xft:Terminus
+ URxvt.font : xft:xos4 Terminus:size=12
+
! blue
URxvt*color4: #268bd2
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 1ad7f0710..2f340a678 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 = "3ff00fa"; # unstable @ 2017-03-31 + cups-dymo
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 000000000..7b3a5f197
--- /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 7c7b00abc..509ed512d 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 20eb031a1..5b82d8107 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -10,6 +10,7 @@
https://api.github.com/repos/ovh/python-ovh/tags
https://api.github.com/repos/embray/d2to1/tags
http://git.sysphere.org/vicious/log/?qt=grep&q=Next+release
+ https://api.github.com/repos/Mic92/vicious/tags
https://pypi.python.org/simple/bepasty/
https://pypi.python.org/simple/xstatic/
http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/
@@ -19,6 +20,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
];
};
}