2023-02-19

35 files changed, 21 insertions, 86 deletions

diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix
index f414447..2fc9b39 100644
--- a/darwinConfigurations/mairon/default.nix
+++ b/darwinConfigurations/mairon/default.nix
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   this,
diff --git a/flake.nix b/flake.nix
index a4a9c4c..0563808 100644
--- a/flake.nix
+++ b/flake.nix
@@ -294,6 +294,7 @@
           src = ./.;
           hooks = {
             alejandra.enable = true;
+            deadnix.enable = true;
             prettier = {
               enable = true;
               types = [];
@@ -303,6 +304,7 @@
             shfmt.enable = true;
             statix.enable = true;
           };
+          settings.deadnix.edit = true;
         };
       })
       // {
diff --git a/lib/my.nix b/lib/my.nix
index 08db155..fbd5462 100644
--- a/lib/my.nix
+++ b/lib/my.nix
@@ -9,13 +9,6 @@ with lib;
             attrsOf (submodule ({name, ...}: {
               freeformType = attrs;
               options = let
-                mkConfigurationArchOption = type:
-                  mkOption {
-                    description = "Whether the machine's architecture is a ${type} one.";
-                    type = bool;
-                    default = false;
-                  };
-
                 mkConfigurationTypeOption = type:
                   mkOption {
                     description = "Whether the machine's functional type is a ${type} one.";
diff --git a/modules/common/aria2.nix b/modules/common/aria2.nix
index f33acb9..449d96c 100644
--- a/modules/common/aria2.nix
+++ b/modules/common/aria2.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/common/common/documentation.nix b/modules/common/common/documentation.nix
index 55f6138..e9d4a79 100644
--- a/modules/common/common/documentation.nix
+++ b/modules/common/common/documentation.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   this,
   ...
 }:
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 7395c51..bdbbf43 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  inputs,
   lib,
   pkgs,
   pkgsStable,
diff --git a/modules/common/openconnect.nix b/modules/common/openconnect.nix
index 780f93f..936c9d1 100644
--- a/modules/common/openconnect.nix
+++ b/modules/common/openconnect.nix
@@ -10,7 +10,7 @@ in {
   options.nixfiles.modules.openconnect.enable =
     mkEnableOption "OpenConnect VPN";
 
-  config = mkIf.enable {
+  config = mkIf cfg.enable {
     assertions = [
       {
         assertion = config.networking.networkmanager.enable;
@@ -35,7 +35,7 @@ in {
     networking.networkmanager.plugins = with pkgs; [
       ((networkmanager-openconnect.override {
           withGnome = false;
-          openconnect = openconnect.overrideAttrs (_: super: {
+          openconnect = openconnect.overrideAttrs (_: _: {
             version = "unstable-2022-10-23";
             src = fetchFromGitLab {
               owner = "openconnect";
diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix
index b05aeac..366590f 100644
--- a/modules/common/profiles/dev/default.nix
+++ b/modules/common/profiles/dev/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/common/vim/default.nix b/modules/common/vim/default.nix
index 0328e10..2ee8a0b 100644
--- a/modules/common/vim/default.nix
+++ b/modules/common/vim/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/common/vscode.nix b/modules/common/vscode.nix
index 6671973..92ce5b5 100644
--- a/modules/common/vscode.nix
+++ b/modules/common/vscode.nix
@@ -132,35 +132,15 @@ in {
 
         git.allowForcePush = true;
 
-        vim = let
-          applyInputMethod = {
-            "ibus" = let
-              bin = "${pkgs.ibus}/bin/ibus";
-            in {
-              enable = true;
-              defaultIM = "xkb:us::eng";
-              obtainIMCmd = "${bin} engine";
-              switchIMCmd = "${bin} engine {im}";
-            };
-            "fcitx" = let
-              bin = "${pkgs.fcitx}/bin/fcitx-remote";
-            in {
-              enable = true;
-              defaultIM = "1";
-              obtainIMCmd = bin;
-              switchIMCmd = "${bin} -t {im}";
-            };
-          };
-        in
-          mkIf cfg.vim.enable rec {
-            easymotion = true;
-            easymotionMarkerFontFamily = fontFamily;
-            easymotionMarkerFontSize = fontSize;
+        vim = mkIf cfg.vim.enable rec {
+          easymotion = true;
+          easymotionMarkerFontFamily = fontFamily;
+          easymotionMarkerFontSize = fontSize;
 
-            leader = " ";
+          leader = " ";
 
-            useSystemClipboard = true;
-          };
+          useSystemClipboard = true;
+        };
       };
     };
   };
diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index 35e8e77..990afae 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -1,8 +1,6 @@
 {
   config,
-  inputs,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/darwin/profiles/default.nix b/modules/darwin/profiles/default.nix
index 3e783b9..ac3f652 100644
--- a/modules/darwin/profiles/default.nix
+++ b/modules/darwin/profiles/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/darwin/profiles/headful.nix b/modules/darwin/profiles/headful.nix
index 5484dfe..2a4c773 100644
--- a/modules/darwin/profiles/headful.nix
+++ b/modules/darwin/profiles/headful.nix
@@ -1,8 +1,6 @@
 {
   config,
   lib,
-  pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/android.nix b/modules/nixos/android.nix
index 307490a..41b7ef9 100644
--- a/modules/nixos/android.nix
+++ b/modules/nixos/android.nix
@@ -1,8 +1,6 @@
 {
   config,
   lib,
-  inputs,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/bluetooth.nix b/modules/nixos/bluetooth.nix
index 76131bf..26d081d 100644
--- a/modules/nixos/bluetooth.nix
+++ b/modules/nixos/bluetooth.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/common/nix.nix b/modules/nixos/common/nix.nix
index 48c52b3..efebe97 100644
--- a/modules/nixos/common/nix.nix
+++ b/modules/nixos/common/nix.nix
@@ -2,7 +2,6 @@
   config,
   inputs,
   lib,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/common/security.nix b/modules/nixos/common/security.nix
index d146cee..7a3d3b3 100644
--- a/modules/nixos/common/security.nix
+++ b/modules/nixos/common/security.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  lib,
-  ...
-}:
+{lib, ...}:
 with lib; {
   security = {
     sudo = {
diff --git a/modules/nixos/endlessh.nix b/modules/nixos/endlessh.nix
index 67789fd..1350a6a 100644
--- a/modules/nixos/endlessh.nix
+++ b/modules/nixos/endlessh.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/matrix/synapse.nix b/modules/nixos/matrix/synapse.nix
index 6ff5e0d..1117f23 100644
--- a/modules/nixos/matrix/synapse.nix
+++ b/modules/nixos/matrix/synapse.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/monitoring/default.nix b/modules/nixos/monitoring/default.nix
index 57a0d09..a48701e 100644
--- a/modules/nixos/monitoring/default.nix
+++ b/modules/nixos/monitoring/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/openssh.nix b/modules/nixos/openssh.nix
index 6f4614c..164f5bb 100644
--- a/modules/nixos/openssh.nix
+++ b/modules/nixos/openssh.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/postgresql.nix b/modules/nixos/postgresql.nix
index df05e7e..79515e8 100644
--- a/modules/nixos/postgresql.nix
+++ b/modules/nixos/postgresql.nix
@@ -43,6 +43,9 @@ in {
 
         inherit (cfg) package;
 
+        # In hindsight, it was a poor choice to use ICU as a locale provider.
+        # Now each time ICU version is bumped, I need to carefully upgrade each
+        # database to match the version.
         initdbArgs = [
           "--encoding=UTF8"
           "--locale-provider=icu"
@@ -52,6 +55,9 @@ in {
           "--lc-ctype=C"
         ];
 
+        # This crutch is here because some services cannot work via a UNIX
+        # socket connection and I can't be bothered to configure proper
+        # authentication.
         authentication = ''
           local all all trust
         '';
diff --git a/modules/nixos/profiles/default.nix b/modules/nixos/profiles/default.nix
index 0c78b0f..e19d8b1 100644
--- a/modules/nixos/profiles/default.nix
+++ b/modules/nixos/profiles/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/profiles/dev/default.nix b/modules/nixos/profiles/dev/default.nix
index 8cb2356..bba8ebd 100644
--- a/modules/nixos/profiles/dev/default.nix
+++ b/modules/nixos/profiles/dev/default.nix
@@ -1,8 +1,6 @@
 {
   config,
   lib,
-  pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/profiles/headful.nix b/modules/nixos/profiles/headful.nix
index ede921a..71addbf 100644
--- a/modules/nixos/profiles/headful.nix
+++ b/modules/nixos/profiles/headful.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/profiles/headless.nix b/modules/nixos/profiles/headless.nix
index efe4d03..40f68ed 100644
--- a/modules/nixos/profiles/headless.nix
+++ b/modules/nixos/profiles/headless.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  this,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/syncthing.nix b/modules/nixos/syncthing.nix
index b690ab4..b0d98bc 100644
--- a/modules/nixos/syncthing.nix
+++ b/modules/nixos/syncthing.nix
@@ -2,7 +2,6 @@
   config,
   inputs,
   lib,
-  pkgs,
   this,
   ...
 }:
diff --git a/modules/nixos/x11.nix b/modules/nixos/x11.nix
index cd8dfbe..f2d850b 100644
--- a/modules/nixos/x11.nix
+++ b/modules/nixos/x11.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
diff --git a/modules/nixos/xmonad.nix b/modules/nixos/xmonad.nix
index 2cc7ad6..da005b2 100644
--- a/modules/nixos/xmonad.nix
+++ b/modules/nixos/xmonad.nix
@@ -1,6 +1,5 @@
 {
   config,
-  inputs,
   lib,
   pkgs,
   ...
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index 3bd7230..a5a07ab 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  this,
   ...
 }:
 with lib; {
diff --git a/nixosConfigurations/iso/default.nix b/nixosConfigurations/iso/default.nix
index 914fea9..d491bb8 100644
--- a/nixosConfigurations/iso/default.nix
+++ b/nixosConfigurations/iso/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
+{lib, ...}:
 with lib; {
   secrets = mkForce {};
 
diff --git a/nixosConfigurations/manwe/default.nix b/nixosConfigurations/manwe/default.nix
index 2262501..12d929e 100644
--- a/nixosConfigurations/manwe/default.nix
+++ b/nixosConfigurations/manwe/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  this,
   ...
 }:
 with lib; {
diff --git a/nixosConfigurations/melian/default.nix b/nixosConfigurations/melian/default.nix
index f4efcd9..d38e09b 100644
--- a/nixosConfigurations/melian/default.nix
+++ b/nixosConfigurations/melian/default.nix
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...
diff --git a/nixosConfigurations/varda/default.nix b/nixosConfigurations/varda/default.nix
index db4d86e..ea1dc3c 100644
--- a/nixosConfigurations/varda/default.nix
+++ b/nixosConfigurations/varda/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  this,
-  ...
-}:
+{lib, ...}:
 with lib; {
   nixfiles.modules = {
     wireguard.client.enable = true;
diff --git a/nixosConfigurations/yavanna/default.nix b/nixosConfigurations/yavanna/default.nix
index 3073caa..84d4493 100644
--- a/nixosConfigurations/yavanna/default.nix
+++ b/nixosConfigurations/yavanna/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  this,
-  ...
-}:
+{lib, ...}:
 with lib; {
   nixfiles.modules = {
     wireguard.client.enable = true;