From 41935c401d35328054e179455a4de9732c8bbe7c Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 27 May 2022 10:22:11 +0200 Subject: l mpv: add sponsorblock --- lass/2configs/mpv.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix index 854af3eb5..1061ea64c 100644 --- a/lass/2configs/mpv.nix +++ b/lass/2configs/mpv.nix @@ -76,15 +76,31 @@ let mp.add_key_binding('S', "download_subs", download) ''; + mpvInput = pkgs.writeText "mpv.input" '' + : script-binding console/enable + ''; + + mpvConfig = pkgs.writeText "mpv.conf" '' + ''; + mpv = pkgs.symlinkJoin { name = "mpv"; paths = [ (pkgs.writeDashBin "mpv" '' - exec ${pkgs.mpv}/bin/mpv \ + # we need to disable sponsorblock local database because of + # https://github.com/po5/mpv_sponsorblock/issues/31 + exec ${pkgs.mpv.override { + scripts = [ + pkgs.mpvScripts.sponsorblock + ]; + }}/bin/mpv \ -vo=gpu \ --no-config \ + --input-conf=${mpvInput} \ + --include=${mpvConfig} \ --script=${autosub} \ --script-opts=ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp \ + --script-opts-append=sponsorblock-local_database=no \ "$@" '') pkgs.mpv -- cgit v1.2.3 From cfee9e89e7bd214e8ea9f8e2e6349c6ebc917bf1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 27 May 2022 13:42:45 +0200 Subject: l mpv: set youtube video size --- lass/2configs/mpv.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix index 1061ea64c..f88d0d91d 100644 --- a/lass/2configs/mpv.nix +++ b/lass/2configs/mpv.nix @@ -81,17 +81,28 @@ let ''; mpvConfig = pkgs.writeText "mpv.conf" '' + osd-font-size=20 ''; mpv = pkgs.symlinkJoin { name = "mpv"; paths = [ (pkgs.writeDashBin "mpv" '' + set -efu + if [ -n "''${DISPLAY+x}" ]; then + Y_RES=$(${pkgs.xorg.xrandr}/bin/xrandr | + ${pkgs.jc}/bin/jc --xrandr | + ${pkgs.jq}/bin/jq '.screens[0].current_width' + ) + else + Y_RES=1000 + fi # we need to disable sponsorblock local database because of # https://github.com/po5/mpv_sponsorblock/issues/31 exec ${pkgs.mpv.override { - scripts = [ - pkgs.mpvScripts.sponsorblock + scripts = with pkgs.mpvScripts; [ + sponsorblock + youtube-quality ]; }}/bin/mpv \ -vo=gpu \ @@ -99,6 +110,7 @@ let --input-conf=${mpvInput} \ --include=${mpvConfig} \ --script=${autosub} \ + --ytdl-format="best[height<$Y_RES]" \ --script-opts=ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp \ --script-opts-append=sponsorblock-local_database=no \ "$@" -- cgit v1.2.3 From 88a61c26119968fee629de120fdffe3e4d6312bd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 28 May 2022 18:37:55 +0200 Subject: l codimd: allow embedding --- lass/2configs/codimd.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lass') diff --git a/lass/2configs/codimd.nix b/lass/2configs/codimd.nix index 271dcfca4..b3bf1b761 100644 --- a/lass/2configs/codimd.nix +++ b/lass/2configs/codimd.nix @@ -28,6 +28,10 @@ in { params.hedgedoc = {}; }; + systemd.services.hedgedoc.environment = { + CMD_COOKIE_POLICY = "none"; + CMD_CSP_ALLOW_FRAMING = "true"; + }; services.hedgedoc = { enable = true; configuration.allowOrigin = [ domain ]; @@ -47,6 +51,7 @@ in { sslCertPath = "/var/lib/acme/${domain}/cert.pem"; sslKeyPath = "/var/lib/acme/${domain}/key.pem"; dhParamPath = config.security.dhparams.params.hedgedoc.path; + }; }; } -- cgit v1.2.3 From 4d33f2ebea49e258f833cb6eab0c71485e88397a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 00:38:45 +0200 Subject: l prism.r: add binaergewitter bot --- lass/1systems/prism/config.nix | 1 + lass/2configs/bgt-bot/bgt-check.sh | 57 ++++++++++++++++++++++++++++++++++++++ lass/2configs/bgt-bot/default.nix | 44 +++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 lass/2configs/bgt-bot/bgt-check.sh create mode 100644 lass/2configs/bgt-bot/default.nix (limited to 'lass') diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index d174e6057..62c6f0b71 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -124,6 +124,7 @@ with import ; + { services.tor = { enable = true; diff --git a/lass/2configs/bgt-bot/bgt-check.sh b/lass/2configs/bgt-bot/bgt-check.sh new file mode 100644 index 000000000..30185ba18 --- /dev/null +++ b/lass/2configs/bgt-bot/bgt-check.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# needs in path: +# curl gnugrep jq +# creates and manages $PWD/state +set -xeuf + +send_reaktor(){ + # usage: send_reaktor "text" + echo "send_reaktor: $1" + curl -fsS "http://localhost:$REAKTOR_PORT" \ + -H content-type:application/json \ + -d "$(jq -n \ + --arg text "$1" \ + --arg channel "$IRC_CHANNEL" \ + '{ + command:"PRIVMSG", + params:[$channel,$text] + }' + )" +} + +live=$(shuf -n1 < state +fi diff --git a/lass/2configs/bgt-bot/default.nix b/lass/2configs/bgt-bot/default.nix new file mode 100644 index 000000000..6f9e33704 --- /dev/null +++ b/lass/2configs/bgt-bot/default.nix @@ -0,0 +1,44 @@ +{ config, lib, pkgs, ... }: +let + + bot_port = "7654"; + irc_channel = "#binaergewitter"; +in +{ + krebs.reaktor2.bgt-announce = { + hostname = "irc.libera.chat"; + port = "6697"; + nick = "bgt-announce"; + API.listen = "inet://127.0.0.1:${bot_port}"; + plugins = [ + { + plugin = "register"; + config = { + channels = [ + irc_channel + ]; + }; + } + ]; + }; + systemd.services.check_bgt_show = { + startAt = "*:0/5"; + environment = { + IRC_CHANNEL = irc_channel; + REAKTOR_PORT = bot_port; + }; + path = with pkgs; [ + curl + gnugrep + jq + ]; + script = builtins.readFile ./bgt-check.sh; + serviceConfig = { + DynamicUser = true; + StateDirectory = "bgt-announce"; + WorkingDirectory = "/var/lib/bgt-announce"; + PrivateTmp = true; + }; + }; +} + -- cgit v1.2.3 From db7da0a5d57d64681ab999f2accd115139abe1db Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 13:28:57 +0200 Subject: l mail: use faster index_format --- lass/2configs/mail.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 4682865c6..b874695a8 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -144,15 +144,7 @@ let set sort=threads - set index_format="${pkgs.writeDash "mutt-index" '' - # http://www.mutt.org/doc/manual/#formatstrings - recipent="$(echo $1 | sed 's/[^,]*<\([^>]*\)[^,]*/ \1/g')" - # output to mutt - # V - echo "%4C %Z %?GI?%GI& ? %[%y-%m-%d] %-20.20a %?M?(%3M)& ? %s %> $recipent %?g?%g?%" - # args to mutt-index dash script - # V - ''} %r |" + set index_format="%4C %Z %?GI?%GI& ? %[%y-%m-%d] %-20.20a %?M?(%3M)& ? %s %> %r %g" virtual-mailboxes "Unread" "notmuch://?query=tag:unread" virtual-mailboxes "INBOX" "notmuch://?query=tag:inbox" -- cgit v1.2.3 From a6ec22808c3cf893fdf07f08d0529aace9480664 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 13:49:18 +0200 Subject: l: add tor-ssh.nix --- lass/2configs/default.nix | 1 + lass/2configs/tor-ssh.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 lass/2configs/tor-ssh.nix (limited to 'lass') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index f03d8b568..01a40952e 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -10,6 +10,7 @@ with import ; ./htop.nix ./wiregrill.nix + ./tor-ssh.nix { users.extraUsers = mapAttrs (_: h: { hashedPassword = h; }) diff --git a/lass/2configs/tor-ssh.nix b/lass/2configs/tor-ssh.nix new file mode 100644 index 000000000..8b36733e2 --- /dev/null +++ b/lass/2configs/tor-ssh.nix @@ -0,0 +1,14 @@ +{ + services.tor = { + enable = true; + relay.onionServices.ssh = { + version = 3; + map = [{ + port = 22; + target.port = 22; + }]; + secretKey = ; + }; + }; +} + -- cgit v1.2.3 From e47f1e635ce255eaef8674f13aeb94f071bbb050 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:42:22 +0200 Subject: l IM: use system tmux --- lass/2configs/IM.nix | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'lass') diff --git a/lass/2configs/IM.nix b/lass/2configs/IM.nix index 5b8cebf5c..8567def02 100644 --- a/lass/2configs/IM.nix +++ b/lass/2configs/IM.nix @@ -1,38 +1,23 @@ with (import ); { config, lib, pkgs, ... }: let weechat = pkgs.weechat.override { - configure = { availablePlugins, ... }: with pkgs.weechatScripts; { - plugins = lib.attrValues (availablePlugins // { - python = availablePlugins.python.withPackages (_: [ weechat-matrix ]); - }); - scripts = [ weechat-matrix ]; + configure = { availablePlugins, ... }: { + scripts = with pkgs.weechatScripts; [ + weechat-matrix + ]; }; }; - tmux = pkgs.writeDashBin "tmux" '' - exec ${pkgs.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" '' - set-option -g prefix ` - unbind-key C-b - bind ` send-prefix - - set-option -g status off - set-option -g default-terminal screen-256color - - #use session instead of windows - bind-key c new-session - bind-key p switch-client -p - bind-key n switch-client -n - bind-key C-s switch-client -l - ''} "$@" - ''; + tmux = "/run/current-system/sw/bin/tmux"; in { imports = [ ./bitlbee.nix ]; - environment.systemPackages = [ tmux weechat ]; + environment.systemPackages = [ weechat ]; systemd.services.chat = { description = "chat environment setup"; + environment.WEECHAT_HOME = "\$HOME/.weechat"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -46,8 +31,8 @@ in { User = "lass"; RemainAfterExit = true; Type = "oneshot"; - ExecStart = "${tmux}/bin/tmux -2 new-session -d -s IM ${weechat}/bin/weechat"; - ExecStop = "${tmux}/bin/tmux kill-session -t IM"; # TODO run save in weechat + ExecStart = "${tmux} -2 new-session -d -s IM ${weechat}/bin/weechat"; + ExecStop = "${tmux} kill-session -t IM"; # TODO run save in weechat }; }; } -- cgit v1.2.3 From adf9339f39a6b7700d24f51fca1c65fef37761bd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:42:44 +0200 Subject: l tmux: init --- lass/2configs/default.nix | 1 + lass/2configs/tmux.nix | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'lass') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 01a40952e..0fa340136 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -10,6 +10,7 @@ with import ; ./htop.nix ./wiregrill.nix + ./tmux.nix ./tor-ssh.nix { users.extraUsers = diff --git a/lass/2configs/tmux.nix b/lass/2configs/tmux.nix index c977a1105..10931365d 100644 --- a/lass/2configs/tmux.nix +++ b/lass/2configs/tmux.nix @@ -2,25 +2,26 @@ with import ; { config, pkgs, ... }: { + environment.etc."tmux.conf".text = '' + #prefix key to ` + set-option -g prefix2 ` + + bind-key r source-file /etc/tmux.conf \; display-message "/etc/tmux.conf reloaded" + + set-option -g default-terminal screen-256color + + #use session instead of windows + bind-key c new-session + bind-key p switch-client -p + bind-key n switch-client -n + bind-key C-s switch-client -l + ''; nixpkgs.config.packageOverrides = super: { tmux = pkgs.symlinkJoin { name = "tmux"; paths = [ (pkgs.writeDashBin "tmux" '' - exec ${super.tmux}/bin/tmux -f ${pkgs.writeText "tmux.conf" '' - #change prefix key to ` - set-option -g prefix ` - unbind-key C-b - bind ` send-prefix - - set-option -g default-terminal screen-256color - - #use session instead of windows - bind-key c new-session - bind-key p switch-client -p - bind-key n switch-client -n - bind-key C-s switch-client -l - ''} "$@" + exec ${super.tmux}/bin/tmux -f /etc/tmux.conf "$@" '') super.tmux ]; -- cgit v1.2.3 From 36be6e718deb889f1b48f54d38af306cb8fd6f4e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:43:40 +0200 Subject: l: add urgent command --- lass/2configs/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 0fa340136..e8ac55988 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -124,6 +124,9 @@ with import ; q rs untilport + (pkgs.writeDashBin "urgent" '' + printf '\a' + '') usbutils logify goify -- cgit v1.2.3 From 4a5f1969e3a036fbea380af7a91d1dafd4a0f246 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:44:30 +0200 Subject: l alacritty: use nicer dark theme --- lass/2configs/alacritty.nix | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) (limited to 'lass') diff --git a/lass/2configs/alacritty.nix b/lass/2configs/alacritty.nix index a57dc7c25..903ddf6cc 100644 --- a/lass/2configs/alacritty.nix +++ b/lass/2configs/alacritty.nix @@ -89,9 +89,40 @@ in { }; }; "themes/dark/alacritty.yaml".text = alacritty-cfg { - colors.primary = { - background = "#000000"; - foreground = "#ffffff"; + colors = { + # Default colors + primary = { + background = "0x000000"; + foreground = "0xffffff"; + }; + cursor = { + text = "0xF81CE5"; + cursor = "0xffffff"; + }; + + # Normal colors + normal = { + black = "0x000000"; + red = "0xfe0100"; + green = "0x33ff00"; + yellow = "0xfeff00"; + blue = "0x0066ff"; + magenta = "0xcc00ff"; + cyan = "0x00ffff"; + white = "0xd0d0d0"; + }; + + # Bright colors + bright = { + black = "0x808080"; + red = "0xfe0100"; + green = "0x33ff00"; + yellow = "0xfeff00"; + blue = "0x0066ff"; + magenta = "0xcc00ff"; + cyan = "0x00ffff"; + white = "0xFFFFFF"; + }; }; }; }; -- cgit v1.2.3 From e4a06794be8f8f0d02df8b07fafc2c50f220722f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:47:05 +0200 Subject: l br: add to scanner & lp group --- lass/2configs/baseX.nix | 2 +- lass/2configs/br.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 22a3037d7..d33b470bb 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -16,7 +16,7 @@ in { ./xmonad.nix ./themes.nix { - krebs.per-user.lass.packages = [ + users.users.mainUser.packages = [ pkgs.sshuttle ]; security.sudo.extraConfig = '' diff --git a/lass/2configs/br.nix b/lass/2configs/br.nix index 6e0a2385c..273a9c963 100644 --- a/lass/2configs/br.nix +++ b/lass/2configs/br.nix @@ -46,4 +46,6 @@ with import ; ]; }; + users.users.mainUser.extraGroups = [ "scanner" "lp" ]; + } -- cgit v1.2.3 From 1aa9bdfd2c969dfdb4cac3b8f41e63f060f5ae78 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:52:54 +0200 Subject: l: add mainUser to pipewire group --- lass/2configs/baseX.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index d33b470bb..5ffa71b21 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -46,7 +46,7 @@ in { } ]; - users.users.mainUser.extraGroups = [ "audio" "video" ]; + users.users.mainUser.extraGroups = [ "audio" "pipewire" "video" ]; time.timeZone = "Europe/Berlin"; -- cgit v1.2.3 From 6e0aea50e9c470352773912d4c54f46fee106856 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:53:03 +0200 Subject: l: hub -> gh --- lass/2configs/baseX.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 5ffa71b21..9169248f0 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -64,7 +64,7 @@ in { font-size fzfmenu gimp - gitAndTools.hub + gitAndTools.gh git-crypt git-preview dconf -- cgit v1.2.3 From 5aca4dde6c47afa2c3f66e72833d3dbe5dac7d56 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:53:28 +0200 Subject: l: add vnc tools --- lass/2configs/baseX.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 9169248f0..e94cbbd2c 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -79,11 +79,13 @@ in { ponymix powertop rxvt_unicode-with-plugins + sshvnc sxiv taskwarrior termite transgui wirelesstools + x11vnc xclip xephyrify xorg.xhost -- cgit v1.2.3 From 58c0c20beb5bc395dcd304a403885d3a57249702 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:53:43 +0200 Subject: l bitcoin: remove stale user --- lass/2configs/bitcoin.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/bitcoin.nix b/lass/2configs/bitcoin.nix index de6562cbc..e9dd055f9 100644 --- a/lass/2configs/bitcoin.nix +++ b/lass/2configs/bitcoin.nix @@ -28,7 +28,6 @@ in { }; }; security.sudo.extraConfig = '' - ${mainUser.name} ALL=(bch) ALL ${mainUser.name} ALL=(bitcoin) ALL ${mainUser.name} ALL=(monero) ALL ''; -- cgit v1.2.3 From baa2732061e05945687486b64e7b2f50ecd84260 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:53:56 +0200 Subject: l bitlbee: disable telegram --- lass/2configs/bitlbee.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix index b84221155..84f06e587 100644 --- a/lass/2configs/bitlbee.nix +++ b/lass/2configs/bitlbee.nix @@ -11,7 +11,7 @@ with (import ); pkgs.bitlbee-discord ]; libpurple_plugins = [ - pkgs.telegram-purple + # pkgs.telegram-purple # pkgs.tdlib-purple # pkgs.purple-gowhatsapp ]; -- cgit v1.2.3 From ba16960e0601a4ad3e09cb118b7411abeab2853d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:54:55 +0200 Subject: l games: add user to pipewire group --- lass/2configs/games.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix index 829773b87..26707f1f0 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -61,7 +61,7 @@ in { name = "games"; description = "user playing games"; home = "/home/games"; - extraGroups = [ "audio" "video" "input" "loot" ]; + extraGroups = [ "audio" "video" "input" "loot" "pipewire" ]; createHome = true; useDefaultShell = true; packages = with pkgs; [ -- cgit v1.2.3 From ceafd8831f306aa0e80050a681c77b9f83d44ff1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:55:37 +0200 Subject: l git: allow kmein to fetch brain --- lass/2configs/git-brain.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/git-brain.nix b/lass/2configs/git-brain.nix index 1c6f92fcd..f4d1a27cd 100644 --- a/lass/2configs/git-brain.nix +++ b/lass/2configs/git-brain.nix @@ -28,7 +28,7 @@ let # TODO: get the list of all krebsministers - krebsminister = with config.krebs.users; [ makefu tv ]; + krebsminister = with config.krebs.users; [ makefu tv kmein ]; krebs-rules = repo: set-owners repo [ config.krebs.users.lass ] ++ set-ro-access repo krebsminister; -- cgit v1.2.3 From 2ce0a41c8d573bd5c2b06702fe90f82d6b5e8c17 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:58:17 +0200 Subject: l programs: add some tools --- lass/2configs/git.nix | 6 ------ lass/2configs/programs.nix | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 11 deletions(-) (limited to 'lass') diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index e6c77f64b..891aefcfd 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -122,12 +122,6 @@ let cgit.section = "configuration"; }; } // mapAttrs make-public-repo-silent { - nixos-aws = { - collaborators = [ { - name = "fabio"; - pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFst8DvnfOu4pQJYxcwdf//jWTvP+jj0iSrOdt59c9Gbujm/8K1mBXhcSQhHj/GBRC1Qc1wipf9qZsWnEHMI+SRwq6tDr8gqlAcdWmHAs1bU96jJtc8EgmUKbXTFG/VmympMPi4cEbNUtH93v6NUjQKwq9szvDhhqSW4Y8zE32xLkySwobQapNaUrGAtQp3eTxu5Lkx+cEaaartaAspt8wSosXjUHUJktg0O5/XOP+CiWAx89AXxbQCy4XTQvUExoRGdw9sdu0lF0/A0dF4lFF/dDUS7+avY8MrKEcQ8Fwk8NcW1XrKMmCdNdpvou0whL9aHCdTJ+522dsSB1zZWh63Si4CrLKlc1TiGKCXdvzmCYrD+6WxbPJdRpMM4dFNtpAwhCm/dM+CBXfDkP0s5veFiYvp1ri+3hUqV/sep9r5/+d+5/R1gQs8WDNjWqcshveFbD5LxE6APEySB4QByGxIrw7gFbozE+PNxtlVP7bq4MyE6yIzL6ofQgO1e4THquPcqSCfCvyib5M2Q1phi5DETlMemWp84AsNkqbhRa4BGRycuOXXrBzE+RgQokcIY7t3xcu3q0xJo2+HxW/Lqi72zYU1NdT4nJMETEaG49FfIAnUuoVaQWWvOz8mQuVEmmdw2Yzo2ikILYSUdHTp1VPOeo6aNPvESkPw1eM0xDRlQ== ada"; - } ]; - }; }; restricted-repos = mapAttrs make-restricted-repo ( diff --git a/lass/2configs/programs.nix b/lass/2configs/programs.nix index 0a4b4fd9b..0997b41a8 100644 --- a/lass/2configs/programs.nix +++ b/lass/2configs/programs.nix @@ -4,9 +4,11 @@ { environment.systemPackages = with pkgs; [ aria2 + generate-secrets gnupg1compat htop i3lock + l-gen-secrets mosh pass pavucontrol @@ -18,18 +20,41 @@ transmission wget xsel - youtube-dl + yt-dlp + (pkgs.writeDashBin "youtube-dl" '' + exec ${pkgs.yt-dlp}/bin/yt-dlp "$@" + '') (pkgs.writeDashBin "tether-on" '' adb shell svc usb setFunctions rndis '') (pkgs.writeDashBin "tether-off" '' adb shell svc usb setFunctions '') - (pkgs.writeDashBin "dl-movie" '' - ${pkgs.transmission}/bin/transmission-remote yellow.r -w /var/download/finished/sorted/movies -a "$@" + (pkgs.writeDashBin "deploy" '' + set -eu + export SYSTEM="$1" + $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy) + '') + (pkgs.writeDashBin "krebsco.de" '' + TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) + ${pkgs.brain}/bin/brain show krebs-secrets/ovh-secrets.json > "$TMPDIR"/ovh-secrets.json + OVH_ZONE_CONFIG="$TMPDIR"/ovh-secrets.json ${pkgs.krebszones}/bin/krebszones import + ${pkgs.coreutils}/bin/rm -rf "$TMPDIR" + '') + (pkgs.writeDashBin "lassul.us" '' + TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) + ${pkgs.pass}/bin/pass show admin/ovh/api.config > "$TMPDIR"/ovh-secrets.json + OVH_ZONE_CONFIG="$TMPDIR"/ovh-secrets.json ${pkgs.ovh-zone}/bin/ovh-zone import /etc/zones/lassul.us lassul.us + ${pkgs.coreutils}/bin/rm -rf "$TMPDIR" + '') + (pkgs.writeDashBin "btc-coinbase" '' + ${pkgs.curl}/bin/curl -Ss 'https://api.coinbase.com/v2/prices/spot?currency=EUR' | ${pkgs.jq}/bin/jq '.data.amount' + '') + (pkgs.writeDashBin "btc-wex" '' + ${pkgs.curl}/bin/curl -Ss 'https://wex.nz/api/3/ticker/btc_eur' | ${pkgs.jq}/bin/jq '.btc_eur.avg' '') - (pkgs.writeDashBin "dl-series" '' - ${pkgs.transmission}/bin/transmission-remote yellow.r -w /var/download/finished/sorted/series -a "$@" + (pkgs.writeDashBin "btc-kraken" '' + ${pkgs.curl}/bin/curl -Ss 'https://api.kraken.com/0/public/Ticker?pair=BTCEUR' | ${pkgs.jq}/bin/jq '.result.XXBTZEUR.a[0]' '') ]; } -- cgit v1.2.3 From 15bb16e2c8ffaede35108be0112cc0ecc1fed50b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:59:13 +0200 Subject: l home-media: use pipewire & fix autologin --- lass/2configs/home-media.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/2configs/home-media.nix b/lass/2configs/home-media.nix index 7e10aed34..f250ca8d8 100644 --- a/lass/2configs/home-media.nix +++ b/lass/2configs/home-media.nix @@ -4,10 +4,10 @@ with import ; users.users.media = { isNormalUser = true; uid = genid_uint31 "media"; - extraGroups = [ "video" "audio" ]; + extraGroups = [ "video" "audio" "pipewire" ]; }; - services.xserver.displayManager.lightdm.autoLogin = { + services.xserver.displayManager.autoLogin = { enable = true; user = "media"; }; -- cgit v1.2.3 From 6bf2ab873519532de7a744748777361dc65f8b7b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 19:59:56 +0200 Subject: l jitsi: more privacy --- lass/2configs/jitsi.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/2configs/jitsi.nix b/lass/2configs/jitsi.nix index 1435ccb5c..fa41f6634 100644 --- a/lass/2configs/jitsi.nix +++ b/lass/2configs/jitsi.nix @@ -7,10 +7,13 @@ config = { enableWelcomePage = true; requireDisplayName = true; + analytics.disabled = true; }; interfaceConfig = { SHOW_JITSI_WATERMARK = false; SHOW_WATERMARK_FOR_GUESTS = false; + DISABLE_PRESENCE_STATUS = true; + GENERATE_ROOMNAMES_ON_WELCOME_PAGE = false; }; }; -- cgit v1.2.3 From 0c30d6f1206eee5459cbb788ffe6f997dc951596 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:00:50 +0200 Subject: l p.krebsco.de: allow upload from internet --- lass/2configs/paste.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lass') diff --git a/lass/2configs/paste.nix b/lass/2configs/paste.nix index 68a55c71c..affc35307 100644 --- a/lass/2configs/paste.nix +++ b/lass/2configs/paste.nix @@ -57,10 +57,8 @@ with import ; addSSL = true; serverAliases = [ "p.krebsco.de" ]; locations."/".extraConfig = '' - if ($request_method != GET) { - return 403; - } proxy_set_header Host $host; + proxy_set_header X-Forwarded-Proto $scheme; proxy_pass http://127.0.0.1:${toString config.krebs.htgen.paste.port}; ''; locations."/image".extraConfig = '' -- cgit v1.2.3 From ab95169840f36bd6014de0d1ac6a3cd2f13fd6f0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:01:39 +0200 Subject: l realwallpaper: allow access to archive --- lass/2configs/realwallpaper.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass') diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index 0bae91d89..a82e1d010 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -22,6 +22,10 @@ in { hostname "${hostname}.r" ]; + locations."/realwallpaper/".extraConfig = '' + index on; + root /var/realwallpaper"; + ''; locations."/realwallpaper.png".extraConfig = '' root /var/realwallpaper/; ''; -- cgit v1.2.3 From b30e2377d13c05a080f244bf39e6f247eb07eec6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:05:19 +0200 Subject: l retiolum: disable autoconnect --- lass/2configs/retiolum.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix index d4d97a889..b8c9d4f8d 100644 --- a/lass/2configs/retiolum.nix +++ b/lass/2configs/retiolum.nix @@ -21,6 +21,7 @@ "eve" ]; extraConfig = '' + AutoConnect = no StrictSubnets = yes ${lib.optionalString (config.krebs.build.host.nets.retiolum.via != null) '' LocalDiscovery = no -- cgit v1.2.3 From 0be35f266f8b7929be4e4250bbe90a3a1f1bd24d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:05:42 +0200 Subject: l ssh-cryptsetup: add correct key --- lass/2configs/ssh-cryptsetup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/ssh-cryptsetup.nix b/lass/2configs/ssh-cryptsetup.nix index f08f85b49..0126c33b2 100644 --- a/lass/2configs/ssh-cryptsetup.nix +++ b/lass/2configs/ssh-cryptsetup.nix @@ -6,7 +6,7 @@ ssh = { enable = true; authorizedKeys = with config.krebs.users; [ - config.krebs.users.lass-mors.pubkey + config.krebs.users.lass.pubkey config.krebs.users.lass-blue.pubkey ]; }; -- cgit v1.2.3 From d183d5e795fdf5e703978127f6a9148f678d6b47 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:06:11 +0200 Subject: l sync: permown -> acl --- lass/2configs/sync/decsync.nix | 9 ++++----- lass/2configs/sync/sync.nix | 11 +++-------- lass/2configs/sync/weechat.nix | 8 +++----- 3 files changed, 10 insertions(+), 18 deletions(-) (limited to 'lass') diff --git a/lass/2configs/sync/decsync.nix b/lass/2configs/sync/decsync.nix index a38cff8d6..5fded10a2 100644 --- a/lass/2configs/sync/decsync.nix +++ b/lass/2configs/sync/decsync.nix @@ -3,9 +3,8 @@ path = "/home/lass/decsync"; devices = [ "mors" "blue" "green" "phone" ]; }; - krebs.permown."/home/lass/decsync" = { - owner = "lass"; - group = "syncthing"; - umask = "0007"; - }; + + krebs.acl."/home/lass/decsync"."u:syncthing:X".parents = true; + krebs.acl."/home/lass/decsync"."u:syncthing:rwX" = {}; + krebs.acl."/home/lass/decsync"."u:lass:rwX" = {}; } diff --git a/lass/2configs/sync/sync.nix b/lass/2configs/sync/sync.nix index a0927c199..2714fa83e 100644 --- a/lass/2configs/sync/sync.nix +++ b/lass/2configs/sync/sync.nix @@ -2,12 +2,7 @@ services.syncthing.folders."/home/lass/sync" = { devices = [ "mors" "icarus" "xerxes" "shodan" "green" "blue" "coaxmetal" ]; }; - krebs.permown."/home/lass/sync" = { - file-mode = "u+rw,g+rw"; - owner = "lass"; - group = "syncthing"; - umask = "0002"; - keepGoing = true; - }; + krebs.acl."/home/lass/sync"."u:syncthing:X".parents = true; + krebs.acl."/home/lass/sync"."u:syncthing:rwX" = {}; + krebs.acl."/home/lass/sync"."u:lass:rwX" = {}; } - diff --git a/lass/2configs/sync/weechat.nix b/lass/2configs/sync/weechat.nix index eb6b0aa16..b32015b84 100644 --- a/lass/2configs/sync/weechat.nix +++ b/lass/2configs/sync/weechat.nix @@ -1,8 +1,6 @@ { services.syncthing.folders."/home/lass/.weechat".devices = [ "green" "mors" ]; - krebs.permown."/home/lass/.weechat" = { - owner = "lass"; - group = "syncthing"; - umask = "0007"; - }; + krebs.acl."/home/lass/.weechat"."u:syncthing:X".parents = true; + krebs.acl."/home/lass/.weechat"."u:syncthing:rwX" = {}; + krebs.acl."/home/lass/.weechat"."u:lass:rwX" = {}; } -- cgit v1.2.3 From 221c4b88d0d0044b946c840b6c1f7ca5f108fabd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:06:33 +0200 Subject: l themes: make sure /var/theme/config exist --- lass/2configs/themes.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/themes.nix b/lass/2configs/themes.nix index e020c62c4..eb1a53987 100644 --- a/lass/2configs/themes.nix +++ b/lass/2configs/themes.nix @@ -9,6 +9,7 @@ ${placeholder "out"}/bin/switch-theme dark fi elif test -e "/etc/themes/$1"; then + ${pkgs.coreutils}/bin/mkdir -p /var/theme/config ${pkgs.rsync}/bin/rsync --chown=lass:users -a --delete "/etc/themes/$1/" /var/theme/config/ echo "$1" > /var/theme/current_theme ${pkgs.coreutils}/bin/chown lass:users /var/theme/current_theme -- cgit v1.2.3 From a39775651d02bf06d6cf9b8ecc8b1c636f3318e9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:07:03 +0200 Subject: l minecraft: remove erronous port --- lass/2configs/minecraft.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/minecraft.nix b/lass/2configs/minecraft.nix index d2a3672c5..34da3047e 100644 --- a/lass/2configs/minecraft.nix +++ b/lass/2configs/minecraft.nix @@ -11,6 +11,5 @@ in { krebs.iptables.tables.filter.INPUT.rules = [ { predicate = "-p tcp --dport 25565"; target = "ACCEPT"; } { predicate = "-p udp --dport 25565"; target = "ACCEPT"; } - { predicate = "-p tcp --dport 8123"; target = "ACCEPT"; } ]; } -- cgit v1.2.3 From b5d1514ca0e00275f0feeb2a7f69abc043fc4de9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:08:10 +0200 Subject: l vim: use vim-dim colorscheme --- lass/2configs/vim.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 36ce3d74c..4a748b1e2 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -51,7 +51,7 @@ let filetype plugin indent on set t_Co=256 - colorscheme hack + colorscheme dim syntax on au Syntax * syn match Garbage containedin=ALL /\s\+$/ @@ -170,6 +170,15 @@ let hi diffRemoved ctermfg=009 ''; }))) + (pkgs.vimUtils.buildVimPlugin { + name = "vim-dim-1.1.0"; + src = pkgs.fetchFromGitHub { + owner = "jeffkreeftmeijer"; + repo = "vim-dim"; + rev = "1.1.0"; + sha256 = "sha256-lyTZUgqUEEJRrzGo1FD8/t8KBioPrtB3MmGvPeEVI/g="; + }; + }) ((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let name = "vim"; in { -- cgit v1.2.3 From 2a5c6c2e53d4dc945ec1c7b23510803da0669c22 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:08:21 +0200 Subject: l vim: use fancy listchars --- lass/2configs/vim.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 4a748b1e2..49acabbe5 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -21,6 +21,7 @@ let set backup set backupdir=${dirs.backupdir}/ set directory=${dirs.swapdir}// + set list listchars=tab:⇥\ ,extends:❯,precedes:❮,nbsp:␣,trail:· showbreak=¬ set hlsearch set incsearch set ttymouse=sgr -- cgit v1.2.3 From c2e75dfff1541fedfde2c6174b09333cd502a218 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:08:35 +0200 Subject: l vim: use fzf tools --- lass/2configs/vim.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lass') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 49acabbe5..a5860caa4 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -115,10 +115,17 @@ let " copy/paste from/to xclipboard set clipboard=unnamedplus + + " use fzf to switch files + nnoremap :FZF + nnoremap :Rg + let g:fzf_layout = { 'down': '~15%' } ''; extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [ pkgs.vimPlugins.undotree + pkgs.vimPlugins.fzf-vim + pkgs.vimPlugins.fzfWrapper (pkgs.vimUtils.buildVimPlugin { name = "file-line-1.0"; src = pkgs.fetchFromGitHub { -- cgit v1.2.3 From f8892771c4740802ae1b9cc88e7836e5ac82b3e0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:08:50 +0200 Subject: l vim: remove legacy hack colorscheme --- lass/2configs/vim.nix | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'lass') diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index a5860caa4..210133f48 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -135,49 +135,6 @@ let sha256 = "0z47zq9rqh06ny0q8lpcdsraf3lyzn9xvb59nywnarf3nxrk6hx0"; }; }) - ((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let - name = "hack"; - in { - name = "vim-color-${name}-1.0.2"; - destination = "/colors/${name}.vim"; - text = /* vim */ '' - set background=dark - hi clear - if exists("syntax_on") - syntax clear - endif - - let colors_name = ${toJSON name} - - hi Normal ctermbg=016 - hi Comment ctermfg=255 - hi Constant ctermfg=229 - hi Identifier ctermfg=123 - hi Function ctermfg=041 - hi Statement ctermfg=167 - hi PreProc ctermfg=167 - hi Type ctermfg=046 - hi Delimiter ctermfg=251 - hi Special ctermfg=146 - - hi Garbage ctermbg=124 - hi TabStop ctermbg=020 - hi NBSP ctermbg=056 - hi NarrowNBSP ctermbg=097 - hi Todo ctermfg=174 ctermbg=NONE - - hi NixCode ctermfg=190 - hi NixData ctermfg=149 - hi NixQuote ctermfg=119 - - hi diffNewFile ctermfg=207 - hi diffFile ctermfg=207 - hi diffLine ctermfg=207 - hi diffSubname ctermfg=207 - hi diffAdded ctermfg=010 - hi diffRemoved ctermfg=009 - ''; - }))) (pkgs.vimUtils.buildVimPlugin { name = "vim-dim-1.1.0"; src = pkgs.fetchFromGitHub { -- cgit v1.2.3 From aae34277aff7d15fc5d74df8a80f4c3ad42d1535 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:09:57 +0200 Subject: l domsen: add more webistes/accounts --- lass/2configs/websites/domsen.nix | 54 +++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 14 deletions(-) (limited to 'lass') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 3f055e370..93d3c91ee 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -29,6 +29,8 @@ in { (servePage [ "apanowicz.de" "www.apanowicz.de" ]) (servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ]) (servePage [ "illustra.de" "www.illustra.de" ]) + (servePage [ "nirwanabluete.de" "www.nirwanabluete.de" ]) + (servePage [ "familienrat-hamburg.de" "www.familienrat-hamburg.de" ]) (servePage [ "freemonkey.art" "www.freemonkey.art" @@ -36,20 +38,20 @@ in { (serveOwncloud [ "o.ubikmedia.de" ]) (serveWordpress [ "ubikmedia.de" - "nirwanabluete.de" "ubikmedia.eu" "youthtube.xyz" "joemisch.com" "weirdwednesday.de" "jarugadesign.de" + "beesmooth.ch" - "www.nirwanabluete.de" "www.ubikmedia.eu" "www.youthtube.xyz" "www.ubikmedia.de" "www.joemisch.com" "www.weirdwednesday.de" "www.jarugadesign.de" + "www.beesmooth.ch" "aldona2.ubikmedia.de" "cinevita.ubikmedia.de" @@ -64,9 +66,13 @@ in { "jarugadesign.ubikmedia.de" "crypto4art.ubikmedia.de" "jarugadesign.ubikmedia.de" + "beesmooth.ubikmedia.de" ]) ]; + # https://github.com/nextcloud/server/issues/25436 + services.mysql.settings.mysqld.innodb_read_only_compressed = 0; + services.mysql.ensureDatabases = [ "ubikmedia_de" "o_ubikmedia_de" ]; services.mysql.ensureUsers = [ { ensurePermissions = { "ubikmedia_de.*" = "ALL"; }; name = "nginx"; } @@ -159,6 +165,7 @@ in { { from = "ubik@ubikmedia.eu"; to = "domsen, jms, ms"; } { from = "kontakt@alewis.de"; to ="klabusterbeere"; } { from = "hallo@jarugadesign.de"; to ="kasia"; } + { from = "noreply@beeshmooth.ch"; to ="besmooth@gmx.ch"; } { from = "testuser@lassul.us"; to = "testuser"; } { from = "testuser@ubikmedia.eu"; to = "testuser"; } @@ -170,10 +177,12 @@ in { "apanowicz.de" "alewis.de" "jarugadesign.de" + "beesmooth.ch" ]; dkim = [ { domain = "ubikmedia.eu"; } { domain = "apanowicz.de"; } + { domain = "beesmooth.ch"; } ]; ssl_cert = "/var/lib/acme/lassul.us/fullchain.pem"; ssl_key = "/var/lib/acme/lassul.us/key.pem"; @@ -332,6 +341,27 @@ in { isNormalUser = true; }; + users.users.avada = { + uid = genid_uint31 "avada"; + home = "/home/avada"; + useDefaultShell = true; + createHome = true; + isNormalUser = true; + }; + + users.users.familienrat = { + uid = genid_uint31 "familienrat"; + home = "/home/familienrat"; + useDefaultShell = true; + createHome = true; + isNormalUser = true; + }; + krebs.acl."/srv/http/familienrat-hamburg.de"."u:familienrat:rwX" = {}; + krebs.acl."/srv/http"."u:familienrat:X" = { + default = false; + recursive = false; + }; + users.groups.xanf = {}; krebs.on-failure.plans.restic-backups-domsen = { @@ -372,18 +402,14 @@ in { ${pkgs.coreutils}/bin/chmod 750 /backups ''; - krebs.permown = { - "/srv/http" = { - group = "syncthing"; - owner = "nginx"; - umask = "0007"; - }; - "/home/xanf/XANF_TEAM" = { - owner = "XANF_TEAM"; - group = "xanf"; - umask = "0007"; - }; + # takes too long!! + # krebs.acl."/srv/http"."u:syncthing:rwX" = {}; + # krebs.acl."/srv/http"."u:nginx:rwX" = {}; + # krebs.acl."/srv/http/ubikmedia.de"."u:avada:rwX" = {}; + krebs.acl."/home/xanf/XANF_TEAM"."g:xanf:rwX" = {}; + krebs.acl."/home/xanf"."g:xanf:X" = { + default = false; + recursive = false; }; - } -- cgit v1.2.3 From 88fac070e231ad9b5c57cd96dc8322c30b9c3318 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:11:20 +0200 Subject: l lassul.us: remove legacy tinc-graphs --- lass/2configs/websites/lassulus.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'lass') diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 5bf8de013..7de993514 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -20,8 +20,6 @@ in { }; }; - krebs.tinc_graphs.enable = true; - users.groups.lasscert.members = [ "dovecot2" "ejabberd" @@ -48,10 +46,6 @@ in { locations."= /wireguard-key".extraConfig = '' alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey}; ''; - locations."/tinc/".extraConfig = '' - index index.html; - alias ${config.krebs.tinc_graphs.workingDir}/external/; - ''; locations."= /krebspage".extraConfig = '' default_type "text/html"; alias ${pkgs.krebspage}/index.html; -- cgit v1.2.3 From fd58fdb28ca6c577b6a5dda86dc6318f360169e2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:11:35 +0200 Subject: l lassul.us: remove deprecated users --- lass/2configs/websites/lassulus.nix | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'lass') diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 7de993514..86a55c225 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -22,7 +22,6 @@ in { users.groups.lasscert.members = [ "dovecot2" - "ejabberd" "exim" "nginx" ]; @@ -84,19 +83,5 @@ in { root /var/lib/acme/acme-challenge; ''; }; - - users.users.blog = { - uid = genid_uint31 "blog"; - group = "nginx"; - description = "lassul.us blog deployment"; - home = "/srv/http/lassul.us"; - useDefaultShell = true; - createHome = true; - isSystemUser = true; - openssh.authorizedKeys.keys = with config.krebs.users; [ - lass.pubkey - lass-mors.pubkey - ]; - }; } -- cgit v1.2.3 From 45073efe87fc0561819db645c509e60c3d3fd213 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:12:12 +0200 Subject: l lassul.us: simplify pubkey locations --- lass/2configs/websites/lassulus.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lass') diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 86a55c225..2ff98f38d 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -57,14 +57,14 @@ in { alias ${initscript}/bin/init; ''; locations."= /blue.pub".extraConfig = '' - alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey}; + alias ${pkgs.writeText "pub" config.krebs.users.lass-blue.pubkey}; ''; - locations."= /mors.pub".extraConfig = '' - alias ${pkgs.writeText "pub" config.krebs.users.lass-mors.pubkey}; - ''; - locations."= /yubi.pub".extraConfig = '' + locations."= /ssh.pub".extraConfig = '' alias ${pkgs.writeText "pub" config.krebs.users.lass-yubikey.pubkey}; ''; + locations."= /gpg.pub".extraConfig = '' + alias ${pkgs.writeText "pub" config.krebs.users.lass-yubikey.pgp.pubkeys.default}; + ''; }; security.acme.certs."cgit.lassul.us" = { -- cgit v1.2.3 From b663d3c5977d2482f97babb74ade8edf15f11b53 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:12:38 +0200 Subject: l: add ref.ptkk.de --- lass/2configs/websites/lassulus.nix | 1 + lass/2configs/websites/ref.ptkk.de/default.nix | 89 ++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 lass/2configs/websites/ref.ptkk.de/default.nix (limited to 'lass') diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 2ff98f38d..411234b82 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -10,6 +10,7 @@ in { imports = [ ./default.nix ../git.nix + ./ref.ptkk.de ]; security.acme = { diff --git a/lass/2configs/websites/ref.ptkk.de/default.nix b/lass/2configs/websites/ref.ptkk.de/default.nix new file mode 100644 index 000000000..14ce58b8e --- /dev/null +++ b/lass/2configs/websites/ref.ptkk.de/default.nix @@ -0,0 +1,89 @@ +{ config, lib, pkgs, ... }: +{ + services.nginx.virtualHosts."ref.ptkk.de" = { + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:4626"; + extraConfig = '' + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Port $server_port; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Upgrade $http_upgrade; + proxy_cache_bypass $http_upgrade; + ''; + }; + locations."/static/" = { + alias = "/var/lib/ref.ptkk.de/static/"; + }; + forceSSL = true; + }; + systemd.services."ref.ptkk.de" = { + wantedBy = [ "multi-user.target" ]; + environment = { + PRODUCTION = "yip"; + DATA_DIR = "/var/lib/ref.ptkk.de/data"; + PORT = "4626"; + STATIC_ROOT = "/var/lib/ref.ptkk.de/static"; + }; + path = with pkgs; [ + git + gnutar + gzip + nix + ]; + serviceConfig = { + ExecStartPre = [ + "${pkgs.coreutils}/bin/mkdir -p /var/lib/ref.ptkk.de/data" + "${pkgs.coreutils}/bin/mkdir -p /var/lib/ref.ptkk.de/code" + "${pkgs.coreutils}/bin/mkdir -p /var/lib/ref.ptkk.de/static" + ]; + ExecStart = pkgs.writers.writeDash "nixify" '' + cd code + if test -e shell.nix; then + ${pkgs.nix}/bin/nix-shell -I /var/src --run serve + else + echo 'no shell.nix, bailing out' + exit 0 + fi + ''; + LoadCredential = [ + "django-secret.key:${toString }/ref.ptkk.de-django.key" + ]; + User = "ref.ptkk.de"; + WorkingDirectory = "/var/lib/ref.ptkk.de"; + StateDirectory = "ref.ptkk.de"; + Restart = "always"; + RestartSec = "100s"; + }; + }; + systemd.services."ref.ptkk.de-restarter" = { + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.systemd}/bin/systemctl restart ref.ptkk.de.service"; + }; + }; + systemd.paths."ref.ptkk.de-restarter" = { + wantedBy = [ "multi-user.target" ]; + pathConfig.PathChanged = [ + "/var/lib/ref.ptkk.de/code" + "/var/src/nixpkgs" + ]; + }; + + users.users."ref.ptkk.de" = { + isSystemUser = true; + uid = pkgs.stockholm.lib.genid_uint31 "ref.ptkk.de"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF6fu6LtyRdk++qIBpP0BdZQHSTqzNNlvp7ML2Dv0IxD CI@github.com" + config.krebs.users.lass.pubkey + ]; + group = "nginx"; + home = "/var/lib/ref.ptkk.de"; + useDefaultShell = true; + }; +} -- cgit v1.2.3 From 1bf8ca72402124875b44d9745be03408dacf5b15 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:13:15 +0200 Subject: l owncloud: use php74 --- lass/2configs/websites/util.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix index b6765037c..22b1669b0 100644 --- a/lass/2configs/websites/util.nix +++ b/lass/2configs/websites/util.nix @@ -174,6 +174,7 @@ rec { services.phpfpm.pools."${domain}" = { user = "nginx"; group = "nginx"; + phpPackage = pkgs.php74; extraConfig = '' listen = /srv/http/${domain}/phpfpm.pool pm = dynamic -- cgit v1.2.3 From 85db8852793af6a2d20d281aec768597b027a619 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:13:53 +0200 Subject: l wiregrill: allow retiolum <-> wiregrill --- lass/2configs/wiregrill.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lass') diff --git a/lass/2configs/wiregrill.nix b/lass/2configs/wiregrill.nix index 0183bd4e5..54257d2c4 100644 --- a/lass/2configs/wiregrill.nix +++ b/lass/2configs/wiregrill.nix @@ -18,6 +18,10 @@ in mkIf (hasAttr "wiregrill" config.krebs.build.host.nets) { ]; krebs.iptables.tables.filter.FORWARD.rules = mkIf isRouter [ { precedence = 1000; predicate = "-i wiregrill -o wiregrill"; target = "ACCEPT"; } + { precedence = 1000; predicate = "-i wiregrill -o retiolum"; target = "ACCEPT"; } + { precedence = 1000; predicate = "-i retiolum -o wiregrill"; target = "ACCEPT"; } + { precedence = 1000; predicate = "-i wiregrill -o eth0"; target = "ACCEPT"; } + { precedence = 1000; predicate = "-o wiregrill -m conntrack --ctstate RELATED,ESTABLISHED"; target = "ACCEPT"; } ]; networking.wireguard.interfaces.wiregrill = { -- cgit v1.2.3 From 5f4a5b5cebdab25afd17344b77d4db765eb94b87 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:14:48 +0200 Subject: l yubikey: simplify debug logging --- lass/2configs/yubikey.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/yubikey.nix b/lass/2configs/yubikey.nix index d92b18f81..a37752d5e 100644 --- a/lass/2configs/yubikey.nix +++ b/lass/2configs/yubikey.nix @@ -38,7 +38,7 @@ } }); polkit.addRule(function(action, subject) { - polkit.log("user " + subject.user + " is attempting action " + action.id + " from PID " + subject.pid); + polkit.log("subject: " + subject + " action: " + action); }); ''; -- cgit v1.2.3 From bb87f90e4654dd537c55b34bb861b7f6f5a3e53d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:20:24 +0200 Subject: l dummy-secrets: add ssh-tor.priv --- lass/2configs/tests/dummy-secrets/ssh-tor.priv | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lass/2configs/tests/dummy-secrets/ssh-tor.priv (limited to 'lass') diff --git a/lass/2configs/tests/dummy-secrets/ssh-tor.priv b/lass/2configs/tests/dummy-secrets/ssh-tor.priv new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3 From ae682ccd343d9992245b489404031d4472fd3f24 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:30:44 +0200 Subject: l sshvnc: init --- lass/5pkgs/sshvnc/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lass/5pkgs/sshvnc/default.nix (limited to 'lass') diff --git a/lass/5pkgs/sshvnc/default.nix b/lass/5pkgs/sshvnc/default.nix new file mode 100644 index 000000000..f66ed1b0d --- /dev/null +++ b/lass/5pkgs/sshvnc/default.nix @@ -0,0 +1,11 @@ +{ pkgs }: +pkgs.writers.writeBashBin "sshvnc" '' + set -xm + + RANDOM_HIGH_PORT=$(shuf -i 20000-65000 -n 1) + ssh "$@" -f -L $RANDOM_HIGH_PORT:localhost:$RANDOM_HIGH_PORT -- x11vnc -noxdamage -noxfixes -noxrecord -display :0 -localhost -rfbport $RANDOM_HIGH_PORT + + sleep 3 + + _JAVA_AWT_WM_NONREPARENTING=1 ${pkgs.turbovnc}/bin/vncviewer localhost:$RANDOM_HIGH_PORT +'' -- cgit v1.2.3 From 3c639981877c9b9f622485c5fb59b69d6e163199 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:57:07 +0200 Subject: l blue: remove pkgs.ag --- lass/2configs/blue.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix index 28c7d640d..2698f67e0 100644 --- a/lass/2configs/blue.nix +++ b/lass/2configs/blue.nix @@ -8,7 +8,6 @@ with (import ); ]; environment.systemPackages = with pkgs; [ - ag dic nmap git-preview -- cgit v1.2.3 From aa5688dfd85512bc46159ac64f6f57d987d86802 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 20:57:52 +0200 Subject: l daedalus.r: skype -> skypeforlinux --- lass/1systems/daedalus/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index b08919802..0ca21fcd7 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -43,7 +43,7 @@ with import ; libreoffice audacity zathura - skype + skypeforlinux wine geeqie vlc -- cgit v1.2.3 From 560b925e47faa283a13f63b096b66f6f8beeb754 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 21:06:43 +0200 Subject: l lasspi.r: remove extlinux-compat --- lass/1systems/lasspi/physical.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/lasspi/physical.nix b/lass/1systems/lasspi/physical.nix index 80c459a95..868bafad5 100644 --- a/lass/1systems/lasspi/physical.nix +++ b/lass/1systems/lasspi/physical.nix @@ -25,7 +25,6 @@ version = 4; }; boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; # Required for the Wireless firmware hardware.enableRedistributableFirmware = true; -- cgit v1.2.3 From 4a9f93e8933d87ce8f04965b2772564527f1e2fd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 21:16:29 +0200 Subject: l domsen: nextcloud 21 -> 23 --- lass/2configs/websites/domsen.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 93d3c91ee..fe4d78a3b 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -104,7 +104,7 @@ in { services.nextcloud = { enable = true; hostName = "o.xanf.org"; - package = pkgs.nextcloud21; + package = pkgs.nextcloud23; config = { adminpassFile = "/run/nextcloud.pw"; overwriteProtocol = "https"; -- cgit v1.2.3 From dfb6cce357c5332e62a39b41e4b30ac2b22b7c07 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 21:46:58 +0200 Subject: l news: vorbisTools -> vorbis-tools --- lass/2configs/radio/news.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index 27b124093..aa10ea291 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -27,7 +27,7 @@ let ''; send_to_radio = pkgs.writers.writeDashBin "send_to_radio" '' - ${pkgs.vorbisTools}/bin/oggenc - | + ${pkgs.vorbis-tools}/bin/oggenc - | ${pkgs.libshout}/bin/shout --format ogg --host localhost --port 1338 --mount /live ''; -- cgit v1.2.3 From ff8dd92d1f3880d82ff699d3ba476929e3f4e885 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 21:53:08 +0200 Subject: l xerxes.r: keep original xboxdrv patches --- lass/1systems/xerxes/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/1systems/xerxes/config.nix b/lass/1systems/xerxes/config.nix index bf818a9b2..6972567d7 100644 --- a/lass/1systems/xerxes/config.nix +++ b/lass/1systems/xerxes/config.nix @@ -47,7 +47,7 @@ wantedBy = [ "multi-user.target" ]; script = '' ${pkgs.xboxdrv.overrideAttrs(o: { - patches = [ (pkgs.fetchurl { + patches = o.patches ++ [ (pkgs.fetchurl { url = "https://patch-diff.githubusercontent.com/raw/xboxdrv/xboxdrv/pull/251.patch"; sha256 = "17784y20mxqrlhgvwvszh8lprxrvgmb7ah9dknmbhj5jhkjl8wq5"; }) ]; -- cgit v1.2.3 From a4ebb2d7f469f58d924bbdfa7f83848a2b790fdd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 May 2022 21:55:52 +0200 Subject: l daedalus.r: remove krebs.per-user --- lass/1systems/daedalus/config.nix | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'lass') diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 0ca21fcd7..d6943c110 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -56,22 +56,32 @@ with import ; services.xserver.layout = "de"; } { - krebs.per-user.bitcoin.packages = [ - pkgs.electrum - pkgs.electron-cash - pkgs.litecoin - ]; - users.extraUsers = { - bitcoin = { - name = "bitcoin"; - description = "user for bitcoin stuff"; - home = "/home/bitcoin"; - isNormalUser = true; - useDefaultShell = true; - createHome = true; - extraGroups = [ "audio" ]; + users = { + groups.plugdev = {}; + users = { + bitcoin = { + name = "bitcoin"; + description = "user for bitcoin stuff"; + home = "/home/bitcoin"; + isNormalUser = true; + useDefaultShell = true; + createHome = true; + extraGroups = [ + "audio" + "networkmanager" + "plugdev" + ]; + packages = let + unstable = import { config.allowUnfree = true; }; + in [ + pkgs.electrum + pkgs.electron-cash + unstable.ledger-live-desktop + ]; + }; }; }; + hardware.ledger.enable = true; security.sudo.extraConfig = '' bubsy ALL=(bitcoin) NOPASSWD: ALL ''; -- cgit v1.2.3 From 885a068ad4a0e647cee527aabd39953ad3e238b2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 6 Jun 2022 12:55:04 +0200 Subject: l radio: set opus bitrate to 96 kbps --- lass/2configs/radio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix index 0611be7ce..601ef74dd 100644 --- a/lass/2configs/radio/default.nix +++ b/lass/2configs/radio/default.nix @@ -165,14 +165,14 @@ in { output.icecast(mount = '/music.ogg', password = 'hackme', %vorbis(quality = 1), source) output.icecast(mount = '/music.mp3', password = 'hackme', %mp3.vbr(), source) - output.icecast(mount = '/music.opus', password = 'hackme', %opus(bitrate = 64), source) + output.icecast(mount = '/music.opus', password = 'hackme', %opus(bitrate = 96), source) extra_input = audio_to_stereo(input.harbor("live", port=1338)) o = smooth_add(normal = source, special = extra_input) output.icecast(mount = '/radio.ogg', password = 'hackme', %vorbis(quality = 1), o) output.icecast(mount = '/radio.mp3', password = 'hackme', %mp3.vbr(), o) - output.icecast(mount = '/radio.opus', password = 'hackme', %opus(bitrate = 64), o) + output.icecast(mount = '/radio.opus', password = 'hackme', %opus(bitrate = 96), o) ''; services.icecast = { enable = true; -- cgit v1.2.3 From 2bb08f9cef428b7e7ac9864eea30a74984aea693 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 6 Jun 2022 12:55:34 +0200 Subject: l radio: add probability of precipitation --- lass/2configs/radio/news.nix | 1 + lass/2configs/radio/weather_for_ips.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'lass') diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index aa10ea291..99b58511d 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -2,6 +2,7 @@ let weather_for_ips = pkgs.writers.writePython3Bin "weather_for_ips" { libraries = [ pkgs.python3Packages.geoip2 ]; + flakeIgnore = [ "E501" ]; } ./weather_for_ips.py; weather_report = pkgs.writers.writeDashBin "weather_report" '' diff --git a/lass/2configs/radio/weather_for_ips.py b/lass/2configs/radio/weather_for_ips.py index 8d9a2e7bc..213e69d3e 100644 --- a/lass/2configs/radio/weather_for_ips.py +++ b/lass/2configs/radio/weather_for_ips.py @@ -21,13 +21,13 @@ for ip in fileinput.input(): f'&units=metric' ) resp = requests.get(url) - weather = json.loads(resp.text)['current'] + weather = json.loads(resp.text) output.append( - f'Weather report for {location.city.name}' - f', {location.country.name}. ' - f'Currently it is {weather["weather"][0]["description"]} outside ' - f'with a temperature of {weather["temp"]} degrees ' - f'and a windspeed of {weather["wind_speed"]} meter per second. ' + f'Weather report for {location.city.name}, {location.country.name}. ' + f'Currently it is {weather["current"]["weather"][0]["description"]} outside ' + f'with a temperature of {weather["current"]["temp"]} de