diff --git a/.gitmodules b/.gitmodules
index c9d4591d..31ba4313 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "config/private"]
-	path = config/private
+	path = private
 	url = "gcrypt::git@github.com:kittywitch/nixfiles-private#main"
 	branch = main
diff --git a/config/hosts/samhain/vm/vbios.rom b/config/hosts/samhain/vm/vbios.rom
deleted file mode 100644
index 9f48d8fb..00000000
Binary files a/config/hosts/samhain/vm/vbios.rom and /dev/null differ
diff --git a/config/profiles/common/nixos/secrets.nix b/config/profiles/common/nixos/secrets.nix
deleted file mode 100644
index 877d1874..00000000
--- a/config/profiles/common/nixos/secrets.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  secrets = {
-    root = "/var/lib/kat/secrets";
-    persistentRoot = "/var/lib/kat/secrets";
-    external = true;
-  };
-}
diff --git a/config/profiles/sway/home/wallpapers/left.jpg b/config/profiles/sway/home/wallpapers/left.jpg
deleted file mode 100644
index f519c4d4..00000000
Binary files a/config/profiles/sway/home/wallpapers/left.jpg and /dev/null differ
diff --git a/config/profiles/sway/home/wallpapers/main.png b/config/profiles/sway/home/wallpapers/main.png
deleted file mode 100644
index a8f36209..00000000
Binary files a/config/profiles/sway/home/wallpapers/main.png and /dev/null differ
diff --git a/config/profiles/sway/home/wallpapers/right.jpg b/config/profiles/sway/home/wallpapers/right.jpg
deleted file mode 100644
index 9ab53754..00000000
Binary files a/config/profiles/sway/home/wallpapers/right.jpg and /dev/null differ
diff --git a/config/home.nix b/home.nix
similarity index 78%
rename from config/home.nix
rename to home.nix
index 1aa651a2..8c03dceb 100644
--- a/config/home.nix
+++ b/home.nix
@@ -7,6 +7,6 @@ let
 in {
 
   imports = lib.attrValues homeModules
-    ++ [ ../modules/home ./private/profile/home ];
+    ++ [ ./modules/home ./private/profile/home ];
 }
 
diff --git a/hosts/athame/home/default.nix b/hosts/athame/home/default.nix
new file mode 100644
index 00000000..c915eb0a
--- /dev/null
+++ b/hosts/athame/home/default.nix
@@ -0,0 +1 @@
+{ ... }: { }
diff --git a/config/hosts/athame/configuration.nix b/hosts/athame/nixos/default.nix
similarity index 71%
rename from config/hosts/athame/configuration.nix
rename to hosts/athame/nixos/default.nix
index 4835b007..0a4e741c 100644
--- a/config/hosts/athame/configuration.nix
+++ b/hosts/athame/nixos/default.nix
@@ -2,22 +2,22 @@
 
 {
   imports = [
-    ./hardware.nix
+    ./hw.nix
     # host-specific services 
     ./postgres.nix
     ./virtualhosts.nix
     ./fail2ban.nix
     # services 
-    ../../services/nginx.nix
-    ../../services/mail.nix
-    ../../services/asterisk.nix
-    ../../services/gitea.nix
-    ../../services/syncplay.nix
-    ../../services/bitwarden.nix
-    ../../services/taskserver.nix
-    ../../services/murmur.nix
-    ../../services/znc.nix
-    ../../services/matrix.nix
+    ../../../services/nginx.nix
+    ../../../services/mail.nix
+    ../../../services/asterisk.nix
+    ../../../services/gitea.nix
+    ../../../services/syncplay.nix
+    ../../../services/bitwarden.nix
+    ../../../services/taskserver.nix
+    ../../../services/murmur.nix
+    ../../../services/znc.nix
+    ../../../services/matrix.nix
   ];
 
   deploy.profiles = [ "kat" ];
diff --git a/config/hosts/athame/fail2ban.nix b/hosts/athame/nixos/fail2ban.nix
similarity index 100%
rename from config/hosts/athame/fail2ban.nix
rename to hosts/athame/nixos/fail2ban.nix
diff --git a/config/hosts/athame/hardware.nix b/hosts/athame/nixos/hw.nix
similarity index 100%
rename from config/hosts/athame/hardware.nix
rename to hosts/athame/nixos/hw.nix
diff --git a/config/hosts/athame/postgres.nix b/hosts/athame/nixos/postgres.nix
similarity index 100%
rename from config/hosts/athame/postgres.nix
rename to hosts/athame/nixos/postgres.nix
diff --git a/config/hosts/athame/virtualhosts.nix b/hosts/athame/nixos/virtualhosts.nix
similarity index 100%
rename from config/hosts/athame/virtualhosts.nix
rename to hosts/athame/nixos/virtualhosts.nix
diff --git a/hosts/boline/home/default.nix b/hosts/boline/home/default.nix
new file mode 100644
index 00000000..c915eb0a
--- /dev/null
+++ b/hosts/boline/home/default.nix
@@ -0,0 +1 @@
+{ ... }: { }
diff --git a/config/hosts/boline/configuration.nix b/hosts/boline/nixos/default.nix
similarity index 91%
rename from config/hosts/boline/configuration.nix
rename to hosts/boline/nixos/default.nix
index f93aad2d..116e8b03 100644
--- a/config/hosts/boline/configuration.nix
+++ b/hosts/boline/nixos/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./hardware.nix ../../services/nginx.nix ];
+  imports = [ ./hw.nix ../../../services/nginx.nix ];
 
   deploy.profiles = [ "kat" ];
   deploy.ssh.host = "boline.kittywit.ch";
diff --git a/config/hosts/boline/hardware.nix b/hosts/boline/nixos/hw.nix
similarity index 100%
rename from config/hosts/boline/hardware.nix
rename to hosts/boline/nixos/hw.nix
diff --git a/hosts/samhain/home/default.nix b/hosts/samhain/home/default.nix
new file mode 100644
index 00000000..c915eb0a
--- /dev/null
+++ b/hosts/samhain/home/default.nix
@@ -0,0 +1 @@
+{ ... }: { }
diff --git a/config/hosts/samhain/configuration.nix b/hosts/samhain/nixos/default.nix
similarity index 92%
rename from config/hosts/samhain/configuration.nix
rename to hosts/samhain/nixos/default.nix
index 7bda79c7..6936d6ea 100644
--- a/config/hosts/samhain/configuration.nix
+++ b/hosts/samhain/nixos/default.nix
@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ./hardware.nix
-    ../../services/zfs.nix
-    ../../services/nginx.nix
+    ./hw.nix
+    ../../../services/zfs.nix
+    ../../../services/nginx.nix
     ./thermal
     ./vm
     ./torrenting.nix
diff --git a/config/hosts/samhain/hardware.nix b/hosts/samhain/nixos/hw.nix
similarity index 100%
rename from config/hosts/samhain/hardware.nix
rename to hosts/samhain/nixos/hw.nix
diff --git a/config/hosts/samhain/thermal/default.nix b/hosts/samhain/nixos/thermal/default.nix
similarity index 100%
rename from config/hosts/samhain/thermal/default.nix
rename to hosts/samhain/nixos/thermal/default.nix
diff --git a/config/hosts/samhain/thermal/kaede-power.sh b/hosts/samhain/nixos/thermal/kaede-power.sh
similarity index 100%
rename from config/hosts/samhain/thermal/kaede-power.sh
rename to hosts/samhain/nixos/thermal/kaede-power.sh
diff --git a/config/hosts/samhain/thermal/kaede-thermald.xml b/hosts/samhain/nixos/thermal/kaede-thermald.xml
similarity index 100%
rename from config/hosts/samhain/thermal/kaede-thermald.xml
rename to hosts/samhain/nixos/thermal/kaede-thermald.xml
diff --git a/config/hosts/samhain/thermal/kaede-thermals.sh b/hosts/samhain/nixos/thermal/kaede-thermals.sh
similarity index 100%
rename from config/hosts/samhain/thermal/kaede-thermals.sh
rename to hosts/samhain/nixos/thermal/kaede-thermals.sh
diff --git a/config/hosts/samhain/torrenting.nix b/hosts/samhain/nixos/torrenting.nix
similarity index 100%
rename from config/hosts/samhain/torrenting.nix
rename to hosts/samhain/nixos/torrenting.nix
diff --git a/config/hosts/samhain/vm/default.nix b/hosts/samhain/nixos/vm/default.nix
similarity index 100%
rename from config/hosts/samhain/vm/default.nix
rename to hosts/samhain/nixos/vm/default.nix
diff --git a/config/hosts/samhain/vm/screenstub.yml b/hosts/samhain/nixos/vm/screenstub.yml
similarity index 100%
rename from config/hosts/samhain/vm/screenstub.yml
rename to hosts/samhain/nixos/vm/screenstub.yml
diff --git a/config/hosts/samhain/vm/win10.xml.nix b/hosts/samhain/nixos/vm/win10.xml.nix
similarity index 100%
rename from config/hosts/samhain/vm/win10.xml.nix
rename to hosts/samhain/nixos/vm/win10.xml.nix
diff --git a/hosts/yule/home/default.nix b/hosts/yule/home/default.nix
new file mode 100644
index 00000000..c915eb0a
--- /dev/null
+++ b/hosts/yule/home/default.nix
@@ -0,0 +1 @@
+{ ... }: { }
diff --git a/config/hosts/yule/configuration.nix b/hosts/yule/nixos/default.nix
similarity index 90%
rename from config/hosts/yule/configuration.nix
rename to hosts/yule/nixos/default.nix
index 725141c2..9c0ee4a3 100644
--- a/config/hosts/yule/configuration.nix
+++ b/hosts/yule/nixos/default.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./hardware.nix ../../services/zfs.nix ];
+  imports = [ ./hw.nix ../../../services/zfs.nix ];
 
   deploy.profiles = [ "gui" "sway" "kat" "laptop" "private" ];
   deploy.groups = [ "gui" ];
diff --git a/config/hosts/yule/hardware.nix b/hosts/yule/nixos/hw.nix
similarity index 100%
rename from config/hosts/yule/hardware.nix
rename to hosts/yule/nixos/hw.nix
diff --git a/lib/hosts.nix b/lib/hosts.nix
index f5546d3d..a38d72b1 100644
--- a/lib/hosts.nix
+++ b/lib/hosts.nix
@@ -1,5 +1,5 @@
-{ pkgs, hostsDir ? ../config/hosts, privateHostsDir ? ../config/private/hosts
-, commonImports ? [ ../config/nixos.nix ../modules/nixos ], pkgsPath ? ../pkgs
+{ pkgs, hostsDir ? ../hosts, privateHostsDir ? ../private/hosts
+, commonImports ? [ ../nixos.nix ../modules/nixos ], pkgsPath ? ../pkgs
 , sources ? { }, witch ? { } }:
 
 with pkgs.lib;
@@ -12,8 +12,8 @@ rec {
     { config, ... }: {
       _module.args = { inherit hosts groups; };
       imports = [
-        (import (hostsDir + "/${hostName}/configuration.nix"))
-        (import (privateHostsDir + "/${hostName}/configuration.nix"))
+        (import (hostsDir + "/${hostName}/nixos"))
+        (import (privateHostsDir + "/${hostName}/nixos"))
         ../modules/nixos/deploy
       ] ++ commonImports;
       networking = { inherit hostName; };
@@ -32,7 +32,7 @@ rec {
         else
           { })
       ];
-      specialArgs = { inherit sources witch; };
+      specialArgs = { inherit sources witch hostName; };
     })) hostNames);
 
   groupNames = unique (concatLists
diff --git a/nix/sources.json b/nix/sources.json
index 43f71651..86c75150 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://nur.nix-community.org/",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d2b3d9cc84099b9b23bf54f0bbb44371fe5d70f0",
-        "sha256": "00849mfq5yjxsb4fbcvs3i92qbivmrybm80wd18yq6gv1nvhl1wg",
+        "rev": "79226020063ce21ade4c192cf0c6b7da8b4e7c70",
+        "sha256": "10xvmbm24pgl3276n34qx8217423bv5a2wha2r2wbrfbvl5m8q89",
         "type": "tarball",
-        "url": "https://github.com/nix-community/NUR/archive/d2b3d9cc84099b9b23bf54f0bbb44371fe5d70f0.tar.gz",
+        "url": "https://github.com/nix-community/NUR/archive/79226020063ce21ade4c192cf0c6b7da8b4e7c70.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "arc-nixexprs": {
@@ -98,10 +98,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f17621f6881f07283e66cc478fce5dff6b4e1c72",
-        "sha256": "0fkzlhqy6d5ss7dw7rca39zh137i5vjbwq438m14wdm7wxjazbly",
+        "rev": "070bfc96b7446e7d2653a1913b9bc4082d529638",
+        "sha256": "0kwbbsqi1vlm65a14p100vffyrjprbwgr6wpcs5yhg68gxsds30v",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/f17621f6881f07283e66cc478fce5dff6b4e1c72.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/070bfc96b7446e7d2653a1913b9bc4082d529638.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "pbb-nixfiles": {
diff --git a/config/nixos.nix b/nixos.nix
similarity index 81%
rename from config/nixos.nix
rename to nixos.nix
index 49b48b71..96eb8a58 100644
--- a/config/nixos.nix
+++ b/nixos.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, sources, witch, options, ... }:
+{ pkgs, config, lib, sources, witch, options, hostName, ... }:
 
 let
   nixosModules = witch.modList {
@@ -13,7 +13,7 @@ in {
     type = lib.types.attrsOf (lib.types.submoduleWith {
       modules = [ ];
       specialArgs = {
-        inherit sources witch;
+        inherit sources witch hostName;
         superConfig = config;
         modulesPath = sources.home-manager + "/modules";
       };
@@ -28,7 +28,7 @@ in {
 
       users = {
         kat = {
-          imports = [ ./home.nix ];
+          imports = [ ./home.nix (import (./hosts + "/${hostName}/home")) ];
 
           deploy.profile = lib.mkMerge (map (prof: {
             ${if options ? deploy.profile.${prof} then prof else null} = true;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 5c84f772..29cfe0c5 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -7,7 +7,6 @@ let
       inherit (super) dino;
     };
 
-
     discord = unstable.discord.override { nss = self.nss_latest; };
 
     lib = super.lib.extend
diff --git a/config/private b/private
similarity index 100%
rename from config/private
rename to private
diff --git a/config/profiles/common/home.nix b/profiles/common/home.nix
similarity index 100%
rename from config/profiles/common/home.nix
rename to profiles/common/home.nix
diff --git a/config/profiles/common/nixos.nix b/profiles/common/nixos.nix
similarity index 100%
rename from config/profiles/common/nixos.nix
rename to profiles/common/nixos.nix
diff --git a/config/profiles/common/nixos/access.nix b/profiles/common/nixos/access.nix
similarity index 100%
rename from config/profiles/common/nixos/access.nix
rename to profiles/common/nixos/access.nix
diff --git a/config/profiles/common/nixos/default.nix b/profiles/common/nixos/default.nix
similarity index 100%
rename from config/profiles/common/nixos/default.nix
rename to profiles/common/nixos/default.nix
diff --git a/config/profiles/common/nixos/locale.nix b/profiles/common/nixos/locale.nix
similarity index 100%
rename from config/profiles/common/nixos/locale.nix
rename to profiles/common/nixos/locale.nix
diff --git a/config/profiles/common/nixos/net.nix b/profiles/common/nixos/net.nix
similarity index 100%
rename from config/profiles/common/nixos/net.nix
rename to profiles/common/nixos/net.nix
diff --git a/config/profiles/common/nixos/nix.nix b/profiles/common/nixos/nix.nix
similarity index 100%
rename from config/profiles/common/nixos/nix.nix
rename to profiles/common/nixos/nix.nix
diff --git a/config/profiles/common/nixos/packages.nix b/profiles/common/nixos/packages.nix
similarity index 100%
rename from config/profiles/common/nixos/packages.nix
rename to profiles/common/nixos/packages.nix
diff --git a/config/profiles/common/nixos/ssh.nix b/profiles/common/nixos/ssh.nix
similarity index 100%
rename from config/profiles/common/nixos/ssh.nix
rename to profiles/common/nixos/ssh.nix
diff --git a/config/profiles/common/nixos/system.nix b/profiles/common/nixos/system.nix
similarity index 100%
rename from config/profiles/common/nixos/system.nix
rename to profiles/common/nixos/system.nix
diff --git a/config/profiles/gui/home.nix b/profiles/gui/home.nix
similarity index 100%
rename from config/profiles/gui/home.nix
rename to profiles/gui/home.nix
diff --git a/config/profiles/gui/home/default.nix b/profiles/gui/home/default.nix
similarity index 100%
rename from config/profiles/gui/home/default.nix
rename to profiles/gui/home/default.nix
diff --git a/config/profiles/gui/home/email.nix b/profiles/gui/home/email.nix
similarity index 96%
rename from config/profiles/gui/home/email.nix
rename to profiles/gui/home/email.nix
index e73a2c08..175b3317 100644
--- a/config/profiles/gui/home/email.nix
+++ b/profiles/gui/home/email.nix
@@ -18,7 +18,7 @@
         passwordCommand = ''
           ${pkgs.arc.pkgs.rbw-bitw}/bin/bitw -p gpg://${
             ../../../private/files/bitw/master.gpg
-          } get "kittywitch email"'';
+          } get "email/kittywitch"'';
         msmtp.enable = true;
         mbsync.enable = true;
         mbsync.create = "maildir";
diff --git a/config/profiles/gui/home/firefox/default.nix b/profiles/gui/home/firefox/default.nix
similarity index 100%
rename from config/profiles/gui/home/firefox/default.nix
rename to profiles/gui/home/firefox/default.nix
diff --git a/config/profiles/gui/home/firefox/tridactylrc b/profiles/gui/home/firefox/tridactylrc
similarity index 100%
rename from config/profiles/gui/home/firefox/tridactylrc
rename to profiles/gui/home/firefox/tridactylrc
diff --git a/config/profiles/gui/home/firefox/userChrome.css.nix b/profiles/gui/home/firefox/userChrome.css.nix
similarity index 100%
rename from config/profiles/gui/home/firefox/userChrome.css.nix
rename to profiles/gui/home/firefox/userChrome.css.nix
diff --git a/config/profiles/gui/home/gpg.nix b/profiles/gui/home/gpg.nix
similarity index 100%
rename from config/profiles/gui/home/gpg.nix
rename to profiles/gui/home/gpg.nix
diff --git a/config/profiles/gui/home/gtk.nix b/profiles/gui/home/gtk.nix
similarity index 100%
rename from config/profiles/gui/home/gtk.nix
rename to profiles/gui/home/gtk.nix
diff --git a/config/profiles/gui/home/kitty.nix b/profiles/gui/home/kitty.nix
similarity index 100%
rename from config/profiles/gui/home/kitty.nix
rename to profiles/gui/home/kitty.nix
diff --git a/config/profiles/gui/home/mpv.nix b/profiles/gui/home/mpv.nix
similarity index 100%
rename from config/profiles/gui/home/mpv.nix
rename to profiles/gui/home/mpv.nix
diff --git a/config/profiles/gui/home/music.nix b/profiles/gui/home/music.nix
similarity index 100%
rename from config/profiles/gui/home/music.nix
rename to profiles/gui/home/music.nix
diff --git a/config/profiles/gui/home/packages.nix b/profiles/gui/home/packages.nix
similarity index 100%
rename from config/profiles/gui/home/packages.nix
rename to profiles/gui/home/packages.nix
diff --git a/config/profiles/gui/home/weechat.nix b/profiles/gui/home/weechat.nix
similarity index 94%
rename from config/profiles/gui/home/weechat.nix
rename to profiles/gui/home/weechat.nix
index da6b0e4d..589ab603 100644
--- a/config/profiles/gui/home/weechat.nix
+++ b/profiles/gui/home/weechat.nix
@@ -48,7 +48,7 @@
             passphrase_command = ''
               ${pkgs.rbw-bitw}/bin/bitw -p gpg://${
                 ../../../private/files/bitw/master.gpg
-              } get "weechat"'';
+              } get "comms/weechat"'';
             hash_algo = "sha512";
           };
         };
@@ -78,7 +78,10 @@
             autoreconnect_delay_max = 5;
             lag_min-show = 1000;
           };
-          look = { server_buffer = "independent"; };
+          look = {
+            server_buffer = "independent";
+            redactions = "notice";
+          };
           server.kat = {
             address = "kittywit.ch";
             device_name = "${superConfig.networking.hostName}/weechat";
diff --git a/config/profiles/gui/nixos.nix b/profiles/gui/nixos.nix
similarity index 100%
rename from config/profiles/gui/nixos.nix
rename to profiles/gui/nixos.nix
diff --git a/config/profiles/gui/nixos/adb.nix b/profiles/gui/nixos/adb.nix
similarity index 100%
rename from config/profiles/gui/nixos/adb.nix
rename to profiles/gui/nixos/adb.nix
diff --git a/config/profiles/gui/nixos/default.nix b/profiles/gui/nixos/default.nix
similarity index 100%
rename from config/profiles/gui/nixos/default.nix
rename to profiles/gui/nixos/default.nix
diff --git a/config/profiles/gui/nixos/dns.nix b/profiles/gui/nixos/dns.nix
similarity index 100%
rename from config/profiles/gui/nixos/dns.nix
rename to profiles/gui/nixos/dns.nix
diff --git a/config/profiles/gui/nixos/firefox.nix b/profiles/gui/nixos/firefox.nix
similarity index 100%
rename from config/profiles/gui/nixos/firefox.nix
rename to profiles/gui/nixos/firefox.nix
diff --git a/config/profiles/gui/nixos/fonts.nix b/profiles/gui/nixos/fonts.nix
similarity index 100%
rename from config/profiles/gui/nixos/fonts.nix
rename to profiles/gui/nixos/fonts.nix
diff --git a/config/profiles/gui/nixos/gpg.nix b/profiles/gui/nixos/gpg.nix
similarity index 100%
rename from config/profiles/gui/nixos/gpg.nix
rename to profiles/gui/nixos/gpg.nix
diff --git a/config/profiles/gui/nixos/mingetty.nix b/profiles/gui/nixos/mingetty.nix
similarity index 100%
rename from config/profiles/gui/nixos/mingetty.nix
rename to profiles/gui/nixos/mingetty.nix
diff --git a/config/profiles/gui/nixos/nixpkgs.nix b/profiles/gui/nixos/nixpkgs.nix
similarity index 100%
rename from config/profiles/gui/nixos/nixpkgs.nix
rename to profiles/gui/nixos/nixpkgs.nix
diff --git a/config/profiles/gui/nixos/sound.nix b/profiles/gui/nixos/sound.nix
similarity index 100%
rename from config/profiles/gui/nixos/sound.nix
rename to profiles/gui/nixos/sound.nix
diff --git a/config/profiles/kat/home.nix b/profiles/kat/home.nix
similarity index 100%
rename from config/profiles/kat/home.nix
rename to profiles/kat/home.nix
diff --git a/config/profiles/kat/home/base16.nix b/profiles/kat/home/base16.nix
similarity index 100%
rename from config/profiles/kat/home/base16.nix
rename to profiles/kat/home/base16.nix
diff --git a/config/profiles/kat/home/default.nix b/profiles/kat/home/default.nix
similarity index 100%
rename from config/profiles/kat/home/default.nix
rename to profiles/kat/home/default.nix
diff --git a/config/profiles/kat/home/git.nix b/profiles/kat/home/git.nix
similarity index 100%
rename from config/profiles/kat/home/git.nix
rename to profiles/kat/home/git.nix
diff --git a/config/profiles/kat/home/kitty.nix b/profiles/kat/home/kitty.nix
similarity index 100%
rename from config/profiles/kat/home/kitty.nix
rename to profiles/kat/home/kitty.nix
diff --git a/config/profiles/kat/home/packages.nix b/profiles/kat/home/packages.nix
similarity index 100%
rename from config/profiles/kat/home/packages.nix
rename to profiles/kat/home/packages.nix
diff --git a/config/profiles/kat/home/ssh.nix b/profiles/kat/home/ssh.nix
similarity index 100%
rename from config/profiles/kat/home/ssh.nix
rename to profiles/kat/home/ssh.nix
diff --git a/config/profiles/kat/home/tmux.nix b/profiles/kat/home/tmux.nix
similarity index 100%
rename from config/profiles/kat/home/tmux.nix
rename to profiles/kat/home/tmux.nix
diff --git a/config/profiles/kat/home/vim/coc-settings.json b/profiles/kat/home/vim/coc-settings.json
similarity index 100%
rename from config/profiles/kat/home/vim/coc-settings.json
rename to profiles/kat/home/vim/coc-settings.json
diff --git a/config/profiles/kat/home/vim/default.nix b/profiles/kat/home/vim/default.nix
similarity index 95%
rename from config/profiles/kat/home/vim/default.nix
rename to profiles/kat/home/vim/default.nix
index 7c35a51e..284ab1b1 100644
--- a/config/profiles/kat/home/vim/default.nix
+++ b/profiles/kat/home/vim/default.nix
@@ -18,6 +18,8 @@
         coc-git
         vim-fugitive
         vim-startify
+        vim-airline
+        vim-airline-themes
         base16-vim
       ];
       #extraPackages = with pkgs;
diff --git a/config/profiles/kat/home/vim/vimrc.nix b/profiles/kat/home/vim/vimrc.nix
similarity index 99%
rename from config/profiles/kat/home/vim/vimrc.nix
rename to profiles/kat/home/vim/vimrc.nix
index 3cda3ade..fcdcef99 100644
--- a/config/profiles/kat/home/vim/vimrc.nix
+++ b/profiles/kat/home/vim/vimrc.nix
@@ -9,6 +9,9 @@
   "colorscheme base16-rebecca
   colorscheme default
 
+  " tabline
+  let g:airline#extensions#tabline#enabled = 1
+
   " notmuch! 
   let g:notmuch_config_file='${config.xdg.configHome}/notmuch/notmuchrc'
   let g:notmuch_folders_count_threads=0
diff --git a/config/profiles/kat/home/xdg.nix b/profiles/kat/home/xdg.nix
similarity index 100%
rename from config/profiles/kat/home/xdg.nix
rename to profiles/kat/home/xdg.nix
diff --git a/config/profiles/kat/home/zsh/default.nix b/profiles/kat/home/zsh/default.nix
similarity index 100%
rename from config/profiles/kat/home/zsh/default.nix
rename to profiles/kat/home/zsh/default.nix
diff --git a/config/profiles/kat/home/zsh/zshrc-title b/profiles/kat/home/zsh/zshrc-title
similarity index 100%
rename from config/profiles/kat/home/zsh/zshrc-title
rename to profiles/kat/home/zsh/zshrc-title
diff --git a/config/profiles/kat/nixos.nix b/profiles/kat/nixos.nix
similarity index 100%
rename from config/profiles/kat/nixos.nix
rename to profiles/kat/nixos.nix
diff --git a/config/profiles/laptop/home.nix b/profiles/laptop/home.nix
similarity index 100%
rename from config/profiles/laptop/home.nix
rename to profiles/laptop/home.nix
diff --git a/config/profiles/laptop/nixos.nix b/profiles/laptop/nixos.nix
similarity index 100%
rename from config/profiles/laptop/nixos.nix
rename to profiles/laptop/nixos.nix
diff --git a/config/profiles/laptop/nixos/default.nix b/profiles/laptop/nixos/default.nix
similarity index 100%
rename from config/profiles/laptop/nixos/default.nix
rename to profiles/laptop/nixos/default.nix
diff --git a/config/profiles/laptop/nixos/light.nix b/profiles/laptop/nixos/light.nix
similarity index 100%
rename from config/profiles/laptop/nixos/light.nix
rename to profiles/laptop/nixos/light.nix
diff --git a/config/profiles/laptop/nixos/wifi.nix b/profiles/laptop/nixos/wifi.nix
similarity index 100%
rename from config/profiles/laptop/nixos/wifi.nix
rename to profiles/laptop/nixos/wifi.nix
diff --git a/config/profiles/sway/home.nix b/profiles/sway/home.nix
similarity index 100%
rename from config/profiles/sway/home.nix
rename to profiles/sway/home.nix
diff --git a/config/profiles/sway/home/default.nix b/profiles/sway/home/default.nix
similarity index 100%
rename from config/profiles/sway/home/default.nix
rename to profiles/sway/home/default.nix
diff --git a/config/profiles/sway/home/gammastep.nix b/profiles/sway/home/gammastep.nix
similarity index 100%
rename from config/profiles/sway/home/gammastep.nix
rename to profiles/sway/home/gammastep.nix
diff --git a/config/profiles/sway/home/grimshot.sh b/profiles/sway/home/grimshot.sh
similarity index 100%
rename from config/profiles/sway/home/grimshot.sh
rename to profiles/sway/home/grimshot.sh
diff --git a/config/profiles/sway/home/mako.nix b/profiles/sway/home/mako.nix
similarity index 100%
rename from config/profiles/sway/home/mako.nix
rename to profiles/sway/home/mako.nix
diff --git a/config/profiles/sway/home/sway.nix b/profiles/sway/home/sway.nix
similarity index 97%
rename from config/profiles/sway/home/sway.nix
rename to profiles/sway/home/sway.nix
index 73490afc..a66a40ce 100644
--- a/config/profiles/sway/home/sway.nix
+++ b/profiles/sway/home/sway.nix
@@ -26,6 +26,7 @@
         exec env --unset=SHLVL systemd-cat -t sway -- sway
       fi
     '';
+
     wayland.windowManager.sway = {
       enable = true;
       config = let
@@ -86,6 +87,7 @@
           "${pkgs.j4-dmenu-desktop}/bin/j4-dmenu-desktop --dmenu=\"${dmenu}\" --term='${cfg.terminal}'";
         modifier = "Mod4";
 
+        assigns = { "2" = [{ class = "screenstub"; }]; };
         startup = [
           {
             command = "systemctl --user restart mako";
@@ -223,6 +225,9 @@
       wrapperFeatures.gtk = true;
       extraConfig = ''
         seat seat0 xcursor_theme breeze_cursors 20
+        workspace "1" output "DP-1"
+        workspace "2" output "DVI-D-1"
+        workspace "3" output "HDMI-A-1"
       '';
     };
   };
diff --git a/config/profiles/sway/home/swayidle.nix b/profiles/sway/home/swayidle.nix
similarity index 100%
rename from config/profiles/sway/home/swayidle.nix
rename to profiles/sway/home/swayidle.nix
diff --git a/config/profiles/sway/home/waybar/default.nix b/profiles/sway/home/waybar/default.nix
similarity index 100%
rename from config/profiles/sway/home/waybar/default.nix
rename to profiles/sway/home/waybar/default.nix
diff --git a/config/profiles/sway/home/waybar/waybar.css.nix b/profiles/sway/home/waybar/waybar.css.nix
similarity index 100%
rename from config/profiles/sway/home/waybar/waybar.css.nix
rename to profiles/sway/home/waybar/waybar.css.nix
diff --git a/config/profiles/sway/nixos.nix b/profiles/sway/nixos.nix
similarity index 100%
rename from config/profiles/sway/nixos.nix
rename to profiles/sway/nixos.nix
diff --git a/config/profiles/sway/nixos/default.nix b/profiles/sway/nixos/default.nix
similarity index 100%
rename from config/profiles/sway/nixos/default.nix
rename to profiles/sway/nixos/default.nix
diff --git a/config/profiles/sway/nixos/sway.nix b/profiles/sway/nixos/sway.nix
similarity index 100%
rename from config/profiles/sway/nixos/sway.nix
rename to profiles/sway/nixos/sway.nix
diff --git a/config/services/asterisk.nix b/services/asterisk.nix
similarity index 100%
rename from config/services/asterisk.nix
rename to services/asterisk.nix
diff --git a/config/services/bitwarden.nix b/services/bitwarden.nix
similarity index 100%
rename from config/services/bitwarden.nix
rename to services/bitwarden.nix
diff --git a/config/services/gitea.nix b/services/gitea.nix
similarity index 100%
rename from config/services/gitea.nix
rename to services/gitea.nix
diff --git a/config/services/mail.nix b/services/mail.nix
similarity index 100%
rename from config/services/mail.nix
rename to services/mail.nix
diff --git a/config/services/matrix.nix b/services/matrix.nix
similarity index 100%
rename from config/services/matrix.nix
rename to services/matrix.nix
diff --git a/config/services/murmur.nix b/services/murmur.nix
similarity index 90%
rename from config/services/murmur.nix
rename to services/murmur.nix
index 46b2b849..010ec079 100644
--- a/config/services/murmur.nix
+++ b/services/murmur.nix
@@ -8,7 +8,7 @@
   services.murmur = {
     enable = true;
 
-    hostName = "kittywit.ch";
+    hostName = "mumble.kittywit.ch";
 
     extraConfig = ''
       sslCert=/var/lib/acme/kittywit.ch/fullchain.pem
diff --git a/config/services/nginx.nix b/services/nginx.nix
similarity index 100%
rename from config/services/nginx.nix
rename to services/nginx.nix
diff --git a/config/services/syncplay.nix b/services/syncplay.nix
similarity index 100%
rename from config/services/syncplay.nix
rename to services/syncplay.nix
diff --git a/config/services/syncserver.nix b/services/syncserver.nix
similarity index 100%
rename from config/services/syncserver.nix
rename to services/syncserver.nix
diff --git a/config/services/taskserver.nix b/services/taskserver.nix
similarity index 100%
rename from config/services/taskserver.nix
rename to services/taskserver.nix
diff --git a/config/services/weechat.nix b/services/weechat.nix
similarity index 100%
rename from config/services/weechat.nix
rename to services/weechat.nix
diff --git a/config/services/zfs.nix b/services/zfs.nix
similarity index 100%
rename from config/services/zfs.nix
rename to services/zfs.nix
diff --git a/config/services/znc.nix b/services/znc.nix
similarity index 100%
rename from config/services/znc.nix
rename to services/znc.nix