summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--depo/nutin-madaj/configuration.nix46
-rw-r--r--depo/nutin-madaj/default.nix9
-rw-r--r--pack/ibb.nix2
-rw-r--r--pack/nixpkgs.nix4
4 files changed, 55 insertions, 6 deletions
diff --git a/depo/nutin-madaj/configuration.nix b/depo/nutin-madaj/configuration.nix
index 6ca0de1..919ae1b 100644
--- a/depo/nutin-madaj/configuration.nix
+++ b/depo/nutin-madaj/configuration.nix
@@ -69,6 +69,42 @@ in
};
};
};
+
+ znc = {
+ enable = true;
+ mutable = true;
+ useLegacyConfig = false;
+ openFirewall = true;
+ config = {
+ LoadModule = [ "adminlog" "fail2ban" ];
+ User.bsima = {
+ Admin = true;
+ Nick = "bsima";
+ AltNick = "bsima1";
+ LoadModule = [ "chansaver" "controlpanel" ];
+ Network.freenode = { Server = "chat.freenode.net +6697";
+ LoadModule = [ "simple_away" "nickserv" ];
+ Chan = {
+ "#ai" = {};
+ "#bsima" = {};
+ "#emacs" = {};
+ "#haskell" = {};
+ "#haskell-miso" = {};
+ "#home-manager" = {};
+ "#nixos" = {};
+ "#servant" = {};
+ "#sr.ht" = {};
+ "#xmonad" = {};
+ };
+ };
+ Pass.password = {
+ Method = "sha256";
+ Hash = "4a6703074c713a26d56a906fc9ea82bb591177f10a25a650719266bf588d9525";
+ Salt = "QByO-A:4Rbib;dl_3wEH";
+ };
+ };
+ };
+ };
};
mailserver = {
@@ -108,6 +144,16 @@ in
};
};
+ virtualisation = {
+ libvirtd.enable = true;
+ docker.enable = true;
+ virtualbox.guest.enable = true;
+ virtualbox.host.enable = true;
+ virtualbox.host.headless = false;
+ virtualbox.host.addNetworkInterface = true;
+
+ };
+
boot.cleanTmpDir = true;
networking.hostName = "simatime";
networking.firewall.allowPing = true;
diff --git a/depo/nutin-madaj/default.nix b/depo/nutin-madaj/default.nix
index a97a4a7..fa95947 100644
--- a/depo/nutin-madaj/default.nix
+++ b/depo/nutin-madaj/default.nix
@@ -1,5 +1,9 @@
let
nixpkgs = builtins.fetchTarball (import ../../pack/nixpkgs.nix);
+ nixos-mailserver = builtins.fetchTarball {
+ url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz";
+ sha256 = "03d49v8qnid9g9rha0wg2z6vic06mhp0b049s3whccn1axvs2zzx";
+ };
in
import "${nixpkgs}/nixos" {
system = "x86_64-linux";
@@ -16,10 +20,7 @@ import "${nixpkgs}/nixos" {
../../mode/fathom.nix
# third party
- (builtins.fetchTarball {
- url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.0/nixos-mailserver-v2.2.0.tar.gz";
- sha256 = "0gqzgy50hgb5zmdjiffaqp277a68564vflfpjvk1gv6079zahksc";
- })
+ nixos-mailserver
];
};
}
diff --git a/pack/ibb.nix b/pack/ibb.nix
index 05d2b7d..fe74346 100644
--- a/pack/ibb.nix
+++ b/pack/ibb.nix
@@ -24,6 +24,8 @@ let
tasty-quickcheck = dontCheck super.tasty-quickcheck;
scientific = dontCheck super.scientific; # takes forever
servant = dontCheck super.servant;
+ comonad = dontCheck super.comonad;
+ QuickCheck = dontCheck super.QuickCheck;
};
});
ghcjs = ghcjs_.ghcWithPackages (hp: with hp; [
diff --git a/pack/nixpkgs.nix b/pack/nixpkgs.nix
index 154daca..8065373 100644
--- a/pack/nixpkgs.nix
+++ b/pack/nixpkgs.nix
@@ -1,5 +1,5 @@
# Get the sha256 with: nix-prefetch-url --unpack ${url}
{
- url = "https://github.com/NixOS/nixpkgs/archive/da81531c1d76b4c24b944f6cf69b7025770662c1.tar.gz";
- sha256 = "00qqchbvvbcmmkfpjkp1ki4kwcm33ch1ljbi2n3zxy36r430way1";
+ url = "https://github.com/NixOS/nixpkgs/archive/482e21883fb0393f935c30f2754db94d181a8d32.tar.gz";
+ sha256 = "12z06zc8nm2q0yn8w5qkzi8rvbx75pshcq970nahmygl46wbpyl4";
}