diff --git a/home-manager/default.nix b/home-manager/default.nix
index b98b7bd..f92a6d9 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -99,6 +99,7 @@ in
       htop
       xdg-utils
       moreutils
+      insomnia
       mumble
       inkscape
       guvcview
diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index 962f730..741a5d9 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -76,9 +76,6 @@
 
       # indentation lines
       indent-blankline-nvim
-
-      # Add/change surrounding characters
-      nvim-surround
     ];
 
     extraConfig = ''
@@ -180,7 +177,6 @@
       nnoremap <leader>fg <cmd>Telescope live_grep<cr>
 
       lua << EOF
-        require("nvim-surround").setup({})
         require("ibl").setup{
                indent = { char = "▏" };
         }
diff --git a/machines/smithers/batterylight.nix b/machines/smithers/batterylight.nix
deleted file mode 100644
index 687dcf4..0000000
--- a/machines/smithers/batterylight.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, ... }:
-{
-  systemd.timers."batterylight" = {
-    wantedBy = [ "timers.target" ];
-    timerConfig = {
-      OnBootSec = "5m";
-      OnUnitActiveSec = "5m";
-      Unit = "batterylight.service";
-    };
-  };
-
-  systemd.services."batterylight" = {
-    script = ''
-      STATUS=`cat /sys/bus/acpi/drivers/battery/PNP0C0A:00/power_supply/BAT1/status`
-      PERCENT=`cat /sys/bus/acpi/drivers/battery/PNP0C0A:00/power_supply/BAT1/capacity`
-      if [[ $STATUS == "Discharging" && $PERCENT -lt 10 ]]; then
-        for i in `seq 0 3`; do
-          ${pkgs.framework-tool}/bin/framework_tool --kblight 0
-          sleep 0.2
-          ${pkgs.framework-tool}/bin/framework_tool --kblight 100
-          sleep 0.2
-          ${pkgs.framework-tool}/bin/framework_tool --kblight 0
-          sleep 0.2
-        done
-      fi
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-    };
-  };
-}
diff --git a/machines/smithers/configuration.nix b/machines/smithers/configuration.nix
index 2520852..15ead57 100644
--- a/machines/smithers/configuration.nix
+++ b/machines/smithers/configuration.nix
@@ -6,7 +6,6 @@
       ./hardware-configuration.nix
       ../../roles/all.nix
       ../../roles/laptop.nix
-      ./batterylight.nix
 
       # import hardware specific settings
       <nixos-hardware/framework/13-inch/7040-amd>
diff --git a/modules/fonts.nix b/modules/fonts.nix
index 28ec566..014ed5b 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -13,6 +13,7 @@
     enableDefaultPackages = true;
     fontDir.enable = true;
     packages = with pkgs; [
+      nerdfonts
       dejavu_fonts
       fira-code
     ];
diff --git a/modules/lix.nix b/modules/lix.nix
index 8264140..34d1103 100644
--- a/modules/lix.nix
+++ b/modules/lix.nix
@@ -1,6 +1,16 @@
 let
-  unstable = import <nixos-unstable> { };
+  module = fetchTarball {
+    name = "source";
+    url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
+    sha256 = "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=";
+  };
+  lixSrc = fetchTarball {
+    name = "source";
+    url = "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz";
+    sha256 = "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=";
+  };
 in
-{
-  nix.package = unstable.lix;
-}
+# This is the core of the code you need; it is an exercise to the
+# reader to write the sources in a nicer way, or by using npins or
+# similar pinning tools.
+import "${module}/module.nix" { lix = lixSrc; }
diff --git a/overlay b/overlay
index 7fc5447..62209bc 160000
--- a/overlay
+++ b/overlay
@@ -1 +1 @@
-Subproject commit 7fc544758f1004ca7e193acc4a8d0ee784e585a9
+Subproject commit 62209bcff29f6d2d1a643870b643d6c9d2577d5f
diff --git a/secrets b/secrets
index 0073a1e..b5be703 160000
--- a/secrets
+++ b/secrets
@@ -1 +1 @@
-Subproject commit 0073a1ebe983e942b7a9513ef33ad29c6ac8d6ac
+Subproject commit b5be7037c16f25899be906029de9dc9cb6f79ff8