From 4fc382180ffcbe2326ac559de158fefff6370ab5 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 9 Aug 2015 14:53:24 +0200 Subject: makefu: fix tsp ip, add font in base-gui --- Zhosts/tsp | 2 +- makefu/2configs/base-gui.nix | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Zhosts/tsp b/Zhosts/tsp index 6c2b450d8..314abb3f5 100644 --- a/Zhosts/tsp +++ b/Zhosts/tsp @@ -1,4 +1,4 @@ -Subnet = 10.243.0.211 +Subnet = 10.243.0.212 Subnet = 42:f9f1:0000:0000:0000:0000:0000:0002 -----BEGIN RSA PUBLIC KEY----- diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix index c4755c217..6cfd0e50c 100644 --- a/makefu/2configs/base-gui.nix +++ b/makefu/2configs/base-gui.nix @@ -29,14 +29,28 @@ in desktopManager.xterm.enable = false; }; - environment.systemPackages = [ - pkgs.xlockmore - pkgs.rxvt_unicode-with-plugins +## FONTS +# TODO: somewhere else? + + i18n.consoleFont = "Lat2-Terminus16"; + + fonts = { + enableCoreFonts = true; + enableFontDir = true; + enableGhostscriptFonts = false; + fonts = [ pkgs.terminus_font ]; + }; + + environment.systemPackages = with pkgs;[ + xlockmore + rxvt_unicode-with-plugins + vlc + firefox + chromium ]; hardware.pulseaudio = { enable = true; systemWide = true; }; - } -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/12100000.lock: No such file or directory (2)