summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/default.nix1
-rw-r--r--makefu/2configs/gui/studio-virtual.nix19
-rw-r--r--makefu/2configs/torrent.nix5
-rw-r--r--makefu/2configs/unstable-sources.nix8
-rw-r--r--makefu/2configs/vncserver.nix5
5 files changed, 22 insertions, 16 deletions
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 <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";
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 = [
+ <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";
+
+}
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 <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 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/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 <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;
};