2022-08-20

91 files changed, 250 insertions, 270 deletions

diff --git a/configurations/melian/default.nix b/configurations/melian/default.nix
index 6703d0f..710f26c 100644
--- a/configurations/melian/default.nix
+++ b/configurations/melian/default.nix
@@ -30,6 +30,7 @@ with lib; {
 
     games = {
       lutris.enable = true;
+      minecraft.client.enable = true;
       steam.enable = true;
     };
 
@@ -157,16 +158,16 @@ with lib; {
   };
 
   fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/1083-C8A0";
+      fsType = "vfat";
+    };
+
     "/" = {
       device = "/dev/disk/by-uuid/bb8b09dc-cc67-47e5-8280-532b17a9e62a";
       fsType = "xfs";
       options = ["noatime"];
     };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/1083-C8A0";
-      fsType = "vfat";
-    };
   };
 
   # NOTE This will make hibernation extremely hard if on an encrypted partition.
diff --git a/configurations/varda/default.nix b/configurations/varda/default.nix
index b9d84f7..f700df5 100644
--- a/configurations/varda/default.nix
+++ b/configurations/varda/default.nix
@@ -14,12 +14,13 @@ with lib; {
       client.enable = true;
     };
 
-    acme.enable = true;
+    games.minecraft.server.enable = true;
 
-    rss-bridge.enable = true;
-    radicale.enable = true;
+    acme.enable = true;
   };
 
+  systemd.services.minecraft-server.wantedBy = mkForce [];
+
   networking = let
     interface = "eth0";
   in {
@@ -51,41 +52,26 @@ with lib; {
   };
 
   boot = {
-    loader.grub = {
-      enable = true;
-      device = "/dev/sda";
-    };
-
-    initrd = {
-      luks.devices.nixos = {
-        device = "/dev/sda2";
-        allowDiscards = true;
-        bypassWorkqueues = true;
-      };
+    loader = {
+      efi.canTouchEfiVariables = true;
 
-      network = {
+      systemd-boot = {
         enable = true;
-        ssh = {
-          enable = true;
-          port = head config.services.openssh.ports;
-          hostKeys = map (k: k.path) config.services.openssh.hostKeys;
-          authorizedKeys = config.my.openssh.authorizedKeys.keys;
-        };
+        configurationLimit = 10;
       };
-
-      availableKernelModules = ["ata_piix" "sd_mod" "sr_mod" "uhci_hcd" "virtio_pci" "virtio_scsi"];
     };
+
+    initrd.availableKernelModules = ["ata_piix" "sd_mod" "sr_mod" "uhci_hcd" "virtio_pci" "virtio_scsi"];
   };
 
   fileSystems = {
     "/boot" = {
-      device = "LABEL=boot";
-      fsType = "xfs";
-      options = ["noatime"];
+      device = "/dev/disk/by-uuid/03FD-B6C0";
+      fsType = "vfat";
     };
 
     "/" = {
-      device = "LABEL=nixos";
+      device = "/dev/disk/by-uuid/b07e8273-915a-424c-8c55-cdc2bd482f49";
       fsType = "xfs";
       options = ["noatime"];
     };
diff --git a/flake.lock b/flake.lock
index 00c4b60..09e134a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -81,11 +81,11 @@
     "doom-emacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1660594365,
-        "narHash": "sha256-qdv8scMO91kRk1JNyU2el/TO4tC+Uu7N4NiH55PCsuQ=",
+        "lastModified": 1660835296,
+        "narHash": "sha256-dEg/Ck0S6HZUO3VAVvd5oWyxitaKy7+DLljNq3Slpr0=",
         "owner": "doomemacs",
         "repo": "doomemacs",
-        "rev": "050624d47532cef18fcb41daa4e626576b00659c",
+        "rev": "4c9df9bfc63d2c3a9e20e20deaa854072e379f47",
         "type": "github"
       },
       "original": {
@@ -121,11 +121,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1660709019,
-        "narHash": "sha256-Wh21bk48CIIDCTtjkP+zvh+SPW9g4kKdFOksFKhlwNI=",
+        "lastModified": 1660905973,
+        "narHash": "sha256-ewfVcGu4jkFpR0VHsrZ1noDikrX5I6ZpfOxLLwV5tfQ=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8925d05d615773f5407669a2e9ec00212eb0edab",
+        "rev": "29d3a70af302db1ebb25672d68ada374ef64fad6",
         "type": "github"
       },
       "original": {
@@ -356,11 +356,11 @@
         "ws-butler": "ws-butler"
       },
       "locked": {
-        "lastModified": 1660735200,
-        "narHash": "sha256-w2KFN7C57BwI+lRxEWV7NbmBa5SZYfb2Ey66wUl0jX4=",
+        "lastModified": 1660935307,
+        "narHash": "sha256-XzIcFkcTsScS7blStWdPNXJ74FYPRbgTc30NvKeFzu8=",
         "owner": "thiagokokada",
         "repo": "nix-doom-emacs",
-        "rev": "0824726167f27e911f27b657b812cbbadb42d619",
+        "rev": "f9dee4bac7b93478c2c3fbee496ed2d1a923f9fa",
         "type": "github"
       },
       "original": {
@@ -404,11 +404,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1660639432,
-        "narHash": "sha256-2WDiboOCfB0LhvnDVMXOAr8ZLDfm3WdO54CkoDPwN1A=",
+        "lastModified": 1660817299,
+        "narHash": "sha256-0QZE5FYLOyTEpKobPk32gxAQBtYs/nAfGx3PK+x6bXI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c6409e965a6c883677be7b9d87a95fab6c3472e",
+        "rev": "b42e50fe36242b1b205a7d501b7911d698218086",
         "type": "github"
       },
       "original": {
@@ -420,11 +420,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1660731184,
-        "narHash": "sha256-/lpDvKuDyfmT4T1hpr7oefuJgHolJhMswfu00ffp6Yg=",
+        "lastModified": 1660940514,
+        "narHash": "sha256-C/HWcxehnURbvkdUivcFCqXUjo2MpRZ5TnH5+F0ThiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7ed0a6f85f4f86acd0fde7ba91f7cea4b9d7c0a9",
+        "rev": "1ab9224ebe9bc8fd732ff305b7c6c0e07dd9acb0",
         "type": "github"
       },
       "original": {
@@ -436,11 +436,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1660731042,
-        "narHash": "sha256-1mhk4tjcWqRonAdwCBJGCqkCTpAClVq4e5Oq+5Ub1AQ=",
+        "lastModified": 1660926553,
+        "narHash": "sha256-19Ib1b7Ny+yGhnxwnH1KhhB2hvALuNuqevA6XzqkQmo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9a1fde0e0ca319298b1199b88f2072780e8be006",
+        "rev": "00e376e3f3c22d991052dfeaf154c42b09deeb29",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1660729865,
-        "narHash": "sha256-EuZLr68j5/Ub7iekCVkZ92L8nq5oMTo7sQo4Rg9RQyI=",
+        "lastModified": 1660940739,
+        "narHash": "sha256-W90WXs+24U2JnIcvLtFOuW22XGX/1BTyvD7i7eBdPiw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d642aa0bcf99b706d26388d28c2f06cbf8813652",
+        "rev": "06963ab332e46659174de0a08e79885c86e3aa49",
         "type": "github"
       },
       "original": {
@@ -535,11 +535,11 @@
     "org": {
       "flake": false,
       "locked": {
-        "lastModified": 1660447962,
-        "narHash": "sha256-EShZzaIDe2Dt/9dLTgypvvW809qEggN5ia1Vssmc27M=",
+        "lastModified": 1660824704,
+        "narHash": "sha256-rEjxbktmMt1dFlF7Dd6+bo0oAYCOP/ylfcRDeCCgb58=",
         "owner": "emacs-straight",
         "repo": "org-mode",
-        "rev": "3303a54d74805cdd2b6eda37285f259949f7ba2e",
+        "rev": "f28288c255e293591725cbcd02637707bc9a77c2",
         "type": "github"
       },
       "original": {
@@ -606,11 +606,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1659629599,
-        "narHash": "sha256-c9rvaqaH3HZo/C70E7rB18YSywa4ryTtN7CZ3cuCmoA=",
+        "lastModified": 1660830093,
+        "narHash": "sha256-HUhx3a82C7bgp2REdGFeHJdhEAzMGCk3V8xIvfBqg1I=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "6a9402e8f233de16536349d1dd3f4595c23386a4",
+        "rev": "8cb8ea5f1c7bc2984f460587fddd5f2e558f6eb8",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c708930..c48bfe8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,11 @@
       ref = "release-22.05";
     };
 
+    # nixpkgs-local = {
+    #   type = "path";
+    #   path = "/home/azahi/src/nixpkgs";
+    # };
+
     nixos-hardware = {
       type = "github";
       owner = "NixOS";
@@ -63,6 +68,7 @@
       };
     };
 
+    # FIXME https://github.com/nix-community/nix-doom-emacs/pull/248
     nix-doom-emacs = {
       type = "github";
       owner = "thiagokokada";
diff --git a/modules/nixfiles/acme.nix b/modules/nixfiles/acme.nix
index 196a6a5..d3ad661 100644
--- a/modules/nixfiles/acme.nix
+++ b/modules/nixfiles/acme.nix
@@ -11,7 +11,7 @@ in {
   ];
 
   options.nixfiles.modules.acme = {
-    enable = mkEnableOption "Whether to enable ACME.";
+    enable = mkEnableOption "ACME";
 
     email = mkOption {
       description = "Email for notifications.";
diff --git a/modules/nixfiles/alacritty.nix b/modules/nixfiles/alacritty.nix
index 8b3e646..4afd11b 100644
--- a/modules/nixfiles/alacritty.nix
+++ b/modules/nixfiles/alacritty.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.alacritty;
 in {
   options.nixfiles.modules.alacritty.enable =
-    mkEnableOption "Whether to enable Alacritty terminal emulator.";
+    mkEnableOption "Alacritty terminal emulator";
 
   config = mkIf cfg.enable {
     hm.programs.alacritty = {
diff --git a/modules/nixfiles/alertmanager.nix b/modules/nixfiles/alertmanager.nix
index d903ee3..5d9ca30 100644
--- a/modules/nixfiles/alertmanager.nix
+++ b/modules/nixfiles/alertmanager.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.alertmanager;
 in {
   options.nixfiles.modules.alertmanager = {
-    enable = mkEnableOption "Whether to enable Alertmanager.";
+    enable = mkEnableOption "Alertmanager";
 
     port = mkOption {
       description = "Port.";
diff --git a/modules/nixfiles/aria2.nix b/modules/nixfiles/aria2.nix
index 87f2109..a9b5d42 100644
--- a/modules/nixfiles/aria2.nix
+++ b/modules/nixfiles/aria2.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.aria2;
 in {
   options.nixfiles.modules.aria2.enable =
-    mkEnableOption "Whether to enable aria2.";
+    mkEnableOption "aria2";
 
   config = mkIf cfg.enable {
     hm = {
diff --git a/modules/nixfiles/aspell.nix b/modules/nixfiles/aspell.nix
index 7669eb9..f397944 100644
--- a/modules/nixfiles/aspell.nix
+++ b/modules/nixfiles/aspell.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.aspell;
 in {
   options.nixfiles.modules.aspell.enable =
-    mkEnableOption "Whether to enable GNU Aspell.";
+    mkEnableOption "GNU Aspell";
 
   config = mkIf cfg.enable {
     hm.home = {
diff --git a/modules/nixfiles/bat.nix b/modules/nixfiles/bat.nix
index d4bb1d6..4a98f99 100644
--- a/modules/nixfiles/bat.nix
+++ b/modules/nixfiles/bat.nix
@@ -7,7 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.bat;
 in {
-  options.nixfiles.modules.bat.enable = mkEnableOption "Whether to enable Bat.";
+  options.nixfiles.modules.bat.enable = mkEnableOption "bat, an alternative to cat";
 
   config = mkIf cfg.enable {
     hm.programs = {
diff --git a/modules/nixfiles/beets.nix b/modules/nixfiles/beets.nix
index de4cd73..6b1e227 100644
--- a/modules/nixfiles/beets.nix
+++ b/modules/nixfiles/beets.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.beets;
 in {
   options.nixfiles.modules.beets.enable =
-    mkEnableOption "Whether to enable beets.";
+    mkEnableOption "beets";
 
   config = mkIf cfg.enable {
     hm = let
diff --git a/modules/nixfiles/bluetooth.nix b/modules/nixfiles/bluetooth.nix
index 04e6b8d..69622a1 100644
--- a/modules/nixfiles/bluetooth.nix
+++ b/modules/nixfiles/bluetooth.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.bluetooth;
 in {
   options.nixfiles.modules.bluetooth.enable =
-    mkEnableOption "Whether to enable Bluetooth support.";
+    mkEnableOption "Bluetooth support";
 
   config = mkIf cfg.enable {
     hardware.bluetooth = {
diff --git a/modules/nixfiles/broot.nix b/modules/nixfiles/broot.nix
deleted file mode 100644
index 19cd1d6..0000000
--- a/modules/nixfiles/broot.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.nixfiles.modules.broot;
-in {
-  options.nixfiles.modules.broot.enable =
-    mkEnableOption "Whether to enable broot.";
-
-  config = mkIf cfg.enable {
-    hm.programs.broot = {
-      enable = true;
-      modal = true;
-    };
-  };
-}
diff --git a/modules/nixfiles/chromium.nix b/modules/nixfiles/chromium.nix
index 1ec761c..32045c0 100644
--- a/modules/nixfiles/chromium.nix
+++ b/modules/nixfiles/chromium.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.chromium;
 in {
-  options.nixfiles.modules.chromium.enable =
-    mkEnableOption "Whether to enable Chromium.";
+  options.nixfiles.modules.chromium.enable = mkEnableOption "Chromium";
 
   config = mkIf cfg.enable {
     hm = {
diff --git a/modules/nixfiles/common/nix.nix b/modules/nixfiles/common/nix.nix
index 5cb77e9..5feeaa4 100644
--- a/modules/nixfiles/common/nix.nix
+++ b/modules/nixfiles/common/nix.nix
@@ -102,6 +102,12 @@ in {
 
           # https://github.com/NixOS/nixpkgs/pull/187039
           inherit (pkgsPR "187039" "sha256-xyYK1M1FF8e9UDziyqTiWe3XRkRVNdWUyzqG1/Rjry8=") biber;
+
+          # https://github.com/matrix-org/dendrite/issues/2650
+          # Wait till 0.9.4
+          dendrite = super.dendrite.overrideAttrs (_: _: {
+            doCheck = false;
+          });
         }
         // (with super; let
           np = nodePackages;
diff --git a/modules/nixfiles/default.nix b/modules/nixfiles/default.nix
index 8632833..4af6108 100644
--- a/modules/nixfiles/default.nix
+++ b/modules/nixfiles/default.nix
@@ -8,7 +8,6 @@
     ./bat.nix
     ./beets.nix
     ./bluetooth.nix
-    ./broot.nix
     ./chromium.nix
     ./common
     ./curl.nix
@@ -20,7 +19,6 @@
     ./endlessh.nix
     ./fail2ban.nix
     ./firefox
-    ./flatpak.nix
     ./fonts.nix
     ./games
     ./git.nix
diff --git a/modules/nixfiles/direnv.nix b/modules/nixfiles/direnv.nix
index aea7dd8..b235cee 100644
--- a/modules/nixfiles/direnv.nix
+++ b/modules/nixfiles/direnv.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.direnv;
 in {
   options.nixfiles.modules.direnv.enable =
-    mkEnableOption "Whether to enable direnv and Lorri.";
+    mkEnableOption "direnv";
 
   config = mkIf cfg.enable {
     hm = {
@@ -18,7 +18,5 @@ in {
 
       home.sessionVariables.DIRENV_LOG_FORMAT = "";
     };
-
-    services.lorri.enable = true;
   };
 }
diff --git a/modules/nixfiles/docker.nix b/modules/nixfiles/docker.nix
index 051b3c7..e642030 100644
--- a/modules/nixfiles/docker.nix
+++ b/modules/nixfiles/docker.nix
@@ -8,8 +8,7 @@
 with lib; let
   cfg = config.nixfiles.modules.docker;
 in {
-  options.nixfiles.modules.docker.enable =
-    mkEnableOption "Whether to enable Docker.";
+  options.nixfiles.modules.docker.enable = mkEnableOption "Docker";
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/nixfiles/dwm.nix b/modules/nixfiles/dwm.nix
index 86d15fb..618d8ed 100644
--- a/modules/nixfiles/dwm.nix
+++ b/modules/nixfiles/dwm.nix
@@ -7,7 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.dwm;
 in {
-  options.nixfiles.modules.dwm.enable = mkEnableOption "Whether to enable dwm.";
+  options.nixfiles.modules.dwm.enable = mkEnableOption "dwm";
 
   config = mkIf cfg.enable {
     nixfiles.modules.x11.enable = true;
diff --git a/modules/nixfiles/emacs/default.nix b/modules/nixfiles/emacs/default.nix
index 178bf6e..a972060 100644
--- a/modules/nixfiles/emacs/default.nix
+++ b/modules/nixfiles/emacs/default.nix
@@ -9,7 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.emacs;
 in {
   options.nixfiles.modules.emacs.enable =
-    mkEnableOption "Whether to enable the GNU Emacs.";
+    mkEnableOption "GNU Emacs";
 
   config = mkIf cfg.enable {
     # TODO Make magit-forge to work with this.
@@ -21,8 +21,10 @@ in {
     };
 
     nixfiles.modules = {
+      fonts.enable = true;
       git.enable = true;
       gnupg.enable = true;
+      x11.enable = true;
     };
 
     hm = {
@@ -31,6 +33,10 @@ in {
       programs.doom-emacs = {
         enable = true;
         doomPrivateDir = ./doom;
+        # NOTE NativeComp breaks non-latin fonts and takes a long time to
+        # perform updates while giving miniscule speed improvements. Emacs is
+        # still a laggy and slow piece of shit regardless of enabling this flag
+        # or not.
         # emacsPackage = pkgs.emacs28.override {nativeComp = true;};
         emacsPackage = pkgs.emacs28;
         extraPackages = with pkgs; [
@@ -61,10 +67,9 @@ in {
             haskellPackages.cabal-install # :lang haskell
             haskellPackages.hoogle # :lang haskell
             html-tidy # :lang web
-            jdk # :lang java plantuml
+            jre # :lang plantuml
             lua-language-server # :lang (lua +lsp)
-            maim # :lang (org +dragndrop)
-            nix-language-server
+            nix-language-server # :lang (nix +lsp)
             nixfmt # :lang nix :editor format
             nodePackages.js-beautify # :lang web
             nodePackages.lua-fmt # :lang lua :editor format
@@ -102,6 +107,18 @@ in {
 
           ;; :input japanese
           (setq skk-large-jisyo "${pkgs.skk-dicts}/share/skk/SKK-JISYO.L")
+
+          (setq user-full-name "${my.fullname}"
+                user-mail-address "${my.email}")
+
+          (setq circe-default-nick "${my.username}"
+                circe-default-realname "${my.fullname}"
+                circe-default-user circe-default-nick)
+
+          (setq doom-font (font-spec
+                          :family "${config.fontScheme.monospaceFont.family}"
+                          :size ${toString config.fontScheme.monospaceFont.size})
+                doom-unicode-font doom-font)
         '';
       };
 
diff --git a/modules/nixfiles/emacs/doom/config.el b/modules/nixfiles/emacs/doom/config.el
index b27b7eb..ac9cdb3 100644
--- a/modules/nixfiles/emacs/doom/config.el
+++ b/modules/nixfiles/emacs/doom/config.el
@@ -1,14 +1,7 @@
 ;;; config.el -*- lexical-binding: t; -*-
 
-(setq user-full-name "Azat Bahawi"
-      user-mail-address "frodo@gondor.net")
-
 (setq doom-theme 'doom-tomorrow-night)
 
-(setq doom-font (font-spec
-                 :family "Iosevka"
-                 :size 18))
-
 (setq frame-title-format '("Emacs")
       icon-title-format frame-title-format)
 
@@ -31,6 +24,8 @@
 
 (setq lsp-haskell-formatting-provider "brittany")
 
+(setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc))
+
 (after! lsp-mode
   (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
   (lsp-register-client
@@ -102,10 +97,6 @@
                       (smtpmail-smtp-user . "azahi"))
                     t)
 
-(setq circe-default-nick "azahi"
-      circe-default-realname "frodo@gondor.net"
-      circe-default-user circe-default-nick)
-
 (set-irc-server! "libera"
   `(
     :host "shire.me"
diff --git a/modules/nixfiles/emacs/doom/init.el b/modules/nixfiles/emacs/doom/init.el
index 91042ea..4f2fd4e 100644
--- a/modules/nixfiles/emacs/doom/init.el
+++ b/modules/nixfiles/emacs/doom/init.el
@@ -15,7 +15,7 @@
        hl-todo
        indent-guides
        ;; ligatures
-       ;; (modeline +light)
+       ;; modeline
        nav-flash
        ophints
        (popup +defaults)
@@ -36,12 +36,12 @@
        ;; multiple-cursors
        parinfer
        ;; rotate-text
-       snippets
+       ;; snippets
        word-wrap
 
        :emacs
        dired
-       electric
+       ;; electric
        ibuffer
        undo
        vc
@@ -61,7 +61,7 @@
        ansible
        (debugger +lsp)
        direnv
-       ;; (docker +lsp)
+       (docker +lsp)
        editorconfig
        (eval +overlay)
        (lookup +dictionary +offline)
@@ -90,11 +90,11 @@
        (haskell +lsp)
        (java +lsp +tree-sitter)
        (javascript +lsp +tree-sitter)
-       (json +tree-sitter)
-       (latex +lsp)
-       (lua +lsp)
+       json
+       (latex +lsp +tree-sitter)
+       (lua +lsp +tree-sitter)
        markdown
-       (nix +tree-sitter)
+       (nix +lsp +tree-sitter)
        (org +brain
             +gnuplot
             +hugo
@@ -107,13 +107,13 @@
             +roam2)
        plantuml
        (python +lsp +tree-sitter)
-       (racket +lsp)
+       (racket +lsp +tree-sitter)
        rst
-       (rust +lsp)
+       (rust +lsp +tree-sitter)
        (scheme +racket)
        (sh +lsp +tree-sitter)
        (web +lsp +tree-sitter)
-       (yaml +lsp)
+       (yaml +lsp +tree-sitter)
        (zig +lsp +tree-sitter)
 
        :email
diff --git a/modules/nixfiles/endlessh-go.nix b/modules/nixfiles/endlessh-go.nix
index 8ab71ee..cb9a639 100644
--- a/modules/nixfiles/endlessh-go.nix
+++ b/modules/nixfiles/endlessh-go.nix
@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -7,8 +8,10 @@
 with lib; let
   cfg = config.nixfiles.modules.endlessh-go;
 in {
+  # imports = ["${inputs.nixpkgs-local}/nixos/modules/services/security/endlessh-go.nix"];
+
   options.nixfiles.modules.endlessh-go = {
-    enable = mkEnableOption "Whether to enable endlessh-go.";
+    enable = mkEnableOption "endlessh-go";
 
     prometheusPort = mkOption {
       description = "Prometheus port.";
diff --git a/modules/nixfiles/endlessh.nix b/modules/nixfiles/endlessh.nix
index 2871683..c66d8b3 100644
--- a/modules/nixfiles/endlessh.nix
+++ b/modules/nixfiles/endlessh.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.endlessh;
 in {
   options.nixfiles.modules.endlessh.enable =
-    mkEnableOption "Whether to enable endlessh.";
+    mkEnableOption "endlessh";
 
   config = let
     port = 22;
diff --git a/modules/nixfiles/fail2ban.nix b/modules/nixfiles/fail2ban.nix
index 56670e7..5ac3c9c 100644
--- a/modules/nixfiles/fail2ban.nix
+++ b/modules/nixfiles/fail2ban.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.fail2ban;
 in {
   options.nixfiles.modules.fail2ban.enable =
-    mkEnableOption "Whether to enable fail2ban service.";
+    mkEnableOption "fail2ban";
 
   config = mkIf cfg.enable {
     services.fail2ban = {
diff --git a/modules/nixfiles/flatpak.nix b/modules/nixfiles/flatpak.nix
deleted file mode 100644
index 0dec763..0000000
--- a/modules/nixfiles/flatpak.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.nixfiles.modules.flatpak;
-in {
-  options.nixfiles.modules.flatpak.enable =
-    mkEnableOption "Whether to enable Flatpak.";
-
-  config = mkIf cfg.enable {services.flatpak.enable = true;};
-}
diff --git a/modules/nixfiles/fonts.nix b/modules/nixfiles/fonts.nix
index 29e2acb..042c0e8 100644
--- a/modules/nixfiles/fonts.nix
+++ b/modules/nixfiles/fonts.nix
@@ -17,7 +17,7 @@ in {
   ];
 
   options.nixfiles.modules.fonts = {
-    enable = mkEnableOption "Whether to enable fonts and their configurations.";
+    enable = mkEnableOption "fonts and their configurations";
 
     fontScheme = let
       mkFont = {
@@ -85,20 +85,44 @@ in {
       hm.fonts.fontconfig.enable = true;
 
       fonts = {
-        fonts = with pkgs; [iosevka sarasa-gothic];
+        fonts = with pkgs; [
+          iosevka-bin
+          (iosevka-bin.override {variant = "aile";})
+          (iosevka-bin.override {variant = "etoile";})
+          sarasa-gothic
+        ];
 
         fontconfig = {
           enable = true;
 
           defaultFonts = {
-            monospace = ["Iosevka" "Sarasa Mono" "DejaVu Sans Mono" "Noto Sans Mono"];
-            sansSerif = ["Iosevka Aile" "Sarasa Gothic" "DejaVu Sans" "Noto Sans"];
-            serif = ["Iosevka Etoile" "Sarasa Gothic" "DejaVu Serif" "Noto Serif"];
+            monospace = [
+              "Iosevka"
+              "Sarasa Mono K"
+              "Sarasa Mono J"
+              "Sarasa Mono SC"
+              "Sarasa Mono CL"
+            ];
+            sansSerif = [
+              "Iosevka Aile"
+              "Sarasa Gothic K"
+              "Sarasa Gothic J"
+              "Sarasa Gothic SC"
+              "Sarasa Gothic CL"
+            ];
+            serif = [
+              "Iosevka Etoile"
+              "Sarasa Gothic K"
+              "Sarasa Gothic J"
+              "Sarasa Gothic SC"
+              "Sarasa Gothic CL"
+            ];
           };
         };
       };
     })
     (mkIf (!cfg.enable) {
+      # Disable fonts for headless profiles.
       hm.fonts.fontconfig.enable = mkForce false;
       fonts.fontconfig.enable = mkForce false;
     })
diff --git a/modules/nixfiles/games/default.nix b/modules/nixfiles/games/default.nix
index 532fc57..13345fc 100644
--- a/modules/nixfiles/games/default.nix
+++ b/modules/nixfiles/games/default.nix
@@ -17,7 +17,7 @@ in {
   ];
 
   options.nixfiles.modules.games.enable32BitSupport =
-    mkEnableOption "Whether to enable support for games.";
+    mkEnableOption "support for games";
 
   config = mkIf cfg.enable32BitSupport {
     services = {
diff --git a/modules/nixfiles/games/gamemode.nix b/modules/nixfiles/games/gamemode.nix
index a74b651..051d12e 100644
--- a/modules/nixfiles/games/gamemode.nix
+++ b/modules/nixfiles/games/gamemode.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.games.gamemode;
 in {
   options.nixfiles.modules.games.gamemode.enable =
-    mkEnableOption "Whether to enable GameMode.";
+    mkEnableOption "Feral GameMode";
 
   config = mkIf cfg.enable {programs.gamemode.enable = true;};
 }
diff --git a/modules/nixfiles/games/gog.nix b/modules/nixfiles/games/gog.nix
index f1188a2..86039f1 100644
--- a/modules/nixfiles/games/gog.nix
+++ b/modules/nixfiles/games/gog.nix
@@ -8,8 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.games.gog;
 in {
   options.nixfiles.modules.games.gog.enable =
-    mkEnableOption
-    "Whether to enable GOG clients and the ability to run GOG games.";
+    mkEnableOption "stand-alone GOG clients and the ability to run GOG games";
 
   config = mkIf cfg.enable {
     nixfiles.modules.games.steam-run.enable = true;
diff --git a/modules/nixfiles/games/lutris.nix b/modules/nixfiles/games/lutris.nix
index 6d9fdf5..c474a44 100644
--- a/modules/nixfiles/games/lutris.nix
+++ b/modules/nixfiles/games/lutris.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.games.lutris;
 in {
-  options.nixfiles.modules.games.lutris.enable =
-    mkEnableOption "Whether to enable Lutris.";
+  options.nixfiles.modules.games.lutris.enable = mkEnableOption "Lutris";
 
   config = mkIf cfg.enable {
     nixfiles.modules.games = {
diff --git a/modules/nixfiles/games/mangohud.nix b/modules/nixfiles/games/mangohud.nix
index 21d5fd1..0625652 100644
--- a/modules/nixfiles/games/mangohud.nix
+++ b/modules/nixfiles/games/mangohud.nix
@@ -6,8 +6,7 @@
 with lib; let
   cfg = config.nixfiles.modules.games.mangohud;
 in {
-  options.nixfiles.modules.games.mangohud.enable =
-    mkEnableOption "Whether to enable MangoHud.";
+  options.nixfiles.modules.games.mangohud.enable = mkEnableOption "MangoHud";
 
   config = mkIf cfg.enable {hm.programs.mangohud.enable = true;};
 }
diff --git a/modules/nixfiles/games/minecraft.nix b/modules/nixfiles/games/minecraft.nix
index 70a98ce..bba7e6b 100644
--- a/modules/nixfiles/games/minecraft.nix
+++ b/modules/nixfiles/games/minecraft.nix
@@ -2,14 +2,35 @@
   config,
   lib,
   pkgs,
+  pkgsPR,
   ...
 }:
 with lib; let
   cfg = config.nixfiles.modules.games.minecraft;
 in {
-  options.nixfiles.modules.games.minecraft.enable =
-    mkEnableOption "Whether to enable Minecraft.";
+  options.nixfiles.modules.games.minecraft = {
+    client.enable = mkEnableOption "Minecraft client";
+    server.enable = mkEnableOption "Minecraft client";
+  };
 
-  config =
-    mkIf cfg.enable {hm.home.packages = with pkgs; [jre nixfiles.UltimMC];};
+  config = mkMerge [
+    (mkIf cfg.client.enable {
+      hm.home.packages = with pkgs; [
+        UltimMC
+        jre
+      ];
+    })
+    (mkIf cfg.server.enable {
+      services.minecraft-server = {
+        enable = true;
+        eula = true;
+
+        package = (pkgsPR "187458" "sha256-kOYkuXvcmqt8Lsh0yMr8reurzU1qTrzh0Z/Tjan0IF0=").papermc;
+
+        jvmOpts = mkDefault "-Xmx4096M -Xms4096M ";
+
+        openFirewall = true;
+      };
+    })
+  ];
 }
diff --git a/modules/nixfiles/games/steam-run.nix b/modules/nixfiles/games/steam-run.nix
index 983cc77..08c6063 100644
--- a/modules/nixfiles/games/steam-run.nix
+++ b/modules/nixfiles/games/steam-run.nix
@@ -8,10 +8,10 @@ with lib; let
   cfg = config.nixfiles.modules.games.steam-run;
 in {
   options.nixfiles.modules.games.steam-run = {
-    enable = mkEnableOption "Whether to enable native Steam runtime.";
+    enable = mkEnableOption "native Steam runtime";
 
     quirks = {
-      mountandblade = mkEnableOption ''Fix "Mount & Blade: Warband" issues.'';
+      mountandblade = mkEnableOption ''fixes for "Mount & Blade: Warband" issues'';
     };
   };
 
diff --git a/modules/nixfiles/games/steam.nix b/modules/nixfiles/games/steam.nix
index c1d471e..c1d7eb8 100644
--- a/modules/nixfiles/games/steam.nix
+++ b/modules/nixfiles/games/steam.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.games.steam;
 in {
   options.nixfiles.modules.games.steam.enable =
-    mkEnableOption "Whether to enable Steam runtime.";
+    mkEnableOption "Steam runtime";
 
   config = mkIf cfg.enable {
     nixfiles.modules.games = {
diff --git a/modules/nixfiles/git.nix b/modules/nixfiles/git.nix
index 5f78465..e3659f4 100644
--- a/modules/nixfiles/git.nix
+++ b/modules/nixfiles/git.nix
@@ -8,8 +8,7 @@
 with lib; let
   cfg = config.nixfiles.modules.git;
 in {
-  options.nixfiles.modules.git.enable =
-    mkEnableOption "Whether to enable Git version control system.";
+  options.nixfiles.modules.git.enable = mkEnableOption "Git";
 
   config = mkIf cfg.enable {
     secrets = {
diff --git a/modules/nixfiles/gnome.nix b/modules/nixfiles/gnome.nix
index 2d0f6f6..4646d94 100644
--- a/modules/nixfiles/gnome.nix
+++ b/modules/nixfiles/gnome.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.gnome;
 in {
   options.nixfiles.modules.gnome.enable =
-    mkEnableOption "Whether to enable the GNOME desktop environment.";
+    mkEnableOption "GNOME desktop environment";
 
   config = mkIf cfg.enable {
     nixfiles.modules = {
diff --git a/modules/nixfiles/gnupg.nix b/modules/nixfiles/gnupg.nix
index 16b8264..96c34ee 100644
--- a/modules/nixfiles/gnupg.nix
+++ b/modules/nixfiles/gnupg.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.gnupg;
 in {
   options.nixfiles.modules.gnupg = {
-    enable = mkEnableOption "Whether to enable GnuPG.";
+    enable = mkEnableOption "GnuPG";
 
     pinentry = mkOption {
       description = "Name of a pinentry implementation.";
diff --git a/modules/nixfiles/gotify.nix b/modules/nixfiles/gotify.nix
index b2bf3ae..440aff8 100644
--- a/modules/nixfiles/gotify.nix
+++ b/modules/nixfiles/gotify.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.gotify;
 in {
   options.nixfiles.modules.gotify = {
-    enable = mkEnableOption "Whether to enable Gotify.";
+    enable = mkEnableOption "Gotify";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/grafana.nix b/modules/nixfiles/grafana.nix
index c2954bd..66cde70 100644
--- a/modules/nixfiles/grafana.nix
+++ b/modules/nixfiles/grafana.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.grafana;
 in {
   options.nixfiles.modules.grafana = {
-    enable = mkEnableOption "Whether to enable Grafana.";
+    enable = mkEnableOption "Grafana";
 
     port = mkOption {
       description = "Port.";
diff --git a/modules/nixfiles/htop.nix b/modules/nixfiles/htop.nix
index 9cb3e60..bf3f1e4 100644
--- a/modules/nixfiles/htop.nix
+++ b/modules/nixfiles/htop.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.htop;
 in {
   options.nixfiles.modules.htop.enable =
-    mkEnableOption "Whether to enable htop.";
+    mkEnableOption "htop";
 
   config = mkIf cfg.enable {
     hm.programs.htop = {
diff --git a/modules/nixfiles/hydra.nix b/modules/nixfiles/hydra.nix
index 4161eb3..0814b3a 100644
--- a/modules/nixfiles/hydra.nix
+++ b/modules/nixfiles/hydra.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.hydra;
 in {
   options.nixfiles.modules.hydra = {
-    enable = mkEnableOption "Whether to enable Nginx.";
+    enable = mkEnableOption "Hydra";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/ipfs.nix b/modules/nixfiles/ipfs.nix
index 501a07c..455f8e8 100644
--- a/modules/nixfiles/ipfs.nix
+++ b/modules/nixfiles/ipfs.nix
@@ -12,7 +12,7 @@ with lib; let
   gatewayDefaultPort = 6001;
 in {
   options.nixfiles.modules.ipfs = {
-    enable = mkEnableOption "Whether to enable IPFS daemon.";
+    enable = mkEnableOption "IPFS daemon";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/kde.nix b/modules/nixfiles/kde.nix
index 571cb6d..934f114 100644
--- a/modules/nixfiles/kde.nix
+++ b/modules/nixfiles/kde.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.kde;
 in {
-  options.nixfiles.modules.kde.enable =
-    mkEnableOption "Whether to enable KDE Plasma 5.";
+  options.nixfiles.modules.kde.enable = mkEnableOption "KDE Plasma 5 desktop environment";
 
   config = mkIf cfg.enable {
     nixfiles.modules = {
diff --git a/modules/nixfiles/lidarr.nix b/modules/nixfiles/lidarr.nix
index 54d1fe5..15e91ae 100644
--- a/modules/nixfiles/lidarr.nix
+++ b/modules/nixfiles/lidarr.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.lidarr;
 in {
   options.nixfiles.modules.lidarr = {
-    enable = mkEnableOption "Whether to enable Lidarr.";
+    enable = mkEnableOption "Lidarr";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/loki.nix b/modules/nixfiles/loki.nix
index c1dc136..7f85852 100644
--- a/modules/nixfiles/loki.nix
+++ b/modules/nixfiles/loki.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.loki;
 in {
   options.nixfiles.modules.loki = {
-    enable = mkEnableOption "Whether to enable Loki.";
+    enable = mkEnableOption "Loki";
 
     port = mkOption {
       description = "Port.";
diff --git a/modules/nixfiles/lxc.nix b/modules/nixfiles/lxc.nix
index ea4d8a6..4f7805f 100644
--- a/modules/nixfiles/lxc.nix
+++ b/modules/nixfiles/lxc.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.lxc;
 in {
   options.nixfiles.modules.lxc.enable =
-    mkEnableOption "Whether to enable LXC/LXD.";
+    mkEnableOption "LXC/LXD";
 
   config = mkIf cfg.enable {
     virtualisation.lxd.enable = true;
diff --git a/modules/nixfiles/matrix/dendrite.nix b/modules/nixfiles/matrix/dendrite.nix
index 4e40e97..eb3c437 100644
--- a/modules/nixfiles/matrix/dendrite.nix
+++ b/modules/nixfiles/matrix/dendrite.nix
@@ -9,7 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.matrix.dendrite;
 in {
   options.nixfiles.modules.matrix.dendrite = {
-    enable = mkEnableOption "Whether to enable Dendrite Matrix server.";
+    enable = mkEnableOption "Dendrite Matrix server";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/matrix/element.nix b/modules/nixfiles/matrix/element.nix
index 79c9f97..3d47800 100644
--- a/modules/nixfiles/matrix/element.nix
+++ b/modules/nixfiles/matrix/element.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.matrix.element;
 in {
   options.nixfiles.modules.matrix.element = {
-    enable = mkEnableOption "Whether to enable Element Matrix web interface.";
+    enable = mkEnableOption "Element, a Matrix web interface";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/matrix/synapse.nix b/modules/nixfiles/matrix/synapse.nix
index cde5f8e..877d7e9 100644
--- a/modules/nixfiles/matrix/synapse.nix
+++ b/modules/nixfiles/matrix/synapse.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.matrix.synapse;
 in {
   options.nixfiles.modules.matrix.synapse = {
-    enable = mkEnableOption "Whether to enable Synapse Matrix server.";
+    enable = mkEnableOption "Synapse Matrix server";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/monitoring.nix b/modules/nixfiles/monitoring.nix
index ceb40d0..c97e756 100644
--- a/modules/nixfiles/monitoring.nix
+++ b/modules/nixfiles/monitoring.nix
@@ -7,12 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.monitoring;
 in {
-  options.nixfiles.modules.monitoring.enable = mkEnableOption ''
-    Whether to enable custom monitoring stack.
-
-    Currently this configures and enables Grafana, Loki, Prometheus and
-    Alertmanager.
-  '';
+  options.nixfiles.modules.monitoring.enable = mkEnableOption "custom monitoring stack";
 
   config = mkIf cfg.enable {
     nixfiles.modules = {
diff --git a/modules/nixfiles/mpv.nix b/modules/nixfiles/mpv.nix
index 68628c5..0c3fcc5 100644
--- a/modules/nixfiles/mpv.nix
+++ b/modules/nixfiles/mpv.nix
@@ -7,7 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.mpv;
 in {
-  options.nixfiles.modules.mpv.enable = mkEnableOption "Whether to enable MPV.";
+  options.nixfiles.modules.mpv.enable = mkEnableOption "mpv";
 
   config = mkIf cfg.enable {
     hm.programs = {
diff --git a/modules/nixfiles/nextcloud.nix b/modules/nixfiles/nextcloud.nix
index d63f824..e586c2a 100644
--- a/modules/nixfiles/nextcloud.nix
+++ b/modules/nixfiles/nextcloud.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.nextcloud;
 in {
   options.nixfiles.modules.nextcloud = {
-    enable = mkEnableOption "Whether to enable Nextcloud.";
+    enable = mkEnableOption "Nextcloud";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/nginx.nix b/modules/nixfiles/nginx.nix
index 35f5098..d08fdab 100644
--- a/modules/nixfiles/nginx.nix
+++ b/modules/nixfiles/nginx.nix
@@ -9,7 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.nginx;
 in {
   options.nixfiles.modules.nginx = {
-    enable = mkEnableOption "Whether to enable Nginx.";
+    enable = mkEnableOption "Nginx";
 
     virtualHosts = mkOption {
       description = "Attrset of virtual hosts.";
diff --git a/modules/nixfiles/nmap.nix b/modules/nixfiles/nmap.nix
index 945cd59..56ac88f 100644
--- a/modules/nixfiles/nmap.nix
+++ b/modules/nixfiles/nmap.nix
@@ -8,8 +8,7 @@
 with lib; let
   cfg = config.nixfiles.modules.nmap;
 in {
-  options.nixfiles.modules.nmap.enable =
-    mkEnableOption "Whether to enable Nmap.";
+  options.nixfiles.modules.nmap.enable = mkEnableOption "Nmap";
 
   config = mkIf cfg.enable {
     hm.home = {
diff --git a/modules/nixfiles/node-exporter.nix b/modules/nixfiles/node-exporter.nix
index 794c309..fad1cc8 100644
--- a/modules/nixfiles/node-exporter.nix
+++ b/modules/nixfiles/node-exporter.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.node-exporter;
 in {
-  options.nixfiles.modules.node-exporter.enable =
-    mkEnableOption "Whether to enable Prometheus Node Exporter.";
+  options.nixfiles.modules.node-exporter.enable = mkEnableOption "Prometheus Node Exporter";
 
   config = mkIf cfg.enable {
     services.prometheus.exporters.node = {
diff --git a/modules/nixfiles/nsd.nix b/modules/nixfiles/nsd.nix
index 7bb3c77..f3804d7 100644
--- a/modules/nixfiles/nsd.nix
+++ b/modules/nixfiles/nsd.nix
@@ -9,7 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.nsd;
 in {
   options.nixfiles.modules.nsd = {
-    enable = mkEnableOption "Whether to enable NSD.";
+    enable = mkEnableOption "NSD";
 
     fqdn = mkOption {
       description = "FQDN of this nameserver.";
diff --git a/modules/nixfiles/openssh.nix b/modules/nixfiles/openssh.nix
index 2f1559e..3a526d7 100644
--- a/modules/nixfiles/openssh.nix
+++ b/modules/nixfiles/openssh.nix
@@ -8,8 +8,8 @@ with lib; let
   cfg = config.nixfiles.modules.openssh;
 in {
   options.nixfiles.modules.openssh = {
-    client.enable = mkEnableOption "Whether to enable OpenSSH client.";
-    server.enable = mkEnableOption "Whether to enable OpenSSH server.";
+    client.enable = mkEnableOption "OpenSSH client";
+    server.enable = mkEnableOption "OpenSSH server";
   };
 
   config = mkMerge [
diff --git a/modules/nixfiles/password-store.nix b/modules/nixfiles/password-store.nix
index 19e2f2a..7824ae5 100644
--- a/modules/nixfiles/password-store.nix
+++ b/modules/nixfiles/password-store.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.password-store;
 in {
-  options.nixfiles.modules.password-store.enable =
-    mkEnableOption "Whether to enable pass.";
+  options.nixfiles.modules.password-store.enable = mkEnableOption "Unix pass";
 
   config = mkIf cfg.enable {
     hm.programs = {
diff --git a/modules/nixfiles/podman.nix b/modules/nixfiles/podman.nix
index ee9d4cb..1c5378b 100644
--- a/modules/nixfiles/podman.nix
+++ b/modules/nixfiles/podman.nix
@@ -8,8 +8,7 @@
 with lib; let
   cfg = config.nixfiles.modules.podman;
 in {
-  options.nixfiles.modules.podman.enable =
-    mkEnableOption "Whether to enable Podman.";
+  options.nixfiles.modules.podman.enable = mkEnableOption "Podman";
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/nixfiles/postgresql.nix b/modules/nixfiles/postgresql.nix
index 23623af..14bfc68 100644
--- a/modules/nixfiles/postgresql.nix
+++ b/modules/nixfiles/postgresql.nix
@@ -8,34 +8,13 @@
 with lib; let
   cfg = config.nixfiles.modules.postgresql;
 in {
-  options.nixfiles.modules.postgresql.enable =
-    mkEnableOption "Whether to enable PostgeSQL.";
+  options.nixfiles.modules.postgresql.enable = mkEnableOption "PostgeSQL";
 
   config = mkIf cfg.enable {
-    hm = {
-      home.sessionVariables.PSQLRC = config.hm.xdg.configFile."psqlrc".target;
-
-      xdg.configFile."psqlrc".text = ''
-        \set QUIET 1
-
-        \timing
-        \x auto
-        \pset null '[NULL]'
-        \set PROMPT1 '%[%033[1m%]%M %n@%/%R%[%033[0m%]% λ '
-        \set PROMPT2 '    … > '
-        \set VERBOSITY verbose
-        \set HISTCONTROL ignoredups
-        \set HISTFILE /dev/null
-
-        \unset QUIET
-      '';
-    };
-
     services = {
       postgresql = {
         enable = true;
-        package = pkgs.postgresql_14;
-        # TODO Test if this is still required.
+        package = pkgs.postgresql_14; # Pin version to prevent any surprises.
         authentication = ''
           local all all trust
           host all all 127.0.0.1/32 trust
@@ -49,5 +28,20 @@ in {
         port = mkDefault 9187;
       };
     };
+
+    environment.sessionVariables.PSQLRC = toString (pkgs.writeText "psqlrc" ''
+      \set QUIET 1
+
+      \timing
+      \x auto
+      \pset null '[NULL]'
+      \set PROMPT1 '%[%033[1m%]%M %n@%/%R%[%033[0m%]% λ '
+      \set PROMPT2 '    … > '
+      \set VERBOSITY verbose
+      \set HISTCONTROL ignoredups
+      \set HISTFILE /dev/null
+
+      \unset QUIET
+    '');
   };
 }
diff --git a/modules/nixfiles/profiles/dev/sql/default.nix b/modules/nixfiles/profiles/dev/sql/default.nix
index deb3738..e448e08 100644
--- a/modules/nixfiles/profiles/dev/sql/default.nix
+++ b/modules/nixfiles/profiles/dev/sql/default.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.profiles.dev.sql;
 in {
   options.nixfiles.modules.profiles.dev.sql.enable =
-    mkEnableOption "Whether to enable SQL database management tools.";
+    mkEnableOption "SQL database management tools";
 
   config = mkIf cfg.enable {
     hm = {
diff --git a/modules/nixfiles/profiles/headful.nix b/modules/nixfiles/profiles/headful.nix
index e14517e..3e94a0b 100644
--- a/modules/nixfiles/profiles/headful.nix
+++ b/modules/nixfiles/profiles/headful.nix
@@ -18,7 +18,7 @@ in {
   ];
 
   options.nixfiles.modules.profiles.headful.enable =
-    mkEnableOption "Wether to enable headful profile.";
+    mkEnableOption "headful profile";
 
   config = mkIf cfg.enable {
     nixfiles.modules = {
diff --git a/modules/nixfiles/profiles/headless.nix b/modules/nixfiles/profiles/headless.nix
index 4d940f8..107c9fc 100644
--- a/modules/nixfiles/profiles/headless.nix
+++ b/modules/nixfiles/profiles/headless.nix
@@ -18,7 +18,7 @@ in {
   ];
 
   options.nixfiles.modules.profiles.headless.enable =
-    mkEnableOption "Whether to enable headless profile.";
+    mkEnableOption "headless profile";
 
   config = mkIf cfg.enable {
     nixfiles.modules = {
@@ -37,6 +37,7 @@ in {
         config.hm.lib.file.mkOutOfStoreSymlink "/dev/null";
     };
 
+    # Pin version to prevent any surprises.
     boot.kernelPackages = pkgs.linuxPackages_5_15_hardened;
 
     nix = {
diff --git a/modules/nixfiles/prometheus.nix b/modules/nixfiles/prometheus.nix
index 96e74f7..696cfe4 100644
--- a/modules/nixfiles/prometheus.nix
+++ b/modules/nixfiles/prometheus.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.prometheus;
 in {
   options.nixfiles.modules.prometheus = {
-    enable = mkEnableOption "Whether to enable Prometheus.";
+    enable = mkEnableOption "Prometheus";
 
     port = mkOption {
       description = "Port.";
diff --git a/modules/nixfiles/promtail.nix b/modules/nixfiles/promtail.nix
index e3d7428..552df82 100644
--- a/modules/nixfiles/promtail.nix
+++ b/modules/nixfiles/promtail.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.promtail;
 in {
   options.nixfiles.modules.promtail = {
-    enable = mkEnableOption "Whether to enable Promtail.";
+    enable = mkEnableOption "Promtail";
 
     loki = {
       url = mkOption {
diff --git a/modules/nixfiles/psd.nix b/modules/nixfiles/psd.nix
index 290c067..e497bcf 100644
--- a/modules/nixfiles/psd.nix
+++ b/modules/nixfiles/psd.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.psd;
 in {
   options.nixfiles.modules.psd.enable =
-    mkEnableOption "Whether to enable Profile Sync Daemon.";
+    mkEnableOption "Profile Sync Daemon";
 
   config = mkIf cfg.enable {
     hm.home = {
diff --git a/modules/nixfiles/qutebrowser.nix b/modules/nixfiles/qutebrowser.nix
index 5af7e1f..3fd2c24 100644
--- a/modules/nixfiles/qutebrowser.nix
+++ b/modules/nixfiles/qutebrowser.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.qutebrowser;
 in {
-  options.nixfiles.modules.qutebrowser.enable =
-    mkEnableOption "Whether to enable qutebrowser.";
+  options.nixfiles.modules.qutebrowser.enable = mkEnableOption "Qutebrowser";
 
   config = mkIf cfg.enable {
     hm = {
diff --git a/modules/nixfiles/radarr.nix b/modules/nixfiles/radarr.nix
index f57efc9..1ed0747 100644
--- a/modules/nixfiles/radarr.nix
+++ b/modules/nixfiles/radarr.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.radarr;
 in {
   options.nixfiles.modules.radarr = {
-    enable = mkEnableOption "Whether to enable Radarr.";
+    enable = mkEnableOption "Radarr";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/radicale.nix b/modules/nixfiles/radicale.nix
index ed1fc4f..45702b6 100644
--- a/modules/nixfiles/radicale.nix
+++ b/modules/nixfiles/radicale.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.radicale;
 in {
   options.nixfiles.modules.radicale = {
-    enable = mkEnableOption "Whether to enable Radicale.";
+    enable = mkEnableOption "Radicale";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/rss-bridge.nix b/modules/nixfiles/rss-bridge.nix
index fe3a638..787db35 100644
--- a/modules/nixfiles/rss-bridge.nix
+++ b/modules/nixfiles/rss-bridge.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.rss-bridge;
 in {
   options.nixfiles.modules.rss-bridge = {
-    enable = mkEnableOption "Whether to enable rss-bridge.";
+    enable = mkEnableOption "RSS-Bridge";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/rtorrent.nix b/modules/nixfiles/rtorrent.nix
index 2f1708c..3560be2 100644
--- a/modules/nixfiles/rtorrent.nix
+++ b/modules/nixfiles/rtorrent.nix
@@ -8,10 +8,10 @@ with lib; let
   cfg = config.nixfiles.modules.rtorrent;
 in {
   options.nixfiles.modules.rtorrent = {
-    enable = mkEnableOption "Whether to enable rTorrent.";
+    enable = mkEnableOption "rTorrent";
 
     flood = {
-      enable = mkEnableOption "Whether to enable Flood.";
+      enable = mkEnableOption "Flood";
 
       domain = mkOption {
         description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/searx.nix b/modules/nixfiles/searx.nix
index d5d00a2..c01c517 100644
--- a/modules/nixfiles/searx.nix
+++ b/modules/nixfiles/searx.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.searx;
 in {
   options.nixfiles.modules.searx = {
-    enable = mkEnableOption "Whether to enable SearX.";
+    enable = mkEnableOption "SearX";
 
     port = mkOption {
       description = "Port.";
diff --git a/modules/nixfiles/shadowsocks.nix b/modules/nixfiles/shadowsocks.nix
index c496caa..6e98e97 100644
--- a/modules/nixfiles/shadowsocks.nix
+++ b/modules/nixfiles/shadowsocks.nix
@@ -9,7 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.shadowsocks;
 in {
   options.nixfiles.modules.shadowsocks = {
-    enable = mkEnableOption "Whether to enable Shadowsocks.";
+    enable = mkEnableOption "Shadowsocks";
 
     port = mkOption {
       type = with types; port;
diff --git a/modules/nixfiles/soju.nix b/modules/nixfiles/soju.nix
index b586cbf..b7ddec9 100644
--- a/modules/nixfiles/soju.nix
+++ b/modules/nixfiles/soju.nix
@@ -9,7 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.soju;
 in {
   options.nixfiles.modules.soju = {
-    enable = mkEnableOption "Whether to enable soju.";
+    enable = mkEnableOption "soju";
 
     protocol = mkOption {
       description = "Port.";
diff --git a/modules/nixfiles/sonarr.nix b/modules/nixfiles/sonarr.nix
index a2003f0..1b22d63 100644
--- a/modules/nixfiles/sonarr.nix
+++ b/modules/nixfiles/sonarr.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.sonarr;
 in {
   options.nixfiles.modules.sonarr = {
-    enable = mkEnableOption "Whether to enable Sonarr.";
+    enable = mkEnableOption "Sonarr";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/sound.nix b/modules/nixfiles/sound.nix
index b352f3e..ae35e44 100644
--- a/modules/nixfiles/sound.nix
+++ b/modules/nixfiles/sound.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.sound;
 in {
   options.nixfiles.modules.sound.enable =
-    mkEnableOption "Whether to enable sound support.";
+    mkEnableOption "sound support";
 
   config = mkIf cfg.enable {
     services.pipewire = {
diff --git a/modules/nixfiles/subversion.nix b/modules/nixfiles/subversion.nix
index 1cfdca6..077f449 100644
--- a/modules/nixfiles/subversion.nix
+++ b/modules/nixfiles/subversion.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.subversion;
 in {
-  options.nixfiles.modules.subversion.enable =
-    mkEnableOption "Whether to enable Subversion version control system.";
+  options.nixfiles.modules.subversion.enable = mkEnableOption "Subversion";
 
   config = mkIf cfg.enable {
     nixfiles.modules.gnupg.enable = true;
diff --git a/modules/nixfiles/syncthing.nix b/modules/nixfiles/syncthing.nix
index 44465d9..8f68675 100644
--- a/modules/nixfiles/syncthing.nix
+++ b/modules/nixfiles/syncthing.nix
@@ -9,7 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.syncthing;
 in {
   options.nixfiles.modules.syncthing = {
-    enable = mkEnableOption "Whether to enable Syncthing.";
+    enable = mkEnableOption "Syncthing";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/throttled.nix b/modules/nixfiles/throttled.nix
index b7c7d8a..2454ebd 100644
--- a/modules/nixfiles/throttled.nix
+++ b/modules/nixfiles/throttled.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.throttled;
 in {
-  options.nixfiles.modules.throttled.enable =
-    mkEnableOption "Whether to enable Throttled.";
+  options.nixfiles.modules.throttled.enable = mkEnableOption "Throttled";
 
   config = mkIf cfg.enable {
     environment.etc."throttled.conf".text = ''
diff --git a/modules/nixfiles/tmux.nix b/modules/nixfiles/tmux.nix
index c90b0fc..e978f72 100644
--- a/modules/nixfiles/tmux.nix
+++ b/modules/nixfiles/tmux.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.tmux;
 in {
   options.nixfiles.modules.tmux.enable =
-    mkEnableOption "Whether to enable tmux.";
+    mkEnableOption "tmux";
 
   config = mkIf cfg.enable {
     hm.programs.tmux = {
diff --git a/modules/nixfiles/unbound.nix b/modules/nixfiles/unbound.nix
index af983a8..066cdd3 100644
--- a/modules/nixfiles/unbound.nix
+++ b/modules/nixfiles/unbound.nix
@@ -9,17 +9,7 @@ with lib; let
   cfg = config.nixfiles.modules.unbound;
 in {
   options.nixfiles.modules.unbound = {
-    enable = mkEnableOption ''
-      Whether to enable Unbound.
-
-      This service is configured to be used in conjunction with a Wireguard
-      server located on the same host to enable internal name resolution with a
-      forwarding fallback via Quad9.
-
-      Features included: Internal name resolution, Quad9 as a recursive
-      resolver, DNSSEC validation, Redis cache and adblocking via pgl.yoyo.org
-      lists.
-    '';
+    enable = mkEnableOption "Unbound";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/vaultwarden.nix b/modules/nixfiles/vaultwarden.nix
index 4f5bcb4..1e5097c 100644
--- a/modules/nixfiles/vaultwarden.nix
+++ b/modules/nixfiles/vaultwarden.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.vaultwarden;
 in {
   options.nixfiles.modules.vaultwarden = {
-    enable = mkEnableOption "Whether to enable Vaultwarden.";
+    enable = mkEnableOption "Vaultwarden";
 
     domain = mkOption {
       description = "Domain name sans protocol scheme.";
diff --git a/modules/nixfiles/vim/default.nix b/modules/nixfiles/vim/default.nix
index cef4423..a38c58f 100644
--- a/modules/nixfiles/vim/default.nix
+++ b/modules/nixfiles/vim/default.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.vim;
 in {
-  options.nixfiles.modules.vim.enable =
-    mkEnableOption "Whether to enable Vim text editor.";
+  options.nixfiles.modules.vim.enable = mkEnableOption "Vim";
 
   config = mkIf cfg.enable {
     programs.vim.package = with pkgs;
diff --git a/modules/nixfiles/vscode.nix b/modules/nixfiles/vscode.nix
index b41d037..82e9f2d 100644
--- a/modules/nixfiles/vscode.nix
+++ b/modules/nixfiles/vscode.nix
@@ -8,7 +8,7 @@ with lib; let
   cfg = config.nixfiles.modules.vscode;
 in {
   options.nixfiles.modules.vscode = {
-    enable = mkEnableOption "Whether to enable VSCode.";
+    enable = mkEnableOption "VSCode";
 
     package = with pkgs;
       mkOption {
diff --git a/modules/nixfiles/wget.nix b/modules/nixfiles/wget.nix
index 9e4db27..cb5c99e 100644
--- a/modules/nixfiles/wget.nix
+++ b/modules/nixfiles/wget.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.wget;
 in {
-  options.nixfiles.modules.wget.enable =
-    mkEnableOption "Whether to enable wget.";
+  options.nixfiles.modules.wget.enable = mkEnableOption "wget";
 
   config = mkIf cfg.enable {
     hm = {
diff --git a/modules/nixfiles/wireguard.nix b/modules/nixfiles/wireguard.nix
index e35d0ee..fa7ad34 100644
--- a/modules/nixfiles/wireguard.nix
+++ b/modules/nixfiles/wireguard.nix
@@ -17,7 +17,7 @@ in {
     };
 
     client = {
-      enable = mkEnableOption "Whether to enable WireGuard client.";
+      enable = mkEnableOption "WireGuard client";
 
       enableTrafficRouting = mkOption {
         description = "Whether to enable traffic routing through the sever.";
@@ -27,10 +27,7 @@ in {
     };
 
     server = {
-      enable = mkEnableOption ''
-        Whether to enable WireGuard server. This module requires
-        <option>networking.nat.externalInterface</option> to be set.
-      '';
+      enable = mkEnableOption "WireGuard server";
 
       ipv4.address = mkOption {
         description = "IPv4 address to bind to.";
diff --git a/modules/nixfiles/x11.nix b/modules/nixfiles/x11.nix
index ff0feaf..ac1b799 100644
--- a/modules/nixfiles/x11.nix
+++ b/modules/nixfiles/x11.nix
@@ -7,7 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.x11;
 in {
-  options.nixfiles.modules.x11.enable = mkEnableOption "Whether to enable X11.";
+  options.nixfiles.modules.x11.enable = mkEnableOption "X11";
 
   config = mkIf cfg.enable {
     nixfiles.modules.fonts.enable = true;
diff --git a/modules/nixfiles/xmonad.nix b/modules/nixfiles/xmonad.nix
index 566ec53..da005b2 100644
--- a/modules/nixfiles/xmonad.nix
+++ b/modules/nixfiles/xmonad.nix
@@ -7,8 +7,7 @@
 with lib; let
   cfg = config.nixfiles.modules.xmonad;
 in {
-  options.nixfiles.modules.xmonad.enable =
-    mkEnableOption "Whether to enable XMonad.";
+  options.nixfiles.modules.xmonad.enable = mkEnableOption "XMonad";
 
   config = mkIf cfg.enable {
     nixfiles.modules.x11.enable = true;
diff --git a/modules/nixfiles/zathura.nix b/modules/nixfiles/zathura.nix
index d4e11e6..fd38ab0 100644
--- a/modules/nixfiles/zathura.nix
+++ b/modules/nixfiles/zathura.nix
@@ -7,7 +7,7 @@ with lib; let
   cfg = config.nixfiles.modules.zathura;
 in {
   options.nixfiles.modules.zathura.enable =
-    mkEnableOption "Whether to enable zathura PDF reader.";
+    mkEnableOption "Zathura PDF reader";
 
   config = mkIf cfg.enable {
     hm.programs.zathura = with config.nixfiles.modules; {
diff --git a/packages/ultimmc.nix b/packages/ultimmc.nix
index e90d5bd..dcb646a 100644
--- a/packages/ultimmc.nix
+++ b/packages/ultimmc.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "UltimMC";
-  version = "unstable-2022-06-09";
+  version = "unstable-2022-07-20";
 
   src = fetchFromGitHub {
     owner = "UltimMC";
     repo = "Launcher";
-    rev = "b7c9b27ed6fb047da7fab5e4cee99b298b9e9811";
-    hash = "sha256-xmkflvtOSLMTuzAKovgOLjgpbR8j53bkGV3QZRsQItw=";
+    rev = "a522ec3ad4602de1f457a25bce98ef912a29d7d6";
+    hash = "sha256-+UgBblyEx0cKH8UMBOPtjhQLv2YUKj91UokQWKCEPbY=";
     fetchSubmodules = true;
   };