From 211ddfd2685808723fac0a7e8d1b45dd110db953 Mon Sep 17 00:00:00 2001 From: kat witch Date: Sun, 14 Mar 2021 02:50:52 +0000 Subject: [PATCH] To-do move, org -> taskwarrior --- config/hosts/athame/configuration.nix | 4 +- config/hosts/athame/taskserver.nix | 8 +++ config/profiles/kat/home/default.nix | 2 + todo.org | 79 --------------------------- 4 files changed, 13 insertions(+), 80 deletions(-) create mode 100644 config/hosts/athame/taskserver.nix delete mode 100644 todo.org diff --git a/config/hosts/athame/configuration.nix b/config/hosts/athame/configuration.nix index 37a0a27f..a32a5eeb 100644 --- a/config/hosts/athame/configuration.nix +++ b/config/hosts/athame/configuration.nix @@ -17,6 +17,7 @@ ./syncplay.nix ./nextcloud.nix ./bitwarden.nix + ./taskserver.nix # comms ./murmur.nix ./znc.nix @@ -39,7 +40,8 @@ interfaces.enp1s0.useDHCP = true; }; - networking.firewall.allowedTCPPorts = [ 80 443 5160 5060 8999 64738 ]; + networking.firewall.allowedTCPPorts = + [ 80 443 5160 5060 8999 64738 1935 53589 ]; networking.firewall.allowedUDPPorts = [ 5160 5060 64738 ]; networking.firewall.allowedTCPPortRanges = [{ from = 10000; diff --git a/config/hosts/athame/taskserver.nix b/config/hosts/athame/taskserver.nix new file mode 100644 index 00000000..f5a3889d --- /dev/null +++ b/config/hosts/athame/taskserver.nix @@ -0,0 +1,8 @@ +{ config, lib, ... }: + +{ + services.taskserver.enable = true; + services.taskserver.fqdn = "kittywit.ch"; + services.taskserver.listenHost = "::"; + services.taskserver.organisations.kittywitch.users = [ "kat" ]; +} diff --git a/config/profiles/kat/home/default.nix b/config/profiles/kat/home/default.nix index 1ecdffba..07355fe3 100644 --- a/config/profiles/kat/home/default.nix +++ b/config/profiles/kat/home/default.nix @@ -6,6 +6,8 @@ ./vim ./git.nix ./tmux.nix + ./secrets.nix + ./xdg.nix ./ssh.nix ./packages.nix ]; # ./emacs bye emacs lol diff --git a/todo.org b/todo.org deleted file mode 100644 index 0f393cf7..00000000 --- a/todo.org +++ /dev/null @@ -1,79 +0,0 @@ -* Tasks -** TODO Move virtual machine config into nixfiles -virsh edit win10-3, steal the XML, make a service, ... -https://nixos.wiki/wiki/Virtualization_in_NixOS#Okay.2C_Okay.2C_I.27ll_Do_It_Myself - -** TODO Add dork.dev to mailserver -Don't want to pay for fastmail. - -** TODO MPV home-manager module rebind scrollwheel - -** TODO Migrate non-PGSQL services to PGSQL -bitwarden-rs, Gitea, ... - -** TODO Maybe restructure services away from hosts. -See PBB structure for services/. -https://git.petabyte.dev/petabyteboy/nixfiles/src/branch/main/services/ - -** TODO Gitea theme + resources overwrite -See PBB/milan gitea. -https://git.petabyte.dev/petabyteboy/nixfiles/src/branch/main/services/gitea/default.nix - -** TODO Move network config away from network manager. -network.wireless is good enough. nm-applet doesn't work on Sway anyway. - -** TODO Nixfiles working outside of NixOS, e.g. Fedora + macOS -Investigate build module for these systems. See: Investigate nix-darwin. - -** TODO Refactor Sway config for separate input/outputs on different systems -Each gui host should have their own sway config. - -** TODO Refactor waybar config for separate modules on different systems -Each gui host should have their own waybar config. - -** TODO Refactor Sway config for separate wallpapers on different systems as a result of the prior outputs change -Each gui host should have their own sway config. - -** TODO Fix function parameter headers -Too many excess unneccessary parameters. - -** TODO Syncplay server -Need to do SSL properly. Also set up salt + room passwords. - - -* Refactor - -** TODO Move to arc's weechat module. -https://github.com/arcnmx/nixexprs/blob/f3f24ef4226a8ff3531d9a3e005c4993ed0d7ba2/modules/home/weechat.nix - -** TODO Refactor secrets usage into private host configs. - -** TODO Move ZNC config into etc, out of store. - -* Research - -** TODO Investigate nix-darwin -Mostly differences for deployment. Set up a macOS VM. .-. - -** TODO Investigate pipewire -Viable yet on NixOS? Probably not on 20.09 itself, but maybe... - -** TODO Investigate ncmpcpp -Need to build a music collection. - -** TODO Investigate further vimode stuff -Weechat, certainly. Fish vimode enabled. - -** TODO Crawl more nixfiles for new things / workflows -arc, milan, ... - -** TODO Investigate audio source switching (Arctis 5, integrated front, integrated back) -For arctis 5 to integrated probably paswitch. Rest is output switch. - -* Secrets handling - -** TODO Bitwarden integration for secrets obtainment -Should be possible. Need to investigate alternate implementation (check arc's... for this) - -** TODO Split secrets usage in-store towards private config instead of embedding inside configs using a secrets file -Definitely doable.