From bb2816caf58158ae9eac9831665d63efbfedaadd Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 6 Mar 2024 05:47:59 +0300 Subject: [PATCH] NixOnDroid : Add nvim config. --- module/NixOnDroid.nix | 83 +++++++++++++++++++++++++++++++++++++++--- module/common/Nvim.nix | 2 +- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/module/NixOnDroid.nix b/module/NixOnDroid.nix index a53031b..eb2007b 100644 --- a/module/NixOnDroid.nix +++ b/module/NixOnDroid.nix @@ -1,4 +1,6 @@ -{ pkgs, inputs, const, ... }: { +{ pkgs, inputs, const, ... }: let + homePath = "/data/data/com.termux.nix/files/home"; +in { environment.packages = with pkgs; [ android-tools binwalk @@ -22,7 +24,6 @@ ltex-ls man ncdu - neovim nmap openssh parallel @@ -43,15 +44,16 @@ home.file = { ".nixos".source = inputs.self; ".bash".source = ./common/bash; + ".nvim".source = ./common/nvim; ".ssh/config".source = ./common/ssh/Config; }; home.sessionVariables = { - BASH_MODULE_PATH = "$HOME/.bash/module"; - BASH_PATH = "$HOME/.bash"; + BASH_MODULE_PATH = "${homePath}/.bash/module"; + BASH_PATH = "${homePath}/.bash"; }; programs.bash = { enable = true; - bashrcExtra = "source ~/.bash/Bashrc.sh"; + bashrcExtra = "source ${homePath}/.bash/Bashrc.sh"; }; programs.tmux = { enable = true; @@ -67,5 +69,76 @@ rebase.autoStash = true; }; }; + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + extraConfig = '' + set runtimepath+=~/.cache/nvim + set runtimepath+=~/.cache/nvim/treesitter + set runtimepath+=${inputs.nvimAlign} + set runtimepath+=${inputs.nvimAutoclose} + set runtimepath+=${inputs.nvimBufferline} + set runtimepath+=${inputs.nvimCloseBuffers} + set runtimepath+=${inputs.nvimDevicons} + set runtimepath+=${inputs.nvimGitsigns} + set runtimepath+=${inputs.nvimGruvboxMaterial} + set runtimepath+=${inputs.nvimIndentoMatic} + set runtimepath+=${inputs.nvimLspconfig} + set runtimepath+=${inputs.nvimLualine} + set runtimepath+=${inputs.nvimOllama} + set runtimepath+=${inputs.nvimPlenary} + set runtimepath+=${inputs.nvimSingleComment} + set runtimepath+=${inputs.nvimTelescope} + set runtimepath+=${inputs.nvimTodo} + set runtimepath+=${inputs.nvimTokyonight} + set runtimepath+=${inputs.nvimTreesitter} + set runtimepath+=${inputs.nvimTree} + set runtimepath+=${inputs.nvimTrouble} + set runtimepath+=${inputs.nvimWhichKey} + + lua dofile("${homePath}/.nvim/key/Rekey.lua") + lua dofile("${homePath}/.nvim/key/Leader.lua") + lua dofile("${homePath}/.nvim/config/Autoread.lua") + lua dofile("${homePath}/.nvim/config/Etc.lua") + lua dofile("${homePath}/.nvim/config/Search.lua") + lua dofile("${homePath}/.nvim/config/Tab.lua") + lua dofile("${homePath}/.nvim/plugin/Filetree.lua") + lua dofile("${homePath}/.nvim/plugin/lsp/Rust.lua") + lua dofile("${homePath}/.nvim/plugin/lsp/Tex.lua") + lua dofile("${homePath}/.nvim/plugin/Bufferline.lua") + lua dofile("${homePath}/.nvim/plugin/Lualine.lua") + lua dofile("${homePath}/.nvim/plugin/Autoclose.lua") + lua dofile("${homePath}/.nvim/plugin/Gitsigns.lua") + lua dofile("${homePath}/.nvim/plugin/Trouble.lua") + lua dofile("${homePath}/.nvim/plugin/Tokyonight.lua") + lua dofile("${homePath}/.nvim/plugin/Gruvbox.lua") + lua dofile("${homePath}/.nvim/plugin/Closebuffers.lua") + lua dofile("${homePath}/.nvim/plugin/Telescope.lua") + lua dofile("${homePath}/.nvim/plugin/Todo.lua") + lua dofile("${homePath}/.nvim/plugin/Indent.lua") + lua dofile("${homePath}/.nvim/plugin/Align.lua") + lua dofile("${homePath}/.nvim/plugin/Treesitter.lua") + lua dofile("${homePath}/.nvim/plugin/Fold.lua") + lua dofile("${homePath}/.nvim/plugin/Ollama.lua") + lua dofile("${homePath}/.nvim/key/Autocomplete.lua") + lua dofile("${homePath}/.nvim/key/Buffer.lua") + lua dofile("${homePath}/.nvim/key/Comment.lua") + lua dofile("${homePath}/.nvim/key/Common.lua") + lua dofile("${homePath}/.nvim/key/Filetree.lua") + lua dofile("${homePath}/.nvim/key/Fold.lua") + lua dofile("${homePath}/.nvim/key/Gitsigns.lua") + lua dofile("${homePath}/.nvim/key/Lsp.lua") + lua dofile("${homePath}/.nvim/key/Navigation.lua") + lua dofile("${homePath}/.nvim/key/Ollama.lua") + lua dofile("${homePath}/.nvim/key/Sort.lua") + lua dofile("${homePath}/.nvim/key/Telescope.lua") + lua dofile("${homePath}/.nvim/key/Terminal.lua") + lua dofile("${homePath}/.nvim/key/Todo.lua") + lua dofile("${homePath}/.nvim/key/Trouble.lua") + lua dofile("${homePath}/.nvim/key/Update.lua") + lua dofile("${homePath}/.nvim/key/Whichkey.lua") + ''; + }; }; } diff --git a/module/common/Nvim.nix b/module/common/Nvim.nix index ea23518..4a44ce1 100644 --- a/module/common/Nvim.nix +++ b/module/common/Nvim.nix @@ -1,5 +1,5 @@ { environment, inputs, ... }: let - nvimSrc = "/etc/nvim/"; + nvimSrc = "/etc/nvim"; in { environment.etc.nvim.source = ./nvim;