diff --git a/home/direnv/default.nix b/home/direnv/default.nix
index 16e9009..e88b1eb 100644
--- a/home/direnv/default.nix
+++ b/home/direnv/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.direnv = {
     enable = true;
     enableNushellIntegration = true;
diff --git a/home/git/default.nix b/home/git/default.nix
index 97e41c1..9da85b8 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.git = {
     enable = true;
     delta.enable = true;
diff --git a/home/helix/themes/catppuccin_mocha.nix b/home/helix/themes/catppuccin_mocha.nix
index 23eb7f8..f5a0b66 100644
--- a/home/helix/themes/catppuccin_mocha.nix
+++ b/home/helix/themes/catppuccin_mocha.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.helix = {
     themes.catppuccin_mocha = let
       transparent = "none";
diff --git a/home/lazygit/default.nix b/home/lazygit/default.nix
index 6b7dc72..d5e9a1c 100644
--- a/home/lazygit/default.nix
+++ b/home/lazygit/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.lazygit = {
     enable = true;
     settings = {
diff --git a/home/lf/default.nix b/home/lf/default.nix
index cc128b3..0ffdbf0 100644
--- a/home/lf/default.nix
+++ b/home/lf/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.lf = {
     enable = true;
     settings = {
diff --git a/home/librewolf/default.nix b/home/librewolf/default.nix
index ea4608c..0ba21f0 100644
--- a/home/librewolf/default.nix
+++ b/home/librewolf/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.librewolf = {
     enable = true;
     settings = {
diff --git a/home/mako/default.nix b/home/mako/default.nix
index 85e2cf0..e77411c 100644
--- a/home/mako/default.nix
+++ b/home/mako/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services.mako = {
     enable = true;
     icons = true;
diff --git a/home/nushell/default.nix b/home/nushell/default.nix
index b36fc6a..9539ffc 100644
--- a/home/nushell/default.nix
+++ b/home/nushell/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.nushell = {
     enable = true;
     configFile.source = ./config.nu;
diff --git a/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix
index f848ca7..d12ee5f 100644
--- a/home/wayland/hyprland/config.nix
+++ b/home/wayland/hyprland/config.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   wayland.windowManager.hyprland.extraConfig = ''
 
     monitor = HDMI-A-1,1920x1080,5760x0,1 #right
diff --git a/home/wezterm/default.nix b/home/wezterm/default.nix
index a8083ae..e976593 100644
--- a/home/wezterm/default.nix
+++ b/home/wezterm/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.wezterm = {
     enable = true;
     extraConfig = ''
diff --git a/home/zathura/default.nix b/home/zathura/default.nix
index 551d755..7f0a882 100644
--- a/home/zathura/default.nix
+++ b/home/zathura/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   programs.zathura = {
     enable = true;
     extraConfig = ''
diff --git a/home/zellij/layouts.nix b/home/zellij/layouts.nix
index a024972..c47591d 100644
--- a/home/zellij/layouts.nix
+++ b/home/zellij/layouts.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   home.file.".config/zellij/snowflake.kdl".text = ''
       layout {
         tab name="main" {
diff --git a/hosts/ame/hardware-configuration.nix b/hosts/ame/hardware-configuration.nix
index da12948..e50c068 100644
--- a/hosts/ame/hardware-configuration.nix
+++ b/hosts/ame/hardware-configuration.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/hosts/kariru/default.nix b/hosts/kariru/default.nix
index 10685d7..b91e350 100644
--- a/hosts/kariru/default.nix
+++ b/hosts/kariru/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   imports = [
     ./hardware-configuration.nix
     ./services
diff --git a/hosts/kariru/hardware-configuration.nix b/hosts/kariru/hardware-configuration.nix
index 8553e52..3058345 100644
--- a/hosts/kariru/hardware-configuration.nix
+++ b/hosts/kariru/hardware-configuration.nix
@@ -1,7 +1,5 @@
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/hosts/kariru/services/default.nix b/hosts/kariru/services/default.nix
index c2cbc4f..2f6d51b 100644
--- a/hosts/kariru/services/default.nix
+++ b/hosts/kariru/services/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services.radarr = {
     enable = true;
     openFirewall = true;
diff --git a/hosts/sakura/default.nix b/hosts/sakura/default.nix
index b60ee16..34dfa32 100644
--- a/hosts/sakura/default.nix
+++ b/hosts/sakura/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   imports = [
     ./hardware-configuration.nix
     ./services
diff --git a/hosts/sakura/hardware-configuration.nix b/hosts/sakura/hardware-configuration.nix
index beaa7dc..11bf19f 100644
--- a/hosts/sakura/hardware-configuration.nix
+++ b/hosts/sakura/hardware-configuration.nix
@@ -1,7 +1,5 @@
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/hosts/sakura/home.nix b/hosts/sakura/home.nix
index c8a9536..c7eafac 100644
--- a/hosts/sakura/home.nix
+++ b/hosts/sakura/home.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   imports = [
     ../../home
   ];
diff --git a/hosts/sakura/services/foundryvtt.nix b/hosts/sakura/services/foundryvtt.nix
index fa7017a..77daaf4 100644
--- a/hosts/sakura/services/foundryvtt.nix
+++ b/hosts/sakura/services/foundryvtt.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   sops.secrets.foundry-username = {};
   sops.secrets.foundry-password = {};
   virtualisation.oci-containers.containers.foundryvtt = {
diff --git a/hosts/sakura/services/grafana.nix b/hosts/sakura/services/grafana.nix
index 6e095b3..6a4c807 100644
--- a/hosts/sakura/services/grafana.nix
+++ b/hosts/sakura/services/grafana.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services.grafana = {
     enable = true;
     settings = {
diff --git a/hosts/sakura/services/homepage.nix b/hosts/sakura/services/homepage.nix
index a8ca260..322d7bd 100644
--- a/hosts/sakura/services/homepage.nix
+++ b/hosts/sakura/services/homepage.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   virtualisation.oci-containers.containers.homepage = {
     image = "ghcr.io/benphelps/homepage";
     volumes = [
diff --git a/hosts/sakura/services/jellyfin.nix b/hosts/sakura/services/jellyfin.nix
index 65ecce0..428c334 100644
--- a/hosts/sakura/services/jellyfin.nix
+++ b/hosts/sakura/services/jellyfin.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services.jellyfin = {
     enable = true;
     openFirewall = true;
diff --git a/hosts/sakura/services/prometheus.nix b/hosts/sakura/services/prometheus.nix
index f5e70c9..428b6aa 100644
--- a/hosts/sakura/services/prometheus.nix
+++ b/hosts/sakura/services/prometheus.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services.prometheus = {
     enable = true;
     scrapeConfigs = [
diff --git a/hosts/sakura/services/rustypaste.nix b/hosts/sakura/services/rustypaste.nix
index 9d590c4..8c3cb01 100644
--- a/hosts/sakura/services/rustypaste.nix
+++ b/hosts/sakura/services/rustypaste.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
   sops.secrets.rusty-auth-token = {};
   environment.systemPackages = with pkgs; [rustypaste];
 
diff --git a/hosts/sakura/services/searxng.nix b/hosts/sakura/services/searxng.nix
index 95e8820..036c417 100644
--- a/hosts/sakura/services/searxng.nix
+++ b/hosts/sakura/services/searxng.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   virtualisation.oci-containers.containers.searxng = {
     image = "searxng/searxng";
     volumes = [
diff --git a/hosts/sakura/services/stash.nix b/hosts/sakura/services/stash.nix
index db7f5c7..f9c23bf 100644
--- a/hosts/sakura/services/stash.nix
+++ b/hosts/sakura/services/stash.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   virtualisation.oci-containers.containers.stash = {
     image = "stashapp/stash";
     environment = {
diff --git a/hosts/sakura/services/traefik.nix b/hosts/sakura/services/traefik.nix
index 471abc8..cc6fd00 100644
--- a/hosts/sakura/services/traefik.nix
+++ b/hosts/sakura/services/traefik.nix
@@ -1,14 +1,10 @@
-{config, ...}: {
+_: {
   sops.secrets.cloudflare-api-key = {};
   networking.firewall.allowedTCPPorts = [80 443];
-  systemd.user.services.traefik.after = ["docker.service"];
   systemd.services.traefik = {
     environment = {
       CLOUDFLARE_EMAIL = "jch0tm2e@notohh.dev";
     };
-    serviceConfig = {
-      EnvironmentFile = config.sops.secrets.cloudflare-api-key.path;
-    };
   };
   services.traefik = {
     enable = true;
diff --git a/hosts/tsuki/hardware-configuration.nix b/hosts/tsuki/hardware-configuration.nix
index ee85ad5..8838832 100755
--- a/hosts/tsuki/hardware-configuration.nix
+++ b/hosts/tsuki/hardware-configuration.nix
@@ -1,10 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
@@ -45,14 +41,7 @@
     {device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc";}
   ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
diff --git a/hosts/tsuki/home.nix b/hosts/tsuki/home.nix
index 8e5cca9..7718ec7 100755
--- a/hosts/tsuki/home.nix
+++ b/hosts/tsuki/home.nix
@@ -21,6 +21,7 @@
     username = "notoh";
     homeDirectory = "/home/notoh";
     packages = with pkgs; [
+      brave
       webcord
       discord
       spotify-player
diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix
index fd5360a..3e369c8 100644
--- a/hosts/yuki/default.nix
+++ b/hosts/yuki/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   imports = [
     ./hardware-configuration.nix
     ./services
diff --git a/hosts/yuki/hardware-configuration.nix b/hosts/yuki/hardware-configuration.nix
index 4c9dd66..4feca47 100644
--- a/hosts/yuki/hardware-configuration.nix
+++ b/hosts/yuki/hardware-configuration.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
diff --git a/hosts/yuki/services/kanboard.nix b/hosts/yuki/services/kanboard.nix
index 3636d2e..b02ff71 100644
--- a/hosts/yuki/services/kanboard.nix
+++ b/hosts/yuki/services/kanboard.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   virtualisation.oci-containers.containers.kanboard = {
     image = "kanboard/kanboard";
     ports = [
diff --git a/modules/greetd.nix b/modules/greetd.nix
index d4e04ef..3dd2144 100644
--- a/modules/greetd.nix
+++ b/modules/greetd.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   services.greetd = {
     enable = true;
     settings = rec {
diff --git a/modules/networking.nix b/modules/networking.nix
index adcf361..ad206ef 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   networking = {
     networkmanager.enable = true;
     nameservers = ["192.168.1.221"];
diff --git a/modules/sops.nix b/modules/sops.nix
index 684e9fe..e79cf14 100644
--- a/modules/sops.nix
+++ b/modules/sops.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   sops = {
     defaultSopsFile = ../secrets/secrets.yaml;
     age.keyFile = "/home/notoh/.config/sops/age/keys.txt";
diff --git a/modules/swayidle.nix b/modules/swayidle.nix
index 4385f15..0e57150 100644
--- a/modules/swayidle.nix
+++ b/modules/swayidle.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   home.file.".local/bin/lock" = {
     executable = true;
     text = ''