stylix, formatting

This commit is contained in:
tristan 2023-12-11 09:26:41 +00:00
parent d3649cf6e2
commit 3409811d55
13 changed files with 376 additions and 166 deletions

View file

@ -5,7 +5,7 @@ let
pkg = editor.package;
terminal = config.programs.terminal.package;
termcmd = "${terminal}/bin/${terminal.pname}";
menu = config.programs.menu.package+config.programs.menu.dmenuCommand;
menu = config.programs.menu.package + config.programs.menu.dmenuCommand;
in
{
options.programs = {
@ -23,21 +23,26 @@ in
programs.vscode = {
enable = true;
package = editor.package;
extensions = with pkgs; [
vscode-extensions.asvetliakov.vscode-neovim
];
extensions =
if editor.neovim then with pkgs; [
vscode-extensions.asvetliakov.vscode-neovim
] else [ ];
userSettings = {
"vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
"keyboard.dispatch" = "keyCode";
"terminal.integrated.sendKeybindingsToShell" = true;
"aws.telemetry" = false;
"gitlens.telemetry.enabled" = false;
"redhat.telemetry.enabled" = false;
"cSpell.language" = "en,en-GB";
};
} // (if editor.neovim then {
"vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
"extensions.experimental.affinity" = {
"asvetliakov.vscode-neovim" = 1;
};
} else { });
};
programs.neovim = {
programs.neovim = mkIf editor.neovim {
enable = true;
defaultEditor = true;
coc = {
@ -63,6 +68,7 @@ in
vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
vnoremap <C-R> "ry:%s/<C-R>=escape(@r,'/\')<CR>
vnoremap A :norm A
noremap <C-S-I> :CocCommand editor.action.formatDocument<CR>
set number
set rnu
set ignorecase
@ -97,8 +103,8 @@ in
esac
'';
install = false;
hotkeys = [{key = "C";}];
hotkeys = [{ key = "C"; }];
}];
};
}