From 872c75a4255508ce24a0777e4fbfe744a77d1d30 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 16 Jul 2017 15:16:45 +0200
Subject: ma: move torrent secrets to source.nix

---
 makefu/2configs/torrent.nix          | 5 -----
 makefu/2configs/unstable-sources.nix | 8 --------
 2 files changed, 13 deletions(-)
 delete mode 100644 makefu/2configs/unstable-sources.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix
index 85d2e6c6..d063ad3e 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 <stockholm/makefu/6tests/data/secrets>
-    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 a3437768..00000000
--- 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
-    };
-}
-- 
cgit v1.2.3


From 43b9240b0ded5928c44615c7a91db7262f1017cf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
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/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index e47dfac9..547b7359 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -109,6 +109,7 @@ with import <stockholm/lib>;
   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 <github@syntax-fehler.de>
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/2configs')

diff --git a/makefu/2configs/vncserver.nix b/makefu/2configs/vncserver.nix
index c56b3e29..3d1d9fe7 100644
--- a/makefu/2configs/vncserver.nix
+++ b/makefu/2configs/vncserver.nix
@@ -3,14 +3,13 @@ with lib;
 let
   pwfile = (toString <secrets>)+ "/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 <github@syntax-fehler.de>
Date: Sun, 16 Jul 2017 23:26:23 +0200
Subject: ma wbob: virtual display

---
 makefu/2configs/gui/studio-virtual.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 makefu/2configs/gui/studio-virtual.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/studio-virtual.nix b/makefu/2configs/gui/studio-virtual.nix
new file mode 100644
index 00000000..272060c2
--- /dev/null
+++ b/makefu/2configs/gui/studio-virtual.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+let
+  user = config.makefu.gui.user;
+in
+{
+  imports = [
+    <nixpkgs/nixos/modules/services/x11/terminal-server.nix>
+  ];
+  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