diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index 1eb4855a..daa81dc8 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -101,8 +101,8 @@ in {
     default = makeConfig "hera" [
       ./on-my-machine.nix
       ./headless.nix
-      ..nixos/machineshera/weechat
-      ..nixos/machineshera/secret
+      #..nixos/machineshera/weechat
+      ./roles/weechat
       ./kassandra-server.nix
       ./headless-mpd.nix
       ./mail.nix
diff --git a/nixos/machines/hera/weechat/default-keys.conf b/home-manager/roles/weechat/default-keys.conf
similarity index 100%
rename from nixos/machines/hera/weechat/default-keys.conf
rename to home-manager/roles/weechat/default-keys.conf
diff --git a/nixos/machines/hera/weechat/default.nix b/home-manager/roles/weechat/default.nix
similarity index 100%
rename from nixos/machines/hera/weechat/default.nix
rename to home-manager/roles/weechat/default.nix
diff --git a/nixos/machines/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl b/home-manager/roles/weechat/plugins/perl/autoload/mass_hl_blocker.pl
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl
rename to home-manager/roles/weechat/plugins/perl/autoload/mass_hl_blocker.pl
diff --git a/nixos/machines/hera/weechat/plugins/perl/mass_hl_blocker.pl b/home-manager/roles/weechat/plugins/perl/mass_hl_blocker.pl
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/perl/mass_hl_blocker.pl
rename to home-manager/roles/weechat/plugins/perl/mass_hl_blocker.pl
diff --git a/nixos/machines/hera/weechat/plugins/python/autojoin_on_invite.py b/home-manager/roles/weechat/plugins/python/autojoin_on_invite.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/autojoin_on_invite.py
rename to home-manager/roles/weechat/plugins/python/autojoin_on_invite.py
diff --git a/nixos/machines/hera/weechat/plugins/python/autoload/autojoin_on_invite.py b/home-manager/roles/weechat/plugins/python/autoload/autojoin_on_invite.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/autoload/autojoin_on_invite.py
rename to home-manager/roles/weechat/plugins/python/autoload/autojoin_on_invite.py
diff --git a/nixos/machines/hera/weechat/plugins/python/autoload/buffer_autoset.py b/home-manager/roles/weechat/plugins/python/autoload/buffer_autoset.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/autoload/buffer_autoset.py
rename to home-manager/roles/weechat/plugins/python/autoload/buffer_autoset.py
diff --git a/nixos/machines/hera/weechat/plugins/python/autoload/go.py b/home-manager/roles/weechat/plugins/python/autoload/go.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/autoload/go.py
rename to home-manager/roles/weechat/plugins/python/autoload/go.py
diff --git a/nixos/machines/hera/weechat/plugins/python/autoload/grep.py b/home-manager/roles/weechat/plugins/python/autoload/grep.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/autoload/grep.py
rename to home-manager/roles/weechat/plugins/python/autoload/grep.py
diff --git a/nixos/machines/hera/weechat/plugins/python/autoload/sortlatest.py b/home-manager/roles/weechat/plugins/python/autoload/sortlatest.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/autoload/sortlatest.py
rename to home-manager/roles/weechat/plugins/python/autoload/sortlatest.py
diff --git a/nixos/machines/hera/weechat/plugins/python/autoload/topicdiff.py b/home-manager/roles/weechat/plugins/python/autoload/topicdiff.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/autoload/topicdiff.py
rename to home-manager/roles/weechat/plugins/python/autoload/topicdiff.py
diff --git a/nixos/machines/hera/weechat/plugins/python/buffer_autoset.py b/home-manager/roles/weechat/plugins/python/buffer_autoset.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/buffer_autoset.py
rename to home-manager/roles/weechat/plugins/python/buffer_autoset.py
diff --git a/nixos/machines/hera/weechat/plugins/python/go.py b/home-manager/roles/weechat/plugins/python/go.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/go.py
rename to home-manager/roles/weechat/plugins/python/go.py
diff --git a/nixos/machines/hera/weechat/plugins/python/grep.py b/home-manager/roles/weechat/plugins/python/grep.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/grep.py
rename to home-manager/roles/weechat/plugins/python/grep.py
diff --git a/nixos/machines/hera/weechat/plugins/python/sortlatest.py b/home-manager/roles/weechat/plugins/python/sortlatest.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/sortlatest.py
rename to home-manager/roles/weechat/plugins/python/sortlatest.py
diff --git a/nixos/machines/hera/weechat/plugins/python/topicdiff.py b/home-manager/roles/weechat/plugins/python/topicdiff.py
similarity index 100%
rename from nixos/machines/hera/weechat/plugins/python/topicdiff.py
rename to home-manager/roles/weechat/plugins/python/topicdiff.py