From 3ae4e25a1b2af518df6ccaab18703163bd37f51f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 May 2016 23:54:36 +0200 Subject: l 1 mors: dont import texlive --- lass/1systems/mors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index e2ab562fa..27548c9b7 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -14,7 +14,7 @@ ../2configs/elster.nix ../2configs/steam.nix ../2configs/wine.nix - ../2configs/texlive.nix + #../2configs/texlive.nix ../2configs/binary-caches.nix #../2configs/ircd.nix ../2configs/chromium-patched.nix -- cgit v1.2.3 From ac4f86e40f99f4e39c538cef2641b99663774bfd Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 May 2016 23:54:55 +0200 Subject: l 1 mors: reactivate sna --- lass/1systems/mors.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 27548c9b7..776bc54c9 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -175,14 +175,14 @@ emulateWheel = true; }; - #services.xserver = { - # videoDriver = "intel"; - # vaapiDrivers = [ pkgs.vaapiIntel ]; - # deviceSection = '' - # Option "AccelMethod" "sna" - # BusID "PCI:0:2:0" - # ''; - #}; + services.xserver = { + videoDriver = "intel"; + vaapiDrivers = [ pkgs.vaapiIntel ]; + deviceSection = '' + Option "AccelMethod" "sna" + BusID "PCI:0:2:0" + ''; + }; environment.systemPackages = with pkgs; [ acronym -- cgit v1.2.3 From 0f2fc7c4a6a9bb41b965c905949aefebbb6c3f49 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 24 May 2016 23:55:11 +0200 Subject: l 1 prism: serve wallpaper.png under lassul.us --- lass/1systems/prism.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index aa524720d..b9542bc8e 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -196,6 +196,16 @@ in { { predicate = "-p tcp --dport xmpp-server"; target = "ACCEPT"; } ]; } + { + imports = [ + ../2configs/realwallpaper-server.nix + ]; + krebs.nginx.servers."lassul.us".locations = [ + (lib.nameValuePair "/wallpaper.png" '' + alias /tmp/wallpaper.png; + '') + ]; + } ]; krebs.build.host = config.krebs.hosts.prism; -- cgit v1.2.3 From 80e50fd8a05192faaf0e6f87faa3ea9c0313aa32 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 31 May 2016 23:26:35 +0200 Subject: l: move websites libs to 2/websites/util --- lass/1systems/prism.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index b9542bc8e..c83f198cb 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -3,8 +3,9 @@ let ip = config.krebs.build.host.nets.internet.ip4.addr; - inherit (import ../../4lib { inherit lib pkgs; }) - manageCerts; + inherit (import {inherit lib pkgs;}) + manageCerts + ; in { imports = [ -- cgit v1.2.3 From 041e00002dbfcb1fc700bf53e77f4fe6157e2fc2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 31 May 2016 23:34:06 +0200 Subject: l 1 prism: import buildbot normally --- lass/1systems/prism.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index c83f198cb..693556ded 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -19,12 +19,7 @@ in { ../2configs/weechat.nix ../2configs/privoxy-retiolum.nix ../2configs/radio.nix - { - #we need to use old sqlite for buildbot - imports = [ - ../2configs/buildbot-standalone.nix - ]; - } + ../2configs/buildbot-standalone.nix { users.extraGroups = { # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories -- cgit v1.2.3 From f223287ea2c8bde42e04d477e1bcb160f4448304 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 1 Jun 2016 00:06:49 +0200 Subject: l 1 prism: add cgit for cgit.lassul.us --- lass/1systems/prism.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 693556ded..6ed80ac39 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -13,13 +13,21 @@ in { ../2configs/default.nix ../2configs/exim-smarthost.nix ../2configs/downloading.nix - ../2configs/git.nix ../2configs/ts3.nix ../2configs/bitlbee.nix ../2configs/weechat.nix ../2configs/privoxy-retiolum.nix ../2configs/radio.nix ../2configs/buildbot-standalone.nix + { + imports = [ + ../2configs/git.nix + ( manageCerts [ "cgit.lassul.us" ]) + ]; + krebs.nginx.servers.cgit.server-names = [ + "cgit.lassul.us" + ]; + } { users.extraGroups = { # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories -- cgit v1.2.3 From 681a0bccc5b36eb1526159215eea914767aabf8d Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 1 Jun 2016 00:10:13 +0200 Subject: l 1 mors: add remmina to pkgs --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 776bc54c9..a7a1fd253 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -193,6 +193,7 @@ hashPassword urban mk_sql_pair + remmina ]; #TODO: fix this shit -- cgit v1.2.3