diff --git a/.gitmodules b/.gitmodules
index 400635b1..d1bfcc59 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,11 @@
 [submodule "config/trusted"]
 	path = config/trusted
 	branch = main
-	url = "https://git.kittywit.ch/kat/nixfiles-trusted.git"
+	url = "ssh://gitea@git.kittywit.ch:62954/kat/nixfiles-trusted.git"
+[submodule "config/tf"]
+	path = config/tf
+	branch = main
+	url = "gcrypt::ssh://gitea@git.kittywit.ch:62954/kat/nixfiles-sensitive.git#main"
 [submodule "overlay/exprs"]
 	path = overlay/exprs
 	branch = main
diff --git a/config/tf b/config/tf
index 91b99389..42109564 160000
--- a/config/tf
+++ b/config/tf
@@ -1 +1 @@
-Subproject commit 91b99389dbbda15b8ca89793ee5a3b130c21bd5e
+Subproject commit 42109564c606b20be3b99d5c6e4172bf20118a65
diff --git a/config/users/kat/base/ssh.nix b/config/users/kat/base/ssh.nix
index b936e906..7c610f77 100644
--- a/config/users/kat/base/ssh.nix
+++ b/config/users/kat/base/ssh.nix
@@ -6,6 +6,7 @@
     controlMaster = "auto";
     controlPersist = "10m";
     hashKnownHosts = true;
+    compression = true;
     matchBlocks =
       let
         common = {
diff --git a/config/users/kat/base/vim/init.vim b/config/users/kat/base/vim/init.vim
index ed2aa234..dd2905be 100644
--- a/config/users/kat/base/vim/init.vim
+++ b/config/users/kat/base/vim/init.vim
@@ -10,7 +10,6 @@ set sw=2
 
 " colors
 let base16colorspace=256
-colorscheme base16-default-dark
 autocmd vimenter * highlight Normal guibg=NONE ctermbg=NONE
 autocmd SourcePost * highlight Normal     ctermbg=NONE guibg=NONE
 			\ |    highlight LineNr     ctermbg=NONE guibg=NONE
diff --git a/config/users/kat/base/vim/nvim.nix b/config/users/kat/base/vim/nvim.nix
index 23a3c6bc..0a4c1f4e 100644
--- a/config/users/kat/base/vim/nvim.nix
+++ b/config/users/kat/base/vim/nvim.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: with lib;
+{ config, lib, pkgs, nixos, ... }: with lib;
 
 let initvim = pkgs.callPackage
   ({ stdenv, elinks, nodejs }: stdenv.mkDerivation {
@@ -23,6 +23,7 @@ in
     enable = true;
     extraConfig = ''
       source ${initvim}
+      ${if nixos.networking.hostName == "koishi" then "color-scheme base16-default-light" else "colorscheme base16-default-dark"}
     '';
     vimAlias = true;
     viAlias = true;
diff --git a/config/users/kat/base/vim/vim.nix b/config/users/kat/base/vim/vim.nix
index 61c18638..553c57bc 100644
--- a/config/users/kat/base/vim/vim.nix
+++ b/config/users/kat/base/vim/vim.nix
@@ -19,6 +19,7 @@ in
     packageConfigurable = pkgs.vim_configurable-pynvim;
     extraConfig = ''
       source ${initvim}
+      ${if nixos.networking.hostName == "koishi" then "color-scheme base16-default-light" else "colorscheme base16-default-dark"}
     '';
     plugins = with pkgs.vimPlugins; [
       "vim-cool"
diff --git a/config/users/kat/sway/konawall.nix b/config/users/kat/sway/konawall.nix
index a6d7b078..d808050f 100644
--- a/config/users/kat/sway/konawall.nix
+++ b/config/users/kat/sway/konawall.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, nixos, lib, ... }:
 
 with lib;
 
@@ -9,8 +9,8 @@ with lib;
     mode = "shuffle";
     commonTags = [ "width:>=1600" ];
     tagList = map (toList) [
-      ["score:>=50"
-      "touhou"]
+      (["score:>=50"
+      "touhou"] ++ optional (nixos.networking.hostName == "koishi") "rating:s")
     ];
   };
 }
diff --git a/config/users/kat/sway/waybar/default.nix b/config/users/kat/sway/waybar/default.nix
index af603c0f..ee7e8715 100644
--- a/config/users/kat/sway/waybar/default.nix
+++ b/config/users/kat/sway/waybar/default.nix
@@ -9,9 +9,9 @@
     enable = true;
     systemd.enable = true;
     settings = [{
-      modules-right = [ "clock#s" "clock#arc" "clock#hex" "clock#miku" "clock" ];
-      modules-center = [ "sway/workspaces" "sway/mode" "sway/window" ];
-      modules-left = [
+      modules-center = [ "clock#s" "clock#arc" "clock#hex" "clock#miku" "clock" ];
+      modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
+      modules-right = [
         "tray"
         "pulseaudio"
         "custom/mail"