From 4f9e6225341a273eca9866fe65911afb8b99bb41 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 20 Aug 2022 19:03:06 +0200 Subject: tv gitrepos: move regfish to museum --- tv/2configs/gitrepos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv') diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index 4d22fdff..50444c1e 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -109,7 +109,6 @@ let { }; q = {}; reaktor2 = {}; - regfish = {}; stockholm = { cgit.desc = "NixOS configuration"; }; @@ -156,6 +155,7 @@ let { painload = {}; push = {}; Reaktor = {}; + regfish = {}; with-tmpdir = {}; get = {}; load-env = {}; -- cgit v1.2.3 From 587015b9d7d3955d8e1c8d89ef95047078492f9a Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 20 Aug 2022 21:50:48 +0200 Subject: tv nginx: close requests with bad Host header --- tv/2configs/nginx/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tv') diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix index b0acb943..e68fc714 100644 --- a/tv/2configs/nginx/default.nix +++ b/tv/2configs/nginx/default.nix @@ -8,18 +8,13 @@ with import ; recommendedOptimisation = true; recommendedTlsSettings = true; - virtualHosts._http = { + virtualHosts.${toJSON ""} = { default = true; extraConfig = '' - return 404; - ''; - }; - - virtualHosts.default = { - locations."= /etc/os-release".extraConfig = '' - default_type text/plain; - alias /etc/os-release; + error_page 400 =444 /; + return 444; ''; + rejectSSL = true; }; }; tv.iptables = { -- cgit v1.2.3 From b00873ffa73fdee8473158be7de11557ab4e36b7 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 20 Aug 2022 22:32:00 +0200 Subject: tv nginx: enable reload --- tv/2configs/nginx/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tv') diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix index e68fc714..efea3a84 100644 --- a/tv/2configs/nginx/default.nix +++ b/tv/2configs/nginx/default.nix @@ -4,6 +4,8 @@ with import ; { services.nginx = { + enableReload = true; + recommendedGzipSettings = true; recommendedOptimisation = true; recommendedTlsSettings = true; -- cgit v1.2.3 From ab4838d5f36fb38d358b8da93ebf5dfc3c8bb4f2 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 22 Aug 2022 23:09:31 +0200 Subject: tv jc: init at 1.21.0 --- tv/5pkgs/override/jc.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tv/5pkgs/override/jc.nix (limited to 'tv') diff --git a/tv/5pkgs/override/jc.nix b/tv/5pkgs/override/jc.nix new file mode 100644 index 00000000..346dd3ee --- /dev/null +++ b/tv/5pkgs/override/jc.nix @@ -0,0 +1,21 @@ +self: super: + +let + version = "1.21.0"; +in + +# Prevent downgrades. +assert self.lib.versionAtLeast version super.jc.version; + +self.python3.pkgs.toPythonApplication + (self.python3.pkgs.jc.overrideAttrs + (oldAttrs: { + name = "jc-${version}"; + version = version; + src = self.fetchFromGitHub { + owner = "kellyjonbrazil"; + repo = "jc"; + rev = "v${version}"; + sha256 = "sha256-kS42WokR7ZIqIPi8LbX4tmtjn37tckea2ELbuqzTm2o"; + }; + })) -- cgit v1.2.3 From 39f8f66ef8192afe25e55944163ae1c4c82275d1 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 6 Sep 2022 13:07:34 +0200 Subject: tv alnus displayManager: lightdm -> autoLogin --- tv/1systems/alnus/config.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index bddd69ef..cb8ae1d0 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -71,11 +71,9 @@ with import ; }; desktopManager.xfce.enable = true; - - displayManager.lightdm.autoLogin.enable = true; - displayManager.lightdm.autoLogin.user = "dv"; - displayManager.lightdm.enable = true; }; + services.xserver.displayManager.autoLogin.enable = true; + services.xserver.displayManager.autoLogin.user = "dv"; users.users.dv = { inherit (config.krebs.users.dv) home uid; -- cgit v1.2.3 From cc10a5872875af482f2667a8eef73a55982b29b0 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 6 Sep 2022 13:08:55 +0200 Subject: tv alnus desktopManager: xfce -> plasma5 --- tv/1systems/alnus/config.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index cb8ae1d0..1b366883 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -69,9 +69,8 @@ with import ; enable = true; twoFingerScroll = true; }; - - desktopManager.xfce.enable = true; }; + services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "dv"; -- cgit v1.2.3 From 72d6161084c2690c3fe4b59e1e3ca20b9203abf2 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 6 Sep 2022 13:09:52 +0200 Subject: tv alnus stateVersion: init at "22.05" --- tv/1systems/alnus/config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 1b366883..c36fbc4b 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -74,6 +74,8 @@ with import ; services.xserver.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.user = "dv"; + system.stateVersion = "22.05"; + users.users.dv = { inherit (config.krebs.users.dv) home uid; isNormalUser = true; -- cgit v1.2.3 From 5de8b8530cb436118db192d90824bc6efdfda18a Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Sep 2022 21:22:15 +0200 Subject: haskell overrides: admit old overrides --- tv/5pkgs/haskell/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tv') diff --git a/tv/5pkgs/haskell/default.nix b/tv/5pkgs/haskell/default.nix index fcede2f9..33fd2506 100644 --- a/tv/5pkgs/haskell/default.nix +++ b/tv/5pkgs/haskell/default.nix @@ -10,11 +10,15 @@ in haskell = super.haskell // { packages = mapAttrs (name: value: if hasAttr "override" value - then value.override { inherit overrides; } + then value.override (old: { + overrides = + composeExtensions (old.overrides or (_: _: { })) overrides; + }) else value ) super.haskell.packages; }; - haskellPackages = super.haskellPackages.override { - inherit overrides; - }; + haskellPackages = super.haskellPackages.override (old: { + overrides = + composeExtensions (old.overrides or (_: _: { })) overrides; + }); } -- cgit v1.2.3 From 432325be09497d64cde6a970e3b58625e94f38a5 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 14 Sep 2022 21:34:29 +0200 Subject: tv weechat-tv: init --- tv/3modules/im.nix | 2 +- tv/5pkgs/simple/weechat-tv.nix | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 tv/5pkgs/simple/weechat-tv.nix (limited to 'tv') diff --git a/tv/3modules/im.nix b/tv/3modules/im.nix index 8cb13751..e98a5732 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 00000000..17d28636 --- /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 + ]; + }; +} -- cgit v1.2.3 From 9b37b535f43f361a7f57a5aebf89c139d33de01e Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 1 Apr 2022 22:46:35 +0200 Subject: tv: bump HISTSIZE --- tv/2configs/bash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tv') diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix index 42914e06..92e2499a 100644 --- a/tv/2configs/bash/default.nix +++ b/tv/2configs/bash/default.nix @@ -6,7 +6,7 @@ with import ; programs.bash = { interactiveShellInit = /* sh */ '' HISTCONTROL='erasedups:ignorespace' - HISTSIZE=65536 + HISTSIZE=900001 HISTFILESIZE=$HISTSIZE HISTTIMEFORMAT= -- cgit v1.2.3 From 707c6b640dca086634581220614c6094ebbcccbf Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 15 Sep 2022 20:35:43 +0200 Subject: tv binary-cache: use nix-serve-ng --- tv/2configs/binary-cache/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tv') diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index f6eaba36..e5342cd5 100644 --- a/tv/2configs/binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -3,6 +3,12 @@ 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; -- cgit v1.2.3 From 3e6f01c3003558a7db1094742fc2cbedf985cd23 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 15 Sep 2022 20:51:27 +0200 Subject: tv binary-cache: drop krebs.secert --- tv/2configs/binary-cache/default.nix | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'tv') diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index e5342cd5..6ef7a385 100644 --- a/tv/2configs/binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -11,22 +11,7 @@ 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 + "/nix-serve.key"; + secretKeyFile = toString + "/nix-serve.key"; }; services.nginx = { -- cgit v1.2.3 From d76cf33d1f000389558da8c8f5e17db966b8a5a7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 15 Sep 2022 20:52:00 +0200 Subject: tv binary-cache: add retiolum alias --- tv/2configs/binary-cache/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tv') diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index 6ef7a385..58791f4f 100644 --- a/tv/2configs/binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -19,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}; -- cgit v1.2.3