Compare commits
No commits in common. "eac22be09510e42d2bfea792e9dcfb463a23f242" and "46db2dd34fedf42b9384f6e40f8ac491d4de0de4" have entirely different histories.
eac22be095
...
46db2dd34f
|
@ -108,7 +108,6 @@
|
||||||
inv = invidious;
|
inv = invidious;
|
||||||
nixos = "https://search.nixos.org/options?channel=${config.home.version.release}&query={}";
|
nixos = "https://search.nixos.org/options?channel=${config.home.version.release}&query={}";
|
||||||
nixpkgs = "https://search.nixos.org/packages?channel=${config.home.version.release}&query={}";
|
nixpkgs = "https://search.nixos.org/packages?channel=${config.home.version.release}&query={}";
|
||||||
noogle = "https://noogle.dev/q?term={}";
|
|
||||||
npm = "https://www.npmjs.com/search?q={}";
|
npm = "https://www.npmjs.com/search?q={}";
|
||||||
os = nixos;
|
os = nixos;
|
||||||
pkgs = nixpkgs;
|
pkgs = nixpkgs;
|
||||||
|
|
|
@ -52,6 +52,9 @@
|
||||||
gC = "commands";
|
gC = "commands";
|
||||||
gr = "lsp_references";
|
gr = "lsp_references";
|
||||||
ge = "diagnostics";
|
ge = "diagnostics";
|
||||||
|
# ga = "lsp_code_actions";
|
||||||
|
# gE = "lsp_workspace_diagnostics";
|
||||||
|
# TODO Above makes nvim crash on startup, action is not provided
|
||||||
gd = "lsp_definitions";
|
gd = "lsp_definitions";
|
||||||
gs = "lsp_document_symbols";
|
gs = "lsp_document_symbols";
|
||||||
};
|
};
|
||||||
|
@ -80,6 +83,10 @@
|
||||||
|
|
||||||
undotree.enable = true; # Navigate edition history
|
undotree.enable = true; # Navigate edition history
|
||||||
|
|
||||||
|
# Git
|
||||||
|
fugitive.enable = true; # Git basics
|
||||||
|
gitsigns.enable = true; # Show changed lines in the gutter
|
||||||
|
|
||||||
};
|
};
|
||||||
extraPlugins = with pkgs.vimPlugins; [
|
extraPlugins = with pkgs.vimPlugins; [
|
||||||
# Search/replace
|
# Search/replace
|
||||||
|
@ -89,6 +96,19 @@
|
||||||
# Surrounding pairs
|
# Surrounding pairs
|
||||||
targets-vim # Better interaction with surrounding pairs
|
targets-vim # Better interaction with surrounding pairs
|
||||||
|
|
||||||
|
# Registers
|
||||||
|
registers-nvim # Show register content when pressing "
|
||||||
|
# TODO Doesn't work. Didn't work on Arch either
|
||||||
|
|
||||||
|
# Tags
|
||||||
|
vim-gutentags # Generate tags
|
||||||
|
symbols-outline-nvim # Show a symbol panel on the right
|
||||||
|
# TODO Fails on startup. Same on Arch. Config issue?
|
||||||
|
|
||||||
|
# Git
|
||||||
|
fugitive-gitlab-vim # Open files in GitLab
|
||||||
|
# TODO Connect it!
|
||||||
|
|
||||||
# Language-specific
|
# Language-specific
|
||||||
tcomment_vim # Language-aware (un)commenting
|
tcomment_vim # Language-aware (un)commenting
|
||||||
] ++ lib.optionals config.frogeye.extra [
|
] ++ lib.optionals config.frogeye.extra [
|
||||||
|
@ -97,8 +117,7 @@
|
||||||
vim-pandoc # Pandoc-specific stuff because there's no LSP for it
|
vim-pandoc # Pandoc-specific stuff because there's no LSP for it
|
||||||
vim-pandoc-syntax
|
vim-pandoc-syntax
|
||||||
] ++ lib.optionals config.frogeye.dev.ansible [
|
] ++ lib.optionals config.frogeye.dev.ansible [
|
||||||
ansible-vim
|
ansible-vim # TODO Doesn't have snippets
|
||||||
# Doesn't generate snippets, but those are for UltiSnip anyways
|
|
||||||
];
|
];
|
||||||
extraConfigLua = builtins.readFile ./symbols-outline-nvim.lua;
|
extraConfigLua = builtins.readFile ./symbols-outline-nvim.lua;
|
||||||
extraConfigVim = ''
|
extraConfigVim = ''
|
||||||
|
@ -110,6 +129,9 @@
|
||||||
command Reload source $MYVIMRC
|
command Reload source $MYVIMRC
|
||||||
|
|
||||||
" PLUGINS
|
" PLUGINS
|
||||||
|
|
||||||
|
" vim-gutentags
|
||||||
|
let g:gutentags_cache_dir = expand('~/.cache/nvim/tags')
|
||||||
'' + lib.optionalString config.frogeye.extra ''
|
'' + lib.optionalString config.frogeye.extra ''
|
||||||
" languagetool
|
" languagetool
|
||||||
let g:languagetool_cmd = "${pkgs.languagetool}/bin/languagetool-commandline"
|
let g:languagetool_cmd = "${pkgs.languagetool}/bin/languagetool-commandline"
|
||||||
|
@ -167,7 +189,6 @@
|
||||||
./code.nix
|
./code.nix
|
||||||
./completion.nix
|
./completion.nix
|
||||||
./decoration.nix
|
./decoration.nix
|
||||||
./git.nix
|
|
||||||
./lsp.nix
|
./lsp.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
{ pkgs, lib, config, ... }:
|
|
||||||
{
|
|
||||||
config = {
|
|
||||||
programs.nixvim = {
|
|
||||||
extraConfigVim = ''
|
|
||||||
let g:fugitive_gitlab_domains = [${
|
|
||||||
lib.strings.concatStringsSep ", " (
|
|
||||||
map (d: "'${d}'") config.frogeye.vim.fugitive.gitlab_domains
|
|
||||||
)}]
|
|
||||||
'';
|
|
||||||
extraPlugins = with pkgs.vimPlugins; [
|
|
||||||
fugitive-gitlab-vim # Open files in GitLab
|
|
||||||
];
|
|
||||||
plugins = {
|
|
||||||
fugitive.enable = true; # Git basics
|
|
||||||
gitsigns.enable = true; # Show changed lines in the gutter
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
options.frogeye.vim.fugitive = {
|
|
||||||
gitlab_domains = lib.mkOption {
|
|
||||||
default = { };
|
|
||||||
type = lib.types.listOf lib.types.str;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -47,6 +47,7 @@
|
||||||
config = {
|
config = {
|
||||||
frogeye = {
|
frogeye = {
|
||||||
dev = {
|
dev = {
|
||||||
|
ansible = lib.mkDefault true;
|
||||||
python = lib.mkDefault true;
|
python = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,9 +19,7 @@
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
users.geoffrey = { pkgs, ... }: {
|
users.geoffrey = { pkgs, ... }: {
|
||||||
frogeye = lib.mkDefault config.frogeye;
|
frogeye = config.frogeye;
|
||||||
# Propagating options that way doesn't seem to conserve priority info,
|
|
||||||
# this is not great. Hopefully mkDefault resolve conflicts.
|
|
||||||
};
|
};
|
||||||
# Makes VMs able to re-run
|
# Makes VMs able to re-run
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
|
|
Loading…
Reference in a new issue