Bundle ecsls_run within vim extra packages

Sigmanificient · Aug 9, 2023 · 73344b9 · 73344b9
1 parent 156cbda
commit 73344b9
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 74 deletions.
diff --git a/Makefile b/Makefile
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,27 +4,29 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
 
-    hosts.url = github:StevenBlack/hosts;
+    hosts.url = "github:StevenBlack/hosts";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
 
+    ecsls.url = "github:Sigmapitech-meta/ecsls";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
   outputs =
-    { self
-    , nixpkgs
+    { nixpkgs
     , nix-index-database
     , nixos-hardware
     , home-manager
     , hosts
+    , ecsls
     , ...
-    } @inputs:
+    }:
     let
       username = "sigmanificient";
       system = "x86_64-linux";
@@ -37,7 +39,14 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
           home-manager.users.${username} = import ./home;
-          home-manager.extraSpecialArgs = { inherit username; };
+          home-manager.extraSpecialArgs = {
+            inherit ecsls;
+            conf = {
+              inherit username;
+              inherit system;
+              ecsls.enable = true;
+            };
+          };
         }
 
         hosts.nixosModule

diff --git a/home/default.nix b/home/default.nix
@@ -1,11 +1,12 @@
-{ config, pkgs, username, ... }:
+{ pkgs, conf, ecsls, ... }:
 {
   nixpkgs.config.allowUnfree = true;
 
   imports = [
+    (import ./nvim { inherit ecsls; inherit pkgs; inherit conf; })
+
     ./btop
     ./neofetch
-    ./nvim
     ./picom
     ./qtile
     ./dunst
@@ -24,8 +25,8 @@
   ];
 
   home = {
-    username = "${username}";
-    homeDirectory = "/home/${username}";
+    username = "${conf.username}";
+    homeDirectory = "/home/${conf.username}";
 
     stateVersion = "22.11";
     sessionVariables = {

diff --git a/home/nvim/default.nix b/home/nvim/default.nix
@@ -1,29 +1,19 @@
-{ pkgs, ... }:
+{ pkgs, ecsls, conf, ... }:
 let
-  vera = pkgs.stdenv.mkDerivation (finalAttrs: {
-    pname = "banana-vera";
-    version = "1.3.0-python3.10";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "Epitech";
-      repo = "banana-vera";
-      rev = "refs/tags/v${finalAttrs.version}";
-      hash = "sha256-1nAKhUltQS1301JNrr0PQQrrf2W9Hj5gk1nbUhN4cXw=";
-    };
-
-    nativeBuildInputs = [ pkgs.cmake ];
-    buildInputs = with pkgs; [
-      python310
-      python310.pkgs.boost
-      tcl
-    ];
-
-    cmakeFlags = [
-      "-DVERA_LUA=OFF"
-      "-DVERA_USE_SYSTEM_BOOST=ON"
-      "-DPANDOC=OFF"
-    ];
-  });
+  base_pkgs = with pkgs; [
+    nil # Nix
+    lua-language-server
+    nodePackages.pyright
+    clang-tools
+    llvmPackages_latest.clang
+    nodejs # Copilot
+    xclip  # Clipboard fix
+  ];
+
+  extra_pkgs =
+    if conf.ecsls.enable
+    then base_pkgs ++ [ ecsls.packages.${conf.system}.default ]
+    else base_pkgs;
 in
 {
   home.file.nvim_conf = {
@@ -43,28 +33,7 @@ in
       lazy-nvim
     ];
 
-    extraPackages = with pkgs; [
-      vera
-
-      # ↓ Nix
-      nil
-
-      # ↓ Lua
-      lua-language-server
-
-      # ↓ Python
-      nodePackages.pyright
-
-      # ↓ C
-      clang-tools
-      llvmPackages_latest.clang
-
-      # ↓ Copilot
-      nodejs
-
-      # ↓ Clipboard fix
-      xclip
-    ];
+    extraPackages = extra_pkgs;
   };
 }
 
diff --git a/home/nvim/lua/sigma/plugins/lsp.lua b/home/nvim/lua/sigma/plugins/lsp.lua
@@ -34,15 +34,10 @@ if not configs.ecsls then
   configs.ecsls = {
     default_config = {
       root_dir = lspconfig.util.root_pattern(".git", "Makefile"),
-      cmd = {
-        '/home/sigmanificient/dev/ecsls/.direnv/python-3.11.4/bin/ecsls_run'
-      },
+      cmd = { 'ecsls_run' },
       autostart = true,
       name = 'ecsls',
       filetypes = { 'c', 'cpp', 'make' },
-      init_options = {
-        path = '/home/sigmanificient/dev/ecsls/'
-      },
     },
   }
 end