From 991687f7428440356403b6c63d695397b33078a6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 9 May 2017 22:52:53 +0200
Subject: m studio: init

---
 makefu/1systems/studio.nix | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 makefu/1systems/studio.nix

(limited to 'makefu/1systems/studio.nix')

diff --git a/makefu/1systems/studio.nix b/makefu/1systems/studio.nix
new file mode 100644
index 000000000..f80dfc09a
--- /dev/null
+++ b/makefu/1systems/studio.nix
@@ -0,0 +1,70 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    ../.
+
+  ];
+  krebs = {
+    enable = true;
+    tinc.retiolum.enable = true;
+    build.host = config.krebs.hosts.studio;
+  };
+
+  users.users.user = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "audio" ];
+    uid = 1000;
+  };
+
+  environment.systemPackages = with pkgs;[
+    pavucontrol
+    firefox
+    chromium
+  ];
+
+  sound.enable = true;
+  hardware.pulseaudio = {
+     enable = true;
+     systemWide = true;
+  };
+
+  fonts = {
+    enableCoreFonts = true;
+    enableFontDir = true;
+    enableGhostscriptFonts = true;
+    fonts = [ ];
+  };
+  # ingos favorite display manager
+  services.xserver.displayManager.sddm = {
+    enable = true;
+    autoLogin.enable = true;
+    autoLogin.user = "user";
+  };
+  services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.layout = "us";
+  services.xserver.xkbVariant = "altgr-intl";
+  services.xserver.xkbOptions = "ctrl:nocaps";
+
+  i18n = {
+    consoleKeyMap = "us-int";
+    defaultLocale = "en_US.UTF-8";
+  };
+
+
+
+  # hardware
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  boot.loader.grub.device = "/dev/sda";
+
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "usb_storage" "sd_mod" ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/0aeda516-230e-4c54-9e27-13515c2f3f21";
+    fsType = "ext4";
+  };
+
+  swapDevices = [ { device = "/dev/disk/by-uuid/1914af67-5a8f-41d3-a1c2-211c39605da9"; } ];
+}
-- 
cgit v1.2.3


From 1d2bad9d10a09fddeba4e41547949ffd46d60334 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 12 May 2017 11:38:45 +0200
Subject: m 1 studio: provide vnc and realtime audio

---
 makefu/1systems/studio.nix | 55 +++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

(limited to 'makefu/1systems/studio.nix')

diff --git a/makefu/1systems/studio.nix b/makefu/1systems/studio.nix
index f80dfc09a..400d9f883 100644
--- a/makefu/1systems/studio.nix
+++ b/makefu/1systems/studio.nix
@@ -2,32 +2,46 @@
 {
   imports = [
     ../.
+    ../2configs/vncserver.nix
+    ../2configs/vim.nix
+    ../2configs/disable_v6.nix
+    ../2configs/jack-on-pulse.nix
+    ../2configs/gui/studio.nix
 
   ];
+  makefu.gui.user = "user"; # we use an extra user
   krebs = {
     enable = true;
     tinc.retiolum.enable = true;
     build.host = config.krebs.hosts.studio;
   };
+  networking.firewall.allowedTCPPorts = [ 655 ];
+  networking.firewall.allowedUDPPorts = [ 655 ];
 
-  users.users.user = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "audio" ];
-    uid = 1000;
-  };
 
   environment.systemPackages = with pkgs;[
+    # audio foo
+    ## pulseaudio
     pavucontrol
+    paprefs
+    pamixer
+
+    # extra alsa tools
+    alsa-hdspconf
+    alsa-hdspmixer
+    alsa-hdsploader
+
+    # recording
+    darkice
+    (mumble.override { jackSupport = true; })
+
+    # browsing
     firefox
     chromium
   ];
 
-  sound.enable = true;
-  hardware.pulseaudio = {
-     enable = true;
-     systemWide = true;
-  };
 
+  nixpkgs.config.allowUnfree = true;
   fonts = {
     enableCoreFonts = true;
     enableFontDir = true;
@@ -35,21 +49,6 @@
     fonts = [ ];
   };
   # ingos favorite display manager
-  services.xserver.displayManager.sddm = {
-    enable = true;
-    autoLogin.enable = true;
-    autoLogin.user = "user";
-  };
-  services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.layout = "us";
-  services.xserver.xkbVariant = "altgr-intl";
-  services.xserver.xkbOptions = "ctrl:nocaps";
-
-  i18n = {
-    consoleKeyMap = "us-int";
-    defaultLocale = "en_US.UTF-8";
-  };
-
 
 
   # hardware
@@ -67,4 +66,10 @@
   };
 
   swapDevices = [ { device = "/dev/disk/by-uuid/1914af67-5a8f-41d3-a1c2-211c39605da9"; } ];
+  users.users.user = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "audio" ];
+    uid = 1000;
+    openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
+  };
 }
-- 
cgit v1.2.3