summaryrefslogtreecommitdiffstats
path: root/tv/2configs/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-08-05 12:01:07 +0200
committermakefu <github@syntax-fehler.de>2017-08-05 12:01:07 +0200
commitf1124bd208306b2cfe32e1b85ccb810455453483 (patch)
treeb286db06b459e2d24409c3b4fd02eb0ea7d88a82 /tv/2configs/default.nix
parent7db5d59018f4096b0cc39afa59df53b6a1fa9353 (diff)
parent1310375624b7fbcb6c165a032edc9d3ef336d57b (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs/default.nix')
-rw-r--r--tv/2configs/default.nix23
1 files changed, 7 insertions, 16 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index b59311092..730b055a2 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,9 +1,8 @@
with import <stockholm/lib>;
-{ config, lib, pkgs, ... }: let
- builder = if getEnv "dummy_secrets" == "true"
- then "buildbot"
- else "tv";
-in {
+{ config, pkgs, ... }: {
+
+ boot.tmpOnTmpfs = true;
+
krebs.enable = true;
krebs.build.user = config.krebs.users.tv;
@@ -22,16 +21,6 @@ in {
./vim.nix
./xdg.nix
{
- # stockholm dependencies
- environment.systemPackages = with pkgs; [
- git
- gnumake
- hashPassword
- populate
- whatsupnix
- ];
- }
- {
users = {
defaultUserShell = "/run/current-system/sw/bin/bash";
mutableUsers = false;
@@ -47,7 +36,7 @@ in {
{
security.hideProcessInformation = true;
security.sudo.extraConfig = ''
- Defaults env_keep+="SSH_CLIENT"
+ Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE"
Defaults mailto="${config.krebs.users.tv.mail}"
Defaults !lecture
'';
@@ -142,6 +131,8 @@ in {
{
environment.systemPackages = [
pkgs.get
+ pkgs.git
+ pkgs.hashPassword
pkgs.htop
pkgs.kpaste
pkgs.krebspaste