summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/git.nix3
-rw-r--r--tv/2configs/vim.nix4
-rw-r--r--tv/3modules/charybdis/config.nix4
4 files changed, 8 insertions, 5 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index d17e41351..618dcdccb 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "5b0c9d4f92f15f171afa65caf13a29ac1c068a10"; # nixos-17.03
+ ref = "69d9061908162bd973fcf34d0fc6dc9d9f8cf9ed"; # nixos-17.03
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 9ccb0a057..1f7b6b00b 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -33,6 +33,9 @@ let {
cgit.desc = "dict.leo.org command line interface";
};
get = {};
+ irc = {
+ cgit.desc = "toy IRC client";
+ };
load-env = {};
loldns = {
cgit.desc = "toy DNS server";
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 8b83b0503..b534c3f42 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -4,7 +4,7 @@ with import <stockholm/lib>;
let {
body = {
environment.systemPackages = [
- vim
+ vim-wrapper
];
environment.etc.vimrc.source = vimrc;
@@ -297,7 +297,7 @@ let {
alldirs = attrValues dirs ++ map dirOf (attrValues files);
in unique (sort lessThan alldirs);
- vim = pkgs.concat "vim" [
+ vim-wrapper = pkgs.concat "vim" [
pkgs.vim_configurable
(pkgs.writeDashBin "vim" ''
set -efu
diff --git a/tv/3modules/charybdis/config.nix b/tv/3modules/charybdis/config.nix
index 5812516f1..941f1661f 100644
--- a/tv/3modules/charybdis/config.nix
+++ b/tv/3modules/charybdis/config.nix
@@ -501,8 +501,8 @@ in toFile "charybdis.conf" ''
reject_ban_time = 1 minute;
reject_after_count = 3;
reject_duration = 5 minutes;
- throttle_duration = 60;
- throttle_count = 4;
+ throttle_duration = 1;
+ throttle_count = 1000;
max_ratelimit_tokens = 30;
away_interval = 30;
disable_auth = yes;