summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-05-05 10:40:24 +0200
committerlassulus <lassulus@lassul.us>2019-05-05 10:40:24 +0200
commit9da52b378d55113158702e010b3725f5b605a85d (patch)
tree0ecdca4cb64f170b0da6ff9a88608c2cfcf4dc40
parent595574d4338e12c53b5f4c8c9e2c087bc668b7b5 (diff)
parent98f0d7fef497037f82711cc62db61008e26280b2 (diff)
Merge remote-tracking branch 'gum/master'nixpkgs
-rw-r--r--krebs/5pkgs/simple/prison-break/default.nix (renamed from makefu/5pkgs/prison-break/default.nix)0
-rw-r--r--krebs/5pkgs/simple/prison-break/straight-plugin.nix (renamed from makefu/5pkgs/prison-break/straight-plugin.nix)0
-rw-r--r--makefu/1systems/x/config.nix2
-rw-r--r--makefu/2configs/hw/network-manager.nix3
4 files changed, 5 insertions, 0 deletions
diff --git a/makefu/5pkgs/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix
index 051a4618..051a4618 100644
--- a/makefu/5pkgs/prison-break/default.nix
+++ b/krebs/5pkgs/simple/prison-break/default.nix
diff --git a/makefu/5pkgs/prison-break/straight-plugin.nix b/krebs/5pkgs/simple/prison-break/straight-plugin.nix
index 606c60b5..606c60b5 100644
--- a/makefu/5pkgs/prison-break/straight-plugin.nix
+++ b/krebs/5pkgs/simple/prison-break/straight-plugin.nix
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 3c5e50c4..32a54895 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 3b9d0454..d7b262b9 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"; }
+ ];
}