diff --git a/hosts/chmura/default.nix b/hosts/chmura/default.nix
index 74a0c8c..89c0034 100644
--- a/hosts/chmura/default.nix
+++ b/hosts/chmura/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./services
         ./trollface.pl
diff --git a/hosts/chmura/services/default.nix b/hosts/chmura/services/default.nix
index 26e1558..d31651e 100644
--- a/hosts/chmura/services/default.nix
+++ b/hosts/chmura/services/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./anki-sync-server.nix
         ./conduit.nix
diff --git a/hosts/chmura/services/freshrss.nix b/hosts/chmura/services/freshrss.nix
index 69ef61b..020033c 100644
--- a/hosts/chmura/services/freshrss.nix
+++ b/hosts/chmura/services/freshrss.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.freshrss = {
         enable = true;
         baseUrl = "http://f.jacekpoz.pl";
diff --git a/hosts/chmura/services/grafana.nix b/hosts/chmura/services/grafana.nix
index 7580e43..71bdd79 100644
--- a/hosts/chmura/services/grafana.nix
+++ b/hosts/chmura/services/grafana.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.grafana = {
         enable = true;
         settings.server = {
diff --git a/hosts/chmura/services/i2pd.nix b/hosts/chmura/services/i2pd.nix
index ff3050b..6a3dea3 100644
--- a/hosts/chmura/services/i2pd.nix
+++ b/hosts/chmura/services/i2pd.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.i2pd = {
         enable = true;
         ifname = "enp6s0";
diff --git a/hosts/chmura/services/ntfy-sh.nix b/hosts/chmura/services/ntfy-sh.nix
index 9b7e052..f21c669 100644
--- a/hosts/chmura/services/ntfy-sh.nix
+++ b/hosts/chmura/services/ntfy-sh.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.ntfy-sh = {
         enable = true;
         settings = {
diff --git a/hosts/chmura/services/restic.nix b/hosts/chmura/services/restic.nix
index d6c7b9f..f5dfea0 100644
--- a/hosts/chmura/services/restic.nix
+++ b/hosts/chmura/services/restic.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.restic = {
         server = {
             enable = true;
diff --git a/hosts/chmura/services/stalwart.nix b/hosts/chmura/services/stalwart.nix
index 204978c..561145c 100644
--- a/hosts/chmura/services/stalwart.nix
+++ b/hosts/chmura/services/stalwart.nix
@@ -1,4 +1,4 @@
-{
+_: {
     users.users.stalwart = {
         isSystemUser = true;
         group = "stalwart";
diff --git a/hosts/chmura/services/sudo-parental-control.nix b/hosts/chmura/services/sudo-parental-control.nix
index c50c64a..be9597b 100644
--- a/hosts/chmura/services/sudo-parental-control.nix
+++ b/hosts/chmura/services/sudo-parental-control.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.caddy = {
         enable = true;
         virtualHosts."sudo-parental-control.jacekpoz.pl".extraConfig = ''
diff --git a/hosts/chmura/services/transmission.nix b/hosts/chmura/services/transmission.nix
index c9b101e..ffd6a72 100644
--- a/hosts/chmura/services/transmission.nix
+++ b/hosts/chmura/services/transmission.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.transmission = {
         enable = true;
         home = "/media/Torrent";
diff --git a/hosts/chmura/trollface.pl/default.nix b/hosts/chmura/trollface.pl/default.nix
index 7bfbc64..60c56ff 100644
--- a/hosts/chmura/trollface.pl/default.nix
+++ b/hosts/chmura/trollface.pl/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.caddy = {
         enable = true;
         virtualHosts."trollface.pl".extraConfig = ''
diff --git a/hosts/common/core/binary-caches.nix b/hosts/common/core/binary-caches.nix
index 2948233..525d13f 100644
--- a/hosts/common/core/binary-caches.nix
+++ b/hosts/common/core/binary-caches.nix
@@ -1,4 +1,4 @@
-{
+_: {
     nix.settings = {
         substituters = [
             "https://nix-community.cachix.org"
diff --git a/hosts/common/core/dbus.nix b/hosts/common/core/dbus.nix
index 7cb4542..d305f40 100644
--- a/hosts/common/core/dbus.nix
+++ b/hosts/common/core/dbus.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.dbus = {
         enable = true;
         implementation = "broker";
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 50481a6..65445e6 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./binary-caches.nix
         ./dash.nix
diff --git a/hosts/common/core/disable-nano.nix b/hosts/common/core/disable-nano.nix
index 652d94d..8879f34 100644
--- a/hosts/common/core/disable-nano.nix
+++ b/hosts/common/core/disable-nano.nix
@@ -1,4 +1,4 @@
-{
+_: {
     # neovim supremacy
     programs.nano.enable = false;
 }
diff --git a/hosts/common/core/disk.nix b/hosts/common/core/disk.nix
index 303dfeb..074fb69 100644
--- a/hosts/common/core/disk.nix
+++ b/hosts/common/core/disk.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services = {
         btrfs.autoScrub = {
             enable = true;
diff --git a/hosts/common/core/oomd.nix b/hosts/common/core/oomd.nix
index bfe6d4a..64b06d9 100644
--- a/hosts/common/core/oomd.nix
+++ b/hosts/common/core/oomd.nix
@@ -1,4 +1,4 @@
-{
+_: {
     systemd.oomd = {
         enable = true;
         enableSystemSlice = true;
diff --git a/hosts/common/core/switch-ng.nix b/hosts/common/core/switch-ng.nix
index bcacf0a..cdab679 100644
--- a/hosts/common/core/switch-ng.nix
+++ b/hosts/common/core/switch-ng.nix
@@ -1,4 +1,4 @@
-{
+_: {
     system.switch = {
         enable = false;
         enableNg = true;
diff --git a/hosts/common/core/systemd-boot.nix b/hosts/common/core/systemd-boot.nix
index 142f75b..06d3e9f 100644
--- a/hosts/common/core/systemd-boot.nix
+++ b/hosts/common/core/systemd-boot.nix
@@ -1,4 +1,4 @@
-{
+_: {
     boot.loader = {
         systemd-boot = {
             enable = true;
diff --git a/hosts/common/core/timezone.nix b/hosts/common/core/timezone.nix
index 2ba1221..ebdf39c 100644
--- a/hosts/common/core/timezone.nix
+++ b/hosts/common/core/timezone.nix
@@ -1,3 +1,3 @@
-{
+_: {
     time.timeZone = "Europe/Warsaw";
 }
diff --git a/hosts/common/desktop/bluetooth.nix b/hosts/common/desktop/bluetooth.nix
index ebae0ce..4a59511 100644
--- a/hosts/common/desktop/bluetooth.nix
+++ b/hosts/common/desktop/bluetooth.nix
@@ -1,4 +1,4 @@
-{
+_: {
     hardware.bluetooth = {
         enable = true;
         input.General.ClassicBondedOnly = true;
diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix
index 0707a14..aa5e451 100644
--- a/hosts/common/desktop/default.nix
+++ b/hosts/common/desktop/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./bluetooth.nix
         ./fonts.nix
diff --git a/hosts/common/desktop/malloc-perturb.nix b/hosts/common/desktop/malloc-perturb.nix
index b274433..793f66a 100644
--- a/hosts/common/desktop/malloc-perturb.nix
+++ b/hosts/common/desktop/malloc-perturb.nix
@@ -1,4 +1,4 @@
-{
+_: {
     environment.sessionVariables = {
         MALLOC_PERTURB_ = /*sh*/"$(($(head -200 /dev/urandom | cksum | cut -f1 -d ' ') % 255 + 1))";
     };
diff --git a/hosts/common/optional/asusd.nix b/hosts/common/optional/asusd.nix
index e8b9954..cfaf316 100644
--- a/hosts/common/optional/asusd.nix
+++ b/hosts/common/optional/asusd.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.asusd = {
         enable = true;
         enableUserService = true;
diff --git a/hosts/common/optional/cpu/amd.nix b/hosts/common/optional/cpu/amd.nix
index ff0826e..fd8f2a1 100644
--- a/hosts/common/optional/cpu/amd.nix
+++ b/hosts/common/optional/cpu/amd.nix
@@ -1,4 +1,4 @@
-{
+_: {
     hardware.cpu.amd.updateMicrocode = true;
 
     boot.initrd.kernelModules = [ "amdgpu" ];
diff --git a/hosts/common/optional/cpu/intel.nix b/hosts/common/optional/cpu/intel.nix
index 81b1063..29ad5da 100644
--- a/hosts/common/optional/cpu/intel.nix
+++ b/hosts/common/optional/cpu/intel.nix
@@ -1,4 +1,4 @@
-{
+_: {
     hardware.cpu.intel.updateMicrocode = true;
 
     services.thermald.enable = true;
diff --git a/hosts/common/optional/opentabletdriver.nix b/hosts/common/optional/opentabletdriver.nix
index 9e21093..a5dd053 100644
--- a/hosts/common/optional/opentabletdriver.nix
+++ b/hosts/common/optional/opentabletdriver.nix
@@ -1,4 +1,4 @@
-{
+_: {
     hardware.opentabletdriver = {
         enable = true;
         daemon.enable = true;
diff --git a/hosts/common/optional/steam.nix b/hosts/common/optional/steam.nix
index 34b561f..eeaaa98 100644
--- a/hosts/common/optional/steam.nix
+++ b/hosts/common/optional/steam.nix
@@ -1,3 +1,3 @@
-{
+_: {
     programs.steam.enable = true;
 }
diff --git a/hosts/common/optional/waydroid.nix b/hosts/common/optional/waydroid.nix
index abc9169..b340a0e 100644
--- a/hosts/common/optional/waydroid.nix
+++ b/hosts/common/optional/waydroid.nix
@@ -1,3 +1,3 @@
-{
+_: {
     virtualisation.waydroid.enable = true;
 }
diff --git a/hosts/common/optional/wayland.nix b/hosts/common/optional/wayland.nix
index e6b0449..8eab24a 100644
--- a/hosts/common/optional/wayland.nix
+++ b/hosts/common/optional/wayland.nix
@@ -1,4 +1,4 @@
-{
+_: {
     environment.sessionVariables = {
         NIXOS_OZONE_WL = "1";
     };
diff --git a/hosts/del/default.nix b/hosts/del/default.nix
index bbcca3b..20bb82a 100644
--- a/hosts/del/default.nix
+++ b/hosts/del/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./quickshell
         ./configuration.nix
diff --git a/hosts/del/git.nix b/hosts/del/git.nix
index 68c8055..383a2cf 100644
--- a/hosts/del/git.nix
+++ b/hosts/del/git.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.programs.git = {
         enable = true;
         userName = "jacekpoz";
diff --git a/hosts/del/quickshell/default.nix b/hosts/del/quickshell/default.nix
index 5da4e55..9db3557 100644
--- a/hosts/del/quickshell/default.nix
+++ b/hosts/del/quickshell/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.programs.quickshell = {
         enable = true;
         enabledConfigs = [
diff --git a/hosts/del/ssh.nix b/hosts/del/ssh.nix
index 12cadcb..7bf910a 100644
--- a/hosts/del/ssh.nix
+++ b/hosts/del/ssh.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.services.ssh = {
         daemon.enable = false;
         agent = {
diff --git a/hosts/hape/default.nix b/hosts/hape/default.nix
index 7ea42be..9775894 100644
--- a/hosts/hape/default.nix
+++ b/hosts/hape/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./configuration.nix
         ./hardware-configuration.nix
diff --git a/hosts/niks/default.nix b/hosts/niks/default.nix
index 5d10392..a79c062 100644
--- a/hosts/niks/default.nix
+++ b/hosts/niks/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./quickshell
         ./configuration.nix
diff --git a/hosts/niks/git.nix b/hosts/niks/git.nix
index 68c8055..383a2cf 100644
--- a/hosts/niks/git.nix
+++ b/hosts/niks/git.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.programs.git = {
         enable = true;
         userName = "jacekpoz";
diff --git a/hosts/niks/quickshell/default.nix b/hosts/niks/quickshell/default.nix
index 3e7fb30..0a36969 100644
--- a/hosts/niks/quickshell/default.nix
+++ b/hosts/niks/quickshell/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.programs.quickshell = {
         enable = true;
         enabledConfigs = [
diff --git a/hosts/niks/restic.nix b/hosts/niks/restic.nix
index 805c0d9..609bdef 100644
--- a/hosts/niks/restic.nix
+++ b/hosts/niks/restic.nix
@@ -1,4 +1,4 @@
-{
+_: {
     services.restic.backups = {
         chmuraBackup = {
             extraOptions = [
diff --git a/hosts/niks/ssh.nix b/hosts/niks/ssh.nix
index 12cadcb..7bf910a 100644
--- a/hosts/niks/ssh.nix
+++ b/hosts/niks/ssh.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.services.ssh = {
         daemon.enable = false;
         agent = {
diff --git a/hosts/work/default.nix b/hosts/work/default.nix
index bbcca3b..20bb82a 100644
--- a/hosts/work/default.nix
+++ b/hosts/work/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./quickshell
         ./configuration.nix
diff --git a/hosts/work/quickshell/default.nix b/hosts/work/quickshell/default.nix
index 5da4e55..9db3557 100644
--- a/hosts/work/quickshell/default.nix
+++ b/hosts/work/quickshell/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.programs.quickshell = {
         enable = true;
         enabledConfigs = [
diff --git a/hosts/work/ssh.nix b/hosts/work/ssh.nix
index 898aa93..fb97e70 100644
--- a/hosts/work/ssh.nix
+++ b/hosts/work/ssh.nix
@@ -1,4 +1,4 @@
-{
+_: {
     poz.services.ssh = {
         daemon.enable = false;
         agent = {
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index eec5692..66e7be8 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./agenix.nix
         ./git.nix
diff --git a/modules/default.nix b/modules/default.nix
index fee4a87..7a89638 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./cli
         ./gui
diff --git a/modules/gui/default.nix b/modules/gui/default.nix
index ed9b7cf..7a80c9c 100644
--- a/modules/gui/default.nix
+++ b/modules/gui/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./hypr
         ./quickshell
diff --git a/modules/gui/hypr/default.nix b/modules/gui/hypr/default.nix
index e041a34..2cf865e 100644
--- a/modules/gui/hypr/default.nix
+++ b/modules/gui/hypr/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./idle.nix
         ./land.nix
diff --git a/modules/other/default.nix b/modules/other/default.nix
index 1265a2c..bb3f458 100644
--- a/modules/other/default.nix
+++ b/modules/other/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./hardware.nix
         ./home-manager.nix
diff --git a/modules/services/default.nix b/modules/services/default.nix
index e452094..68adb96 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./dunst.nix
         ./greetd.nix
diff --git a/modules/tui/default.nix b/modules/tui/default.nix
index cd728af..e845d80 100644
--- a/modules/tui/default.nix
+++ b/modules/tui/default.nix
@@ -1,4 +1,4 @@
-{
+_: {
     imports = [
         ./neovim
         ./btop.nix
diff --git a/modules/tui/neovim/default.nix b/modules/tui/neovim/default.nix
index 6ce8b96..21838ad 100644
--- a/modules/tui/neovim/default.nix
+++ b/modules/tui/neovim/default.nix
@@ -1,4 +1,4 @@
- {
+ _: {
     imports = [
         ./config.nix
     ];