summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archetypes/collections/neovim.nix23
-rw-r--r--archetypes/collections/utilities.nix1
-rw-r--r--archetypes/default.nix1
-rw-r--r--todo2
4 files changed, 24 insertions, 3 deletions
diff --git a/archetypes/collections/neovim.nix b/archetypes/collections/neovim.nix
new file mode 100644
index 0000000..5107dbd
--- /dev/null
+++ b/archetypes/collections/neovim.nix
@@ -0,0 +1,23 @@
+{ lib, pkgs, ... }: let
+ cfg.neovimPackage = pkgs.neovim;
+
+ # Neovim package that includes aliases vi(m) -> nvim
+ neovim-aliases = pkgs.symlinkJoin {
+ name = "neovim-aliases";
+ paths = [ cfg.neovimPackage ];
+ postBuild = ''
+ ln -sf $out/bin/nvim $out/bin/vi
+ ln -sf $out/bin/nvim $out/bin/vim
+ '';
+ };
+in {
+ # Don't use programs.neovim since that will build neovim from source
+ environment.systemPackages = with pkgs; [
+ neovim-aliases
+ # LSP servers
+ python313Packages.python-lsp-server
+ svelte-language-server
+ tailwindcss-language-server
+ vscode-langservers-extracted
+ ];
+}
diff --git a/archetypes/collections/utilities.nix b/archetypes/collections/utilities.nix
index 85763a4..545f41a 100644
--- a/archetypes/collections/utilities.nix
+++ b/archetypes/collections/utilities.nix
@@ -10,7 +10,6 @@
light
lm_sensors
mediainfo
- neovim
nmap
openssl
p7zip
diff --git a/archetypes/default.nix b/archetypes/default.nix
index 52e5eaa..fa05187 100644
--- a/archetypes/default.nix
+++ b/archetypes/default.nix
@@ -4,6 +4,7 @@
./collections/desktop
./collections/development
./collections/fonts.nix
+ ./collections/neovim.nix
./collections/utilities.nix
./collections/virtualization.nix
diff --git a/todo b/todo
index f97cc3f..4c17016 100644
--- a/todo
+++ b/todo
@@ -16,8 +16,6 @@ install zsh as root
git-sync
geoclue cache location
geoclue continuously try to get location if not available
-link vim -> nvim
-install lsp servers using nix pks manager instead of Mason
get rid of launch script, move x config to new repo, retire dotconfig repo
font improvements hinting etc home manager