From d19aedb81c0e5aa7a292ff00aaf870ab3c0579ea Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 20 Apr 2019 09:46:04 +0200 Subject: ma x.r: use stable kernel due to wifi issues --- makefu/1systems/x/config.nix | 2 ++ 1 file changed, 2 insertions(+) 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; } -- cgit v1.2.3 From 95f6a06c5acfb6054236ea2f5aee42975dd909ec Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Apr 2019 20:31:03 +0200 Subject: prison-break: move to krebs --- krebs/5pkgs/simple/prison-break/default.nix | 20 ++++++++++++++++++++ .../5pkgs/simple/prison-break/straight-plugin.nix | 22 ++++++++++++++++++++++ makefu/5pkgs/prison-break/default.nix | 20 -------------------- makefu/5pkgs/prison-break/straight-plugin.nix | 22 ---------------------- 4 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 krebs/5pkgs/simple/prison-break/default.nix create mode 100644 krebs/5pkgs/simple/prison-break/straight-plugin.nix delete mode 100644 makefu/5pkgs/prison-break/default.nix delete mode 100644 makefu/5pkgs/prison-break/straight-plugin.nix diff --git a/krebs/5pkgs/simple/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix new file mode 100644 index 000000000..051a46184 --- /dev/null +++ b/krebs/5pkgs/simple/prison-break/default.nix @@ -0,0 +1,20 @@ +{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/krebs/5pkgs/simple/prison-break/straight-plugin.nix b/krebs/5pkgs/simple/prison-break/straight-plugin.nix new file mode 100644 index 000000000..606c60b5d --- /dev/null +++ b/krebs/5pkgs/simple/prison-break/straight-plugin.nix @@ -0,0 +1,22 @@ +{ 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 ]; + }; +} 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 ]; - }; -} -- cgit v1.2.3 From 98f0d7fef497037f82711cc62db61008e26280b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Apr 2019 20:36:31 +0200 Subject: ma network-manager: add prison-break --- makefu/2configs/hw/network-manager.nix | 3 +++ 1 file changed, 3 insertions(+) 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"; } + ]; } -- cgit v1.2.3