From 185b1d5490858eca27eb21cd817a4ef4d903d598 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 16:52:08 +0000
Subject: [PATCH 1/7] flake: remove unused 'lib'

---
 flake/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/flake/default.nix b/flake/default.nix
index 8dd752e..65102e1 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -1,11 +1,8 @@
-{ self
-, flake-parts
+{ flake-parts
 , futils
 , ...
 } @ inputs:
 let
-  inherit (self) lib;
-
   mySystems = futils.lib.defaultSystems;
 in
 flake-parts.lib.mkFlake { inherit inputs; } {

From 85e31e5d6c0884faf8686b2850c7a2de342ebbd2 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 16:52:31 +0000
Subject: [PATCH 2/7] home: zsh: remove unused 'with pkgs'

---
 home/zsh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 2e645c2..4cadb57 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -38,7 +38,7 @@ in
         path = "${config.xdg.dataHome}/zsh/zsh_history";
       };
 
-      plugins = with pkgs; [
+      plugins = [
         {
           name = "fast-syntax-highlighting";
           file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";

From 62d9359eb7a15bc685dd4f780a3bfe27422b1d7c Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 16:52:56 +0000
Subject: [PATCH 3/7] modules: services: matrix: clean-up formatting

---
 modules/services/matrix/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix
index c581df8..8eb10d7 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" = rec {
+      "matrix.${domain}_federation" = {
         onlySSL = true;
         serverName = "matrix.${domain}";
         useACMEHost = domain;
@@ -164,7 +164,6 @@ in
           { addr = "0.0.0.0"; port = federationPort.public; ssl = true; }
           { addr = "[::]"; port = federationPort.public; ssl = true; }
         ];
-
       };
 
       "${domain}" = {

From c19baeb19de6d0c7c0bbf5e35a9fbd57f52f95a4 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 16:53:18 +0000
Subject: [PATCH 4/7] modules: system: podman: remove unused 'options'

---
 modules/system/podman/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/podman/default.nix b/modules/system/podman/default.nix
index b04c52c..dd1b617 100644
--- a/modules/system/podman/default.nix
+++ b/modules/system/podman/default.nix
@@ -1,5 +1,5 @@
 # Podman related settings
-{ config, lib, options, ... }:
+{ config, lib, ... }:
 let
   cfg = config.my.system.podman;
 in

From beeafe5e33f735148bdf92a25ca87632fe0ea28b Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 16:54:23 +0000
Subject: [PATCH 5/7] home: nix: remove unused 'options'

---
 home/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/nix/default.nix b/home/nix/default.nix
index d8618e5..9ccbdc5 100644
--- a/home/nix/default.nix
+++ b/home/nix/default.nix
@@ -1,5 +1,5 @@
 # Nix related settings
-{ config, inputs, lib, options, pkgs, ... }:
+{ config, inputs, lib, pkgs, ... }:
 let
   cfg = config.my.home.nix;
 

From b9d611599429047846f4b2e089b5f20163e67f3a Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 16:54:53 +0000
Subject: [PATCH 6/7] pkgs: unbound-zones-adblock: remove unused 'rec'

---
 pkgs/unbound-zones-adblock/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/unbound-zones-adblock/default.nix b/pkgs/unbound-zones-adblock/default.nix
index ecec917..824a7d6 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 rec {
+stdenvNoCC.mkDerivation {
   name = "unbound-zones-adblock";
   version = unified-hosts-lists.version;
 

From 46d9e5c8296431c39e6468a1d74dc74388d0fdef Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 3 May 2023 17:09:14 +0000
Subject: [PATCH 7/7] home: vim: lspconfig: add 'nil'

---
 home/vim/plugin/settings/lspconfig.vim | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/home/vim/plugin/settings/lspconfig.vim b/home/vim/plugin/settings/lspconfig.vim
index 4fbbb1d..04afafa 100644
--- a/home/vim/plugin/settings/lspconfig.vim
+++ b/home/vim/plugin/settings/lspconfig.vim
@@ -15,6 +15,13 @@ 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,