(caladan) home stuff

2 files changed, 22 insertions, 8 deletions

diff --git a/nix/hosts/caladan/home_emile.nix b/nix/hosts/caladan/home_emile.nix
index 86d6965..545c4d5 100644
--- a/nix/hosts/caladan/home_emile.nix
+++ b/nix/hosts/caladan/home_emile.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   home = {
@@ -60,6 +60,18 @@
       '';
     };
 
+    neovim = let
+      custom_plugins = pkgs.callPackage ./nvim_plugins.nix { };
+    in {
+      enable = true;
+      plugins = with pkgs.vimPlugins // custom_plugins; [
+        neovim-ayu
+        lisp.vlime
+      ];
+      extraConfig = ''
+      '';
+    };
+
     emacs = {
       enable = true;
       package = pkgs.emacs;
@@ -174,7 +186,7 @@
     nixos-rebuild
 
     # editor
-    unstable.helix
+    unstable-darwin.helix
 
     ## formatter
     nixfmt-rfc-style # official formatter for nix code
@@ -200,6 +212,7 @@
     # go foo
     go
     delve
+    gotools
 
     # c foo
     cmake
@@ -249,6 +262,10 @@
 
     drawio
 
+    # cargo rustup
+    cargo
+
+    # custom
     libc-database
 
     # blender
diff --git a/nix/hosts/caladan/nvim_plugins.nix b/nix/hosts/caladan/nvim_plugins.nix
index 2bc46d7..7f07816 100644
--- a/nix/hosts/caladan/nvim_plugins.nix
+++ b/nix/hosts/caladan/nvim_plugins.nix
@@ -1,14 +1,11 @@
 { vimUtils, fetchgit, ... }:
 
 let
-  build-vim = vimUtils.buildVimPluginFrom2Nix;
-
-  build = ({name, owner, rev, sha256}: build-vim {
-    name = name;
+  build = ({name, owner, rev, sha256}: vimUtils.buildVimPlugin {
+    inherit name;
     src = fetchgit {
+      inherit rev sha256;
       url = "https://github.com/${owner}/${name}";
-      rev = rev;
-      sha256 = sha256;
     };
     dependencies = [];
   });