diff options
| author | lassulus <lass@lassul.us> | 2017-04-02 11:36:33 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-04-02 11:36:33 +0200 |
| commit | 23bbf68204b51dc7da9706cd727c6008876302fd (patch) | |
| tree | e43c92e6e293b71308a4fabe9eb94fa8698261a9 /makefu/2configs | |
| parent | 61c40b84946038c3939da968291510a9049483b9 (diff) | |
| parent | c7cfb0a5ab66c8c9b54a54032b85c4b82fd16d30 (diff) | |
Merge remote-tracking branch 'prism/newest'
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/backup.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/base-gui.nix | 5 | ||||
| -rw-r--r-- | makefu/2configs/default.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/urlwatch.nix | 1 |
4 files changed, 6 insertions, 4 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 55dd44575..ba4c551b3 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -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 6d5a2f688..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 = "73a6832"; # unstable @ 2017-03-24 + 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/urlwatch.nix b/makefu/2configs/urlwatch.nix index 6402b364a..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/ |