Merge remote-tracking branch 'gum/master'

4 files changed, 5 insertions, 42 deletions

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 3c5e50c4b..32a548954 100644
--- 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;
 }
diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix
index 3b9d04549..d7b262b91 100644
--- 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"; }
+  ];
 }
diff --git a/makefu/5pkgs/prison-break/default.nix b/makefu/5pkgs/prison-break/default.nix
deleted file mode 100644
index 051a46184..000000000
--- a/makefu/5pkgs/prison-break/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, fetchFromGitHub}:
-with pkgs.python3.pkgs;
-
-buildPythonPackage rec {
-  pname = "prison-break";
-  version = "1.0.0";
-  src = fetchFromGitHub {
-    owner = "makefu";
-    repo = pname;
-    rev = "1.0.0";
-    sha256 = "0ab42z6qr42vz4fc077irn9ykrrylagx1dzlw8dqcanf49dxd961";
-  };
-  propagatedBuildInputs = [
-    docopt
-    requests
-    beautifulsoup4
-    (callPackage ./straight-plugin.nix {})
-  ];
-  checkInputs = [ black ];
-}
diff --git a/makefu/5pkgs/prison-break/straight-plugin.nix b/makefu/5pkgs/prison-break/straight-plugin.nix
deleted file mode 100644
index 606c60b5d..000000000
--- a/makefu/5pkgs/prison-break/straight-plugin.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "straight-plugin";
-  version = "1.5.0";
-
-  src = fetchPypi {
-    pname = "straight.plugin";
-    inherit version;
-    sha256 = "818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38";
-  };
-
-  meta = with lib; {
-    description = "A simple namespaced plugin facility";
-    homepage = https://github.com/ironfroggy/straight.plugin;
-    license = licenses.mit;
-    maintainers = [ maintainers.makefu ];
-  };
-}