diff --git a/flake/default.nix b/flake/default.nix
index 65102e1..8dd752e 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -1,8 +1,11 @@
-{ flake-parts
+{ self
+, flake-parts
 , futils
 , ...
 } @ inputs:
 let
+  inherit (self) lib;
+
   mySystems = futils.lib.defaultSystems;
 in
 flake-parts.lib.mkFlake { inherit inputs; } {
diff --git a/home/nix/default.nix b/home/nix/default.nix
index 9ccbdc5..d8618e5 100644
--- a/home/nix/default.nix
+++ b/home/nix/default.nix
@@ -1,5 +1,5 @@
 # Nix related settings
-{ config, inputs, lib, pkgs, ... }:
+{ config, inputs, lib, options, pkgs, ... }:
 let
   cfg = config.my.home.nix;
 
diff --git a/home/vim/plugin/settings/lspconfig.vim b/home/vim/plugin/settings/lspconfig.vim
index 04afafa..4fbbb1d 100644
--- a/home/vim/plugin/settings/lspconfig.vim
+++ b/home/vim/plugin/settings/lspconfig.vim
@@ -15,13 +15,6 @@ if utils.is_executable("clangd") then
 end
 
 -- Nix
-if utils.is_executable("nil") then
-    lspconfig.nil_ls.setup({
-        capabilities = capabilities,
-        on_attach = lsp.on_attach,
-    })
-end
-
 if utils.is_executable("rnix-lsp") then
     lspconfig.rnix.setup({
         capabilities = capabilities,
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 4cadb57..2e645c2 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -38,7 +38,7 @@ in
         path = "${config.xdg.dataHome}/zsh/zsh_history";
       };
 
-      plugins = [
+      plugins = with pkgs; [
         {
           name = "fast-syntax-highlighting";
           file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix
index 8eb10d7..c581df8 100644
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@@ -149,7 +149,7 @@ in
       };
 
       # same as above, but listening on the federation port
-      "matrix.${domain}_federation" = {
+      "matrix.${domain}_federation" = rec {
         onlySSL = true;
         serverName = "matrix.${domain}";
         useACMEHost = domain;
@@ -164,6 +164,7 @@ in
           { addr = "0.0.0.0"; port = federationPort.public; ssl = true; }
           { addr = "[::]"; port = federationPort.public; ssl = true; }
         ];
+
       };
 
       "${domain}" = {
diff --git a/modules/system/podman/default.nix b/modules/system/podman/default.nix
index dd1b617..b04c52c 100644
--- a/modules/system/podman/default.nix
+++ b/modules/system/podman/default.nix
@@ -1,5 +1,5 @@
 # Podman related settings
-{ config, lib, ... }:
+{ config, lib, options, ... }:
 let
   cfg = config.my.system.podman;
 in
diff --git a/pkgs/unbound-zones-adblock/default.nix b/pkgs/unbound-zones-adblock/default.nix
index 824a7d6..ecec917 100644
--- a/pkgs/unbound-zones-adblock/default.nix
+++ b/pkgs/unbound-zones-adblock/default.nix
@@ -1,5 +1,5 @@
 { lib, gawk, stdenvNoCC, unified-hosts-lists }:
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation rec {
   name = "unbound-zones-adblock";
   version = unified-hosts-lists.version;