4 files changed, 27 insertions, 17 deletions
diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix
index b08919802..d6943c110 100644
--- a/lass/1systems/daedalus/config.nix
+++ b/lass/1systems/daedalus/config.nix
@@ -43,7 +43,7 @@ with import <stockholm/lib>;
         libreoffice
         audacity
         zathura
-        skype
+        skypeforlinux
         wine
         geeqie
         vlc
@@ -56,22 +56,32 @@ with import <stockholm/lib>;
       services.xserver.layout = "de";
     }
     {
-      krebs.per-user.bitcoin.packages = [
-        pkgs.electrum
-        pkgs.electron-cash
-        pkgs.litecoin
-      ];
-      users.extraUsers = {
-        bitcoin = {
-          name = "bitcoin";
-          description = "user for bitcoin stuff";
-          home = "/home/bitcoin";
-          isNormalUser = true;
-          useDefaultShell = true;
-          createHome = true;
-          extraGroups = [ "audio" ];
+      users = {
+        groups.plugdev = {};
+        users = {
+          bitcoin = {
+            name = "bitcoin";
+            description = "user for bitcoin stuff";
+            home = "/home/bitcoin";
+            isNormalUser = true;
+            useDefaultShell = true;
+            createHome = true;
+            extraGroups = [
+              "audio"
+              "networkmanager"
+              "plugdev"
+            ];
+            packages = let
+              unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
+            in [
+              pkgs.electrum
+              pkgs.electron-cash
+              unstable.ledger-live-desktop
+            ];
+          };
         };
       };
+      hardware.ledger.enable = true;
       security.sudo.extraConfig = ''
         bubsy ALL=(bitcoin) NOPASSWD: ALL
       '';
diff --git a/lass/1systems/lasspi/physical.nix b/lass/1systems/lasspi/physical.nix
index 80c459a95..868bafad5 100644
--- a/lass/1systems/lasspi/physical.nix
+++ b/lass/1systems/lasspi/physical.nix
@@ -25,7 +25,6 @@
     version = 4;
   };
   boot.loader.grub.enable = false;
-  boot.loader.generic-extlinux-compatible.enable = true;
 
   # Required for the Wireless firmware
   hardware.enableRedistributableFirmware = true;
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index d174e6057..62c6f0b71 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -124,6 +124,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/container-networking.nix>
     <stockholm/lass/2configs/jitsi.nix>
     <stockholm/lass/2configs/fysiirc.nix>
+    <stockholm/lass/2configs/bgt-bot>
     {
       services.tor = {
         enable = true;
diff --git a/lass/1systems/xerxes/config.nix b/lass/1systems/xerxes/config.nix
index bf818a9b2..6972567d7 100644
--- a/lass/1systems/xerxes/config.nix
+++ b/lass/1systems/xerxes/config.nix
@@ -47,7 +47,7 @@
     wantedBy = [ "multi-user.target" ];
     script = ''
       ${pkgs.xboxdrv.overrideAttrs(o: {
-        patches = [ (pkgs.fetchurl {
+        patches = o.patches ++ [ (pkgs.fetchurl {
           url = "https://patch-diff.githubusercontent.com/raw/xboxdrv/xboxdrv/pull/251.patch";
           sha256 = "17784y20mxqrlhgvwvszh8lprxrvgmb7ah9dknmbhj5jhkjl8wq5";
         }) ];