diff options
author | lassulus <lassulus@lassul.us> | 2022-09-19 11:24:47 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2022-09-19 11:24:47 +0200 |
commit | 75b4732dbe325dc64466e7643d464fcc7641d1d5 (patch) | |
tree | 2c4adbd466537d833cdb059d7ddca62c2ac2fe54 | |
parent | ac8dba790b69169973d2c2f67f2ca458d49f144a (diff) | |
parent | faba69f10980c0a284703a466d8b4b37532d4a19 (diff) |
Merge remote-tracking branch 'ni/master'
-rw-r--r-- | tv/2configs/bash/default.nix | 2 | ||||
-rw-r--r-- | tv/2configs/binary-cache/default.nix | 24 | ||||
-rw-r--r-- | tv/3modules/im.nix | 2 | ||||
-rw-r--r-- | tv/5pkgs/simple/weechat-tv.nix | 9 |
4 files changed, 19 insertions, 18 deletions
diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix index 42914e0..92e2499 100644 --- a/tv/2configs/bash/default.nix +++ b/tv/2configs/bash/default.nix @@ -6,7 +6,7 @@ with import <stockholm/lib>; programs.bash = { interactiveShellInit = /* sh */ '' HISTCONTROL='erasedups:ignorespace' - HISTSIZE=65536 + HISTSIZE=900001 HISTFILESIZE=$HISTSIZE HISTTIMEFORMAT= diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index f6eaba3..58791f4 100644 --- a/tv/2configs/binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -3,24 +3,15 @@ environment.etc."binary-cache.pubkey".text = config.krebs.build.host.binary-cache.pubkey; + nixpkgs.overlays = [ + (self: super: { + nix-serve = self.haskellPackages.nix-serve-ng; + }) + ]; + services.nix-serve = { enable = true; - secretKeyFile = config.krebs.secret.files.binary-cache-seckey.path; - }; - - systemd.services.nix-serve = { - after = [ - config.krebs.secret.files.binary-cache-seckey.service - ]; - partOf = [ - config.krebs.secret.files.binary-cache-seckey.service - ]; - }; - - krebs.secret.files.binary-cache-seckey = { - path = "/run/secret/nix-serve.key"; - owner.name = "nix-serve"; - source-path = toString <secrets> + "/nix-serve.key"; + secretKeyFile = toString <secrets> + "/nix-serve.key"; }; services.nginx = { @@ -28,6 +19,7 @@ virtualHosts.nix-serve = { serverAliases = [ "cache.${config.krebs.build.host.name}.hkw" + "cache.${config.krebs.build.host.name}.r" ]; locations."/".extraConfig = '' proxy_pass http://localhost:${toString config.services.nix-serve.port}; diff --git a/tv/3modules/im.nix b/tv/3modules/im.nix index 8cb1375..e98a573 100644 --- a/tv/3modules/im.nix +++ b/tv/3modules/im.nix @@ -71,7 +71,7 @@ in { export PATH=${lib.makeSearchPath "bin" [ pkgs.tmux pkgs.gnugrep - pkgs.weechat + pkgs.weechat-tv ]} if tmux list-sessions -F\#S | grep -q '^im''$'; then exec tmux attach -t im diff --git a/tv/5pkgs/simple/weechat-tv.nix b/tv/5pkgs/simple/weechat-tv.nix new file mode 100644 index 0000000..17d2863 --- /dev/null +++ b/tv/5pkgs/simple/weechat-tv.nix @@ -0,0 +1,9 @@ +{ lib, pkgs }: + +pkgs.wrapWeechat pkgs.weechat-unwrapped { + configure = { availablePlugins, ... }: { + scripts = [ + pkgs.weechatScripts.weechat-matrix + ]; + }; +} |