From c62f1fb18d31d76ac554628721422114f9f88f8b Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 15 Jul 2017 23:19:06 +0200 Subject: ma vbob|sdev: fix includes --- makefu/1systems/sdev/config.nix | 2 +- makefu/1systems/vbob/config.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix index f3853a788..38c044be4 100644 --- a/makefu/1systems/sdev/config.nix +++ b/makefu/1systems/sdev/config.nix @@ -7,7 +7,7 @@ (toString ) (toString ) - + # # environment diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix index 933fcf047..f71634501 100644 --- a/makefu/1systems/vbob/config.nix +++ b/makefu/1systems/vbob/config.nix @@ -7,7 +7,10 @@ (toString ) (toString ) - + # base gui + + + # security # Tools -- cgit v1.2.3 From 872c75a4255508ce24a0777e4fbfe744a77d1d30 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 16 Jul 2017 15:16:45 +0200 Subject: ma: move torrent secrets to source.nix --- makefu/1systems/gum/source.nix | 1 + makefu/1systems/x/config.nix | 1 + makefu/1systems/x/source.nix | 1 + makefu/2configs/torrent.nix | 5 ----- makefu/2configs/unstable-sources.nix | 8 -------- makefu/source.nix | 10 +++++++--- 6 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 makefu/2configs/unstable-sources.nix (limited to 'makefu') diff --git a/makefu/1systems/gum/source.nix b/makefu/1systems/gum/source.nix index 82d42b496..b3ce743ca 100644 --- a/makefu/1systems/gum/source.nix +++ b/makefu/1systems/gum/source.nix @@ -1,3 +1,4 @@ import { name="gum"; + torrent = true; } diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 2dd232193..80c09df1c 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -19,6 +19,7 @@ with import ; # # Testing + # # # # diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix index 54ec3c8a9..6dc17b656 100644 --- a/makefu/1systems/x/source.nix +++ b/makefu/1systems/x/source.nix @@ -1,4 +1,5 @@ import { name="x"; full = true; + # torrent = true; } diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix index 85d2e6c67..d063ad3e3 100644 --- a/makefu/2configs/torrent.nix +++ b/makefu/2configs/torrent.nix @@ -10,11 +10,6 @@ let daemon-port = 58846; dl-dir = config.makefu.dl-dir; in { - # prepare secrets - krebs.build.source.torrent-secrets.file = - if getEnv "dummy_secrets" == "true" - then toString - else config.makefu.torrent-secrets ; users.users = { download = { diff --git a/makefu/2configs/unstable-sources.nix b/makefu/2configs/unstable-sources.nix deleted file mode 100644 index a34377683..000000000 --- a/makefu/2configs/unstable-sources.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: - -{ - krebs.build.source.nixpkgs = { - url = https://github.com/makefu/nixpkgs; - rev = "15b5bbfbd1c8a55e7d9e05dd9058dc102fac04fe"; # cherry-picked collectd - }; -} diff --git a/makefu/source.nix b/makefu/source.nix index a24af4dfb..586b9c22e 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -1,5 +1,5 @@ with import ; -host@{ name, secure ? false, override ? {}, full ? false }: let +host@{ name, secure ? false, override ? {}, full ? false, torrent ? false }: let builder = if getEnv "dummy_secrets" == "true" then "buildbot" else "makefu"; @@ -29,10 +29,14 @@ in buildbot = toString ; makefu = "/home/makefu/secrets/${name}"; }; + stockholm.file = toString ; } - (mkIf (builder == "makefu") { - secrets-common.file = "/home/makefu/secrets/common"; + (mkIf ( torrent ) { + torrent-secrets.file = getAttr builder { + buildbot = toString ; + makefu = "/home/makefu/secrets/torrent" ; + }; }) override ] -- cgit v1.2.3 From 0d3953ade9df4c51834378382753b344cb92e6c5 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 16 Jul 2017 15:44:53 +0200 Subject: ma sources: add musnix to studio,vbob,wbob --- makefu/1systems/studio/source.nix | 2 +- makefu/1systems/vbob/source.nix | 6 +++++- makefu/1systems/wbob/source.nix | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/studio/source.nix b/makefu/1systems/studio/source.nix index 092330a50..af0f37809 100644 --- a/makefu/1systems/studio/source.nix +++ b/makefu/1systems/studio/source.nix @@ -2,6 +2,6 @@ import { name="studio"; override.musnix.git = { url = https://github.com/musnix/musnix.git; - ref = "f0ec1f3"; + ref = "d8b989f"; }; } diff --git a/makefu/1systems/vbob/source.nix b/makefu/1systems/vbob/source.nix index 96c3f368c..af0f37809 100644 --- a/makefu/1systems/vbob/source.nix +++ b/makefu/1systems/vbob/source.nix @@ -1,3 +1,7 @@ import { - name="vbob"; + name="studio"; + override.musnix.git = { + url = https://github.com/musnix/musnix.git; + ref = "d8b989f"; + }; } diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix index 419ebbe3b..af0f37809 100644 --- a/makefu/1systems/wbob/source.nix +++ b/makefu/1systems/wbob/source.nix @@ -1,3 +1,7 @@ import { - name="wbob"; + name="studio"; + override.musnix.git = { + url = https://github.com/musnix/musnix.git; + ref = "d8b989f"; + }; } -- cgit v1.2.3 From 99075e35f1f4b24ed3fa84546d5c02ecdc18980d Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 16 Jul 2017 16:09:47 +0200 Subject: ma source: bump nixpkgs to 0751450 --- makefu/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu') diff --git a/makefu/source.nix b/makefu/source.nix index 586b9c22e..02ec2c177 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -4,7 +4,7 @@ host@{ name, secure ? false, override ? {}, full ? false, torrent ? false }: let then "buildbot" else "makefu"; _file = + "/makefu/1systems/${name}/source.nix"; - ref = "06734d1"; # unstable @ 2017-07-03 + graceful requests2 (a772c3aa) + ref = "0751450"; # unstable @ 2017-07-16 + graceful requests2 (a772c3aa) in evalSource (toString _file) [ -- cgit v1.2.3 From 43b9240b0ded5928c44615c7a91db7262f1017cf Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 16 Jul 2017 20:50:49 +0200 Subject: ma: add dmesg alias --- makefu/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu') diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index e47dfac99..547b73597 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -109,6 +109,7 @@ with import ; environment.shellAliases = { # TODO: see .aliases lsl = "ls -lAtr"; + dmesg = "journalctl -kb | cat"; psg = "ps -ef | grep"; nmap = "nmap -oN $HOME/loot/scan-`date +\%s`.nmap -oX $HOME/loot/scan-`date +%s`.xml"; grep = "grep --color=auto"; -- cgit v1.2.3 From ab1ea28d0b6529e5ad9112513db24a52fa7994d8 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 16 Jul 2017 21:54:06 +0200 Subject: ma vncserver: use upstream tigervnc again --- makefu/2configs/vncserver.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'makefu') diff --git a/makefu/2configs/vncserver.nix b/makefu/2configs/vncserver.nix index c56b3e294..3d1d9fe75 100644 --- a/makefu/2configs/vncserver.nix +++ b/makefu/2configs/vncserver.nix @@ -3,14 +3,13 @@ with lib; let pwfile = (toString )+ "/vnc-password"; # create with `vncpasswd` pwtmp = "/tmp/vnc-password"; - # nixos-unstable tigervnc is currently broken :\ - package = (import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-17.03.tar.gz) {}).pkgs.tigervnc; user = config.makefu.gui.user; vnc_port = 5900; web_port = 6080; in { networking.firewall.allowedTCPPorts = [ 80 vnc_port web_port ]; systemd.services = { + # TODO: terminal-server without a real gui and virtual display manager terminal-server = { description = "VNC Terminal Server"; after = [ "display-manager.service" "graphical.target" ]; @@ -22,7 +21,7 @@ in { sleep 5 install -m0700 -o ${user} ${pwfile} ${pwtmp} ''; - ExecStart = "${package}/bin/x0vncserver -display :0 -rfbport ${toString vnc_port} -passwordfile ${pwtmp}"; + ExecStart = "${pkgs.tigervnc}/bin/x0vncserver -display :0 -rfbport ${toString vnc_port} -passwordfile ${pwtmp}"; PermissionsStartOnly = true; PrivateTmp = true; }; -- cgit v1.2.3 From a3f6c2e49d37eb8d629cac1e8365d5b90a2ccd3c Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 16 Jul 2017 23:26:23 +0200 Subject: ma wbob: virtual display --- makefu/1systems/wbob/config.nix | 2 +- makefu/2configs/gui/studio-virtual.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 makefu/2configs/gui/studio-virtual.nix (limited to 'makefu') diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index c530aaad3..d7f642360 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -20,7 +20,7 @@ in { # - + diff --git a/makefu/2configs/gui/studio-virtual.nix b/makefu/2configs/gui/studio-virtual.nix new file mode 100644 index 000000000..272060c2c --- /dev/null +++ b/makefu/2configs/gui/studio-virtual.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: +let + user = config.makefu.gui.user; +in +{ + imports = [ + + ]; + services.xserver.displayManager.sddm.enable = lib.mkForce false; + services.xserver.desktopManager = { + default = "plasma5"; + plasma5.enable = true; + }; + + services.xserver.layout = "us"; + services.xserver.xkbVariant = "altgr-intl"; + services.xserver.xkbOptions = "ctrl:nocaps"; + +} -- cgit v1.2.3