Merge remote-tracking branch 'gum/master'

2019-05-05 10:40:24 +02:00 · 2019-05-05 10:40:24 +02:00 · 9da52b378d
commit 9da52b378d
parent 595574d433 98f0d7fef4
4 changed files with 5 additions and 0 deletions
--- a/krebs/5pkgs/simple/prison-break/default.nix
+++ b/krebs/5pkgs/simple/prison-break/default.nix
--- a/krebs/5pkgs/simple/prison-break/straight-plugin.nix
+++ b/krebs/5pkgs/simple/prison-break/straight-plugin.nix
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@ -196,4 +196,6 @@

  services.syncthing.user = lib.mkForce "makefu";
  services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/";
+  # latest kernel (5.0) has issues with wifi card
+  boot.kernelPackages = pkgs.linuxPackages;
 }
--- a/makefu/2configs/hw/network-manager.nix
+++ b/makefu/2configs/hw/network-manager.nix
@ -30,4 +30,7 @@
  state = [
    "/etc/NetworkManager/system-connections"  #NM stateful config files
  ];
+  networking.networkmanager.dispatcherScripts = [
+    { source = "${pkgs.prison-break}/bin/prison-break"; }
+  ];
 }