From bd930e20c8d99ca2995fdc6d85dc3319d2b19608 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 12 Nov 2020 22:30:35 +0100
Subject: [PATCH] translater-setup: update audio and mumble setup

---
 images/translate-setup/audio.nix  | 10 ++++++++++
 images/translate-setup/config.nix |  8 +++++++-
 images/translate-setup/x11.nix    |  5 +++--
 pkgs/default.nix                  | 14 +++++++++-----
 4 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 images/translate-setup/audio.nix

diff --git a/images/translate-setup/audio.nix b/images/translate-setup/audio.nix
new file mode 100644
index 0000000..5d38c14
--- /dev/null
+++ b/images/translate-setup/audio.nix
@@ -0,0 +1,10 @@
+{ pkgs, lib, config, ... }: {
+  users.users.mainUser.extraGroups = [ "audio" ];
+
+  hardware.pulseaudio = {
+    enable = true;
+    package = pkgs.pulseaudioFull;
+  };
+
+  environment.systemPackages = with pkgs; [ alsaUtils pavucontrol ];
+}
diff --git a/images/translate-setup/config.nix b/images/translate-setup/config.nix
index a1be3e3..8ab41a1 100644
--- a/images/translate-setup/config.nix
+++ b/images/translate-setup/config.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }: {
 
-  imports = [ ./x11.nix ];
+  imports = [ ./x11.nix ./audio.nix ];
 
   #networking.networkmanager.enable = true;
   #networking.wireless.enable = false;
@@ -13,6 +13,12 @@
     EDITOR=vim
   '';
 
+  services.xserver.displayManager.sessionCommands = ''
+    ${pkgs.mumble}/bin/mumble mumble://name@lassul.us/party/hard &
+    ${pkgs.vlc}/bin/vlc &
+    ${pkgs.pavucontrol}/bin/pavucontrol &
+  '';
+
   networking.hostName = "translate";
   nixpkgs.config.allowUnfree = true;
 
diff --git a/images/translate-setup/x11.nix b/images/translate-setup/x11.nix
index 10af58e..f584bbb 100644
--- a/images/translate-setup/x11.nix
+++ b/images/translate-setup/x11.nix
@@ -19,7 +19,8 @@
       sessionCommands = ''
         ${pkgs.mumble}/bin/mumble &
         ${pkgs.vlc}/bin/vlc &
-          '';
+        ${pkgs.pavucontrol}/bin/pavucontrol &
+      '';
     };
 
     # mouse/touchpad
@@ -43,6 +44,6 @@
 
   # Packages
   # --------
-  environment.systemPackages = with pkgs; [ arandr flameshot ];
+  environment.systemPackages = with pkgs; [ flameshot pavucontrol mumble vlc ];
 
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index d8ab3a4..5bf5d16 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -62,11 +62,15 @@ in {
 
   castget = callPackage ./castget { };
 
-  nixos-generators = callPackage (super.fetchgit {
-    url = "https://github.com/nix-community/nixos-generators.git";
-    rev = "e006f95894b91fccf903d1b0620c5a18879ab91f";
-    sha256 = "1cx54d8zyvgwb2kzj4blkambbm278icrgw5y1nicj54qrs7398n6";
-  }) { };
+  #nixos-generators = callPackage (super.fetchgit {
+  #  url = "https://github.com/nix-community/nixos-generators.git";
+  #  # before flakes
+  #  #rev = "5eb0cbe93bd1bcf134ec330c06b6f1e645de64c6";
+  #  #sha256 = "0ghwy0xh7x7hwym8hzx95fj9yw8gxb4ffh56dn0p8a6scnlffci6";
+  #  # with flaks
+  #  #rev = "450f39121c45b93951c52874fe233455d007d3bc";
+  #  #sha256 = "1iwc39hzvzzyndxwbnl3fck7phxnjpnhy8zn4nyp8is1fiw0648v";
+  #}) { };
 
   radio-dj = callPackage (super.fetchgit {
     url = "https://git.ingolf-wagner.de/crashburn_radio/radio_dj.git";