From 2dfa62d6a38873b30bc0e9b04a5e96282ca4aa67 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Thu, 6 Apr 2023 21:40:39 +0200
Subject: [PATCH 1/3] feat: changed nix lsp to nil
---
home-manager-modules/neovim/default.nix | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/home-manager-modules/neovim/default.nix b/home-manager-modules/neovim/default.nix
index fc1daf1..9a3d4c9 100644
--- a/home-manager-modules/neovim/default.nix
+++ b/home-manager-modules/neovim/default.nix
@@ -40,10 +40,14 @@ with lib;
};
nix = {
- command = "rnix-lsp";
- filetypes = [
- "nix"
- ];
+ command = "nil";
+ filetypes = [ "nix" ];
+ rootPatterns = [ "flake.nix" ];
+ settings = {
+ nil = {
+ formatting = { command = [ "nixpkgs-fmt" ]; };
+ };
+ };
};
};
};
@@ -90,7 +94,7 @@ with lib;
rust-vim
];
- extraPackages = with pkgs; [ rust-analyzer rnix-lsp pyright haskell-language-server ];
+ extraPackages = with pkgs; [ rust-analyzer nil pyright haskell-language-server nixpkgs-fmt ];
extraConfig = ''
luafile ${./settings.lua}
From e79ab185f181bc65131a8d3f01cc033b992a368d Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Thu, 6 Apr 2023 22:14:45 +0200
Subject: [PATCH 2/3] feat: simplified flake.nix
---
flake.nix | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/flake.nix b/flake.nix
index 7bbcb66..fbf14d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,10 +60,8 @@
};
- outputs = { self, home-manager, nixpkgs, unstable, deploy-rs, sops-nix, nixos-apple-silicon, ... }@inputs:
+ outputs = { self, nixpkgs, deploy-rs, ... }@inputs:
let
- pkgs = import nixpkgs { system = "x86_64-linux"; };
- pkgsrpi = import nixpkgs { system = "aarch64-linux"; };
lib = nixpkgs.lib.extend (import ./lib inputs);
machines_plats = lib.mapAttrsToList (name: value: value.arch) lib.luj.machines;
@@ -74,7 +72,6 @@
})
machines_plats);
in
- with lib;
rec {
nixosModules = builtins.listToAttrs (map
(x: {
From b2869e133f2f8590c2307066021b6955ea079935 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Thu, 6 Apr 2023 22:19:39 +0200
Subject: [PATCH 3/3] feat: added nixpkgs-fmt, removed unecessary plugin
---
home-manager-modules/neovim/default.nix | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/home-manager-modules/neovim/default.nix b/home-manager-modules/neovim/default.nix
index 9a3d4c9..fec540f 100644
--- a/home-manager-modules/neovim/default.nix
+++ b/home-manager-modules/neovim/default.nix
@@ -55,9 +55,6 @@ with lib;
withPython3 = true;
plugins = with pkgs.vimPlugins; [
- # LSP
- nvim-lspconfig
-
plenary-nvim
#Telescope
@@ -94,7 +91,7 @@ with lib;
rust-vim
];
- extraPackages = with pkgs; [ rust-analyzer nil pyright haskell-language-server nixpkgs-fmt ];
+ extraPackages = with pkgs; [ rust-analyzer pkgs.unstable.nil pyright haskell-language-server nixpkgs-fmt ];
extraConfig = ''
luafile ${./settings.lua}