diff options
author | Kjetil Ørbekk <kj@orbekk.com> | 2017-11-18 13:44:21 -0500 |
---|---|---|
committer | Kjetil Ørbekk <kj@orbekk.com> | 2017-11-18 13:44:21 -0500 |
commit | c347a2120788b7804303cff210bc51a1dfc957fd (patch) | |
tree | 696502f5e92ad5c6be0fa03786b3b7695013c12f /config | |
parent | a922bc513cf4c1730b4c69cc43ca66004814e45b (diff) |
updates to dragon
Diffstat (limited to 'config')
-rw-r--r-- | config/hydra.nix | 3 | ||||
-rw-r--r-- | config/web-server.nix | 4 | ||||
-rw-r--r-- | config/weechat.nix | 19 |
3 files changed, 16 insertions, 10 deletions
diff --git a/config/hydra.nix b/config/hydra.nix index 6175bc5..bfa985a 100644 --- a/config/hydra.nix +++ b/config/hydra.nix @@ -5,6 +5,8 @@ in { networking.firewall.allowedTCPPorts = [ hydraPort ]; + virtualisation.virtualbox.host.enable = true; + services.hydra = { enable = true; hydraURL = "https://hydra.orbekk.com"; @@ -12,7 +14,6 @@ in port = hydraPort; extraConfig = '' store-uri = file:///nix/store?secret-key=/opt/secret/hydra_key/hydra.orbekk.com-1/secret - binary_cache_secret_key_file = /opt/secret/hydra_key/hydra.orbekk.com-1/secret ''; }; diff --git a/config/web-server.nix b/config/web-server.nix index 5c9a70e..84d52be 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -60,11 +60,11 @@ }; }; "git.orbekk.com" = template // { - locations."/".proxyPass = "http://10.0.20.15:11103"; + locations."/".proxyPass = "http://10.0.20.2:11103"; }; "hydra.orbekk.com" = template // { locations."/" = { - proxyPass = "http://10.0.20.15:11101"; + proxyPass = "http://10.0.20.2:11101"; }; }; "kufieta.net" = template // { diff --git a/config/weechat.nix b/config/weechat.nix index ae08c21..70d1953 100644 --- a/config/weechat.nix +++ b/config/weechat.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: { - # nixpkgs.config.packageOverrides = pkgs: { - # weechat = pkgs.weechat.override { - # extraBuildInputs = with pkgs; [ - # luaPackages.cjson - # ]; - # }; - # }; + nixpkgs.config.packageOverrides = pkgs: { + weechat = pkgs.weechat.override { + extraBuildInputs = with pkgs; [ + pythonPackages.potr + ]; + }; + }; systemd.services = { weechat = { @@ -14,6 +14,11 @@ path = [ pkgs.weechat pkgs.tmux pkgs.coreutils ]; after = [ "networking.target" ]; wantedBy = [ "multi-user.target" ]; + environment = { + LANG = "en_US.utf8"; + LC_ALL = "en_US.utf8"; + TERM = "${pkgs.rxvt_unicode.terminfo}"; + }; serviceConfig = { Type = "oneshot"; User = "orbekk"; |