diff --git a/home/programs/brave/default.nix b/home/programs/brave/default.nix
index 07dcc0b..e6e74e9 100644
--- a/home/programs/brave/default.nix
+++ b/home/programs/brave/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   programs.brave = {
     enable = true;
     commandLineArgs = [
diff --git a/home/programs/nixy/default.nix b/home/programs/nixy/default.nix
index a7cb0a4..80f5990 100644
--- a/home/programs/nixy/default.nix
+++ b/home/programs/nixy/default.nix
@@ -10,7 +10,7 @@
   config,
   ...
 }: let
-  configDirectory = config.var.configDirectory;
+  inherit (config.var) configDirectory;
 
   nixy =
     pkgs.writeShellScriptBin "nixy"
diff --git a/home/programs/qutebrowser/bookmarks.nix b/home/programs/qutebrowser/bookmarks.nix
index c2a85ad..3bdb6e6 100644
--- a/home/programs/qutebrowser/bookmarks.nix
+++ b/home/programs/qutebrowser/bookmarks.nix
@@ -198,7 +198,7 @@
           ++ [
             {
               isRoot = false;
-              item = item;
+              inherit item;
             }
           ];
         pending = [];
@@ -244,7 +244,7 @@
       )
       bookmarkList);
 
-  privateBookmarksPath = config.qutebrowser.privateBookmarksPath;
+  inherit (config.qutebrowser) privateBookmarksPath;
 in {
   options.qutebrowser.privateBookmarksPath = lib.mkOption {
     type = lib.types.nullOr lib.types.str;
diff --git a/home/programs/qutebrowser/search.nix b/home/programs/qutebrowser/search.nix
index 27f48e1..c72434a 100644
--- a/home/programs/qutebrowser/search.nix
+++ b/home/programs/qutebrowser/search.nix
@@ -1,4 +1,4 @@
-{...}: {
+{
   programs.qutebrowser.searchEngines = rec {
     startpage = "https://www.startpage.com/sp/search?q={}";
 
diff --git a/home/programs/qutebrowser/userscripts.nix b/home/programs/qutebrowser/userscripts.nix
index 7d391b5..3ce9611 100644
--- a/home/programs/qutebrowser/userscripts.nix
+++ b/home/programs/qutebrowser/userscripts.nix
@@ -1,4 +1,4 @@
-{...}: {
+{
   xdg.dataFile = {
     # Startpage - hide sponsored results
     "qutebrowser/greasemonkey/startpage-no-ads.user.js".source =
diff --git a/hosts/laptop/secrets/default.nix b/hosts/laptop/secrets/default.nix
index 7cb9115..6199cbe 100644
--- a/hosts/laptop/secrets/default.nix
+++ b/hosts/laptop/secrets/default.nix
@@ -5,7 +5,7 @@
   inputs,
   ...
 }: let
-  home = inputs.home-manager.lib.home;
+  inherit (inputs.home-manager.lib) home;
 in {
   imports = [inputs.sops-nix.homeManagerModules.sops];
 
diff --git a/hosts/server/home.nix b/hosts/server/home.nix
index 208a9c7..398f70e 100644
--- a/hosts/server/home.nix
+++ b/hosts/server/home.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{config, ...}: {
   imports = [
     # Mostly user-specific configuration
     ./variables.nix