summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@green.r>2021-11-30 23:09:27 +0100
committerlassulus <lass@green.r>2021-11-30 23:09:27 +0100
commitb79f5ab97db8115c4b2e66e57bb84587a31ce1e0 (patch)
tree618490ec42690649b64d237f4433899464cf420b /tv
parent14c210d35853c914d5e9cf3488b32f2aaae1d246 (diff)
parent948584f291627d35d6da2f41704fd19adc4dbdde (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/wu/config.nix6
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/gitrepos.nix3
-rw-r--r--tv/5pkgs/haskell/mailaids.nix21
4 files changed, 9 insertions, 23 deletions
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index f0ef6f9b0..bf250cefa 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -33,5 +33,11 @@ with import <stockholm/lib>;
};
networking.wireless.enable = true;
+ networking.wireless.interfaces = [
+ "wlp3s0"
+ ];
+ networking.interfaces.enp4s0f2.useDHCP = true;
+ networking.interfaces.wlp3s0.useDHCP = true;
+ networking.useDHCP = false;
}
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 8e8d0a468..de298e162 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,8 +1,6 @@
with import <stockholm/lib>;
{ config, pkgs, ... }: {
- boot.kernelPackages = mkDefault pkgs.linuxPackages_latest;
-
boot.tmpOnTmpfs = true;
krebs.enable = true;
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 2b8457e40..6f4dedad6 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -65,6 +65,9 @@ let {
public-repos = mapAttrs make-public-repo ({
} // mapAttrs (_: recursiveUpdate { cgit.section = "1. miscellaneous"; }) {
+ couchfs = {
+ cgit.desc = "filesystem (in userspace) on top of CouchDB";
+ };
crx = {
cgit.desc = "utilities for working with Chrome extensions";
};
diff --git a/tv/5pkgs/haskell/mailaids.nix b/tv/5pkgs/haskell/mailaids.nix
deleted file mode 100644
index f152a76f4..000000000
--- a/tv/5pkgs/haskell/mailaids.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, aeson, aeson-pretty, base, bytestring
-, case-insensitive, fetchgit, lens, optparse-applicative
-, purebred-email, lib, text, vector, word8
-}:
-mkDerivation {
- pname = "mailaids";
- version = "1.0.0";
- src = fetchgit {
- url = "https://cgit.krebsco.de/mailaids";
- sha256 = "15h0k82czm89gkwhp1rwdy77jz8dmb626qdz7c2narvz9j7169v5";
- rev = "8f11927ea74d6adb332c884502ebd9c486837523";
- fetchSubmodules = true;
- };
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- aeson aeson-pretty base bytestring case-insensitive lens
- optparse-applicative purebred-email text vector word8
- ];
- license = lib.licenses.mit;
-}