From c7ec729c6b8b068a6a817f803f0befe14dbd5569 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 27 Nov 2016 13:20:27 +0100
Subject: l 1 helios: enable pulseaudio

---
 lass/1systems/helios.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 82db8ef7b..4472816e3 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -28,6 +28,9 @@ with import <stockholm/lib>;
       services.xserver.enable = true;
       services.xserver.desktopManager.xfce.enable = true;
       networking.wireless.enable = true;
+      hardware.pulseaudio = {
+        enable = true;
+      };
       users.users.ferret = {
         uid = genid "ferret";
         home = "/home/ferret";
-- 
cgit v1.3.1


From 5b1e5bbe0e6cbeb052e9087e87d476166cebdec5 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 27 Nov 2016 15:06:46 +0100
Subject: l 1 mors: remove obsolete chromium-patched

---
 lass/1systems/mors.nix             |  1 -
 lass/2configs/chromium-patched.nix | 48 --------------------------------------
 2 files changed, 49 deletions(-)
 delete mode 100644 lass/2configs/chromium-patched.nix

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 742d42bf8..99705cbf1 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -17,7 +17,6 @@ with import <stockholm/lib>;
     ../2configs/elster.nix
     ../2configs/steam.nix
     ../2configs/wine.nix
-    ../2configs/chromium-patched.nix
     ../2configs/git.nix
     ../2configs/skype.nix
     ../2configs/teamviewer.nix
diff --git a/lass/2configs/chromium-patched.nix b/lass/2configs/chromium-patched.nix
deleted file mode 100644
index d9d7760dd..000000000
--- a/lass/2configs/chromium-patched.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ config, pkgs, ... }:
-
-#settings to test:
-#
-      #"ForceEphemeralProfiles": true,
-let
-  masterPolicy = pkgs.writeText "master.json" ''
-    {
-      "PasswordManagerEnabled": false,
-      "DefaultGeolocationSetting": 2,
-      "RestoreOnStartup": 1,
-      "AutoFillEnabled": false,
-      "BackgroundModeEnabled": false,
-      "DefaultBrowserSettingEnabled": false,
-      "SafeBrowsingEnabled": false,
-      "ExtensionInstallForcelist": [
-        "cjpalhdlnbpafiamejdnhcphjbkeiagm;https://clients2.google.com/service/update2/crx",
-        "ihlenndgcmojhcghmfjfneahoeklbjjh;https://clients2.google.com/service/update2/crx"
-      ]
-    }
-  '';
-
-  master_preferences = pkgs.writeText "master_preferences" ''
-    {
-      "browser": {
-        "custom_chrome_frame": true
-      },
-
-      "extensions": {
-        "theme": {
-          "id": "",
-          "use_system": true
-        }
-      }
-    }
-  '';
-in {
-  environment.etc."chromium/policies/managed/master.json".source = pkgs.lib.mkForce masterPolicy;
-
-  #environment.systemPackages = [
-  #  #pkgs.chromium
-  #  (pkgs.lib.overrideDerivation pkgs.chromium (attrs: {
-  #    buildCommand = attrs.buildCommand + ''
-  #      touch $out/TEST123
-  #    '';
-  #  }))
-  #];
-}
-- 
cgit v1.3.1