style: fmt

This commit is contained in:
Marvin Drescher 2024-01-30 09:09:50 +01:00
parent 8b36fe97d0
commit fa4f77984e

View File

@ -1,8 +1,7 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; let with lib; let
rust-analyzer = rust-analyzer =
@ -30,15 +29,16 @@ with lib; let
else else
symlinkJoin { symlinkJoin {
name = "nvim-rust"; name = "nvim-rust";
paths = [rustc cargo rustfmt clippy cargo-watch]; paths = [ rustc cargo rustfmt clippy cargo-watch ];
}; };
in { in
{
programs.neovim = { programs.neovim = {
# https://github.com/nix-community/home-manager/blob/master/modules/programs/neovim.nix # https://github.com/nix-community/home-manager/blob/master/modules/programs/neovim.nix
enable = true; enable = true;
vimAlias = true; vimAlias = true;
withNodeJs = true; withNodeJs = true;
extraPackages = with pkgs; [fzf xclip fish]; extraPackages = with pkgs; [ fzf xclip fish ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
vim-fugitive vim-fugitive
git-blame-nvim git-blame-nvim
@ -87,25 +87,28 @@ in {
telescope-undo-nvim telescope-undo-nvim
oil-nvim oil-nvim
]; ];
extraLuaConfig = let extraLuaConfig =
let
# tries to compute a package set required to make package resolution in lua # tries to compute a package set required to make package resolution in lua
# via deps["pkg"] work # via deps["pkg"] work
inherit (builtins) head tail hasAttr getAttr; inherit (builtins) head tail hasAttr getAttr;
pkg = parts: pkgs: let pkg = parts: pkgs:
let
rem = tail parts; rem = tail parts;
subset = subset =
if hasAttr (head parts) pkgs if hasAttr (head parts) pkgs
then getAttr (head parts) pkgs then getAttr (head parts) pkgs
else throw "no attr ${name}"; else throw "no attr ${name}";
in in
if rem == [] if rem == [ ]
then subset then subset
else builtins.addErrorContext "${concatStringsSep "." parts}" (pkg rem subset); else builtins.addErrorContext "${concatStringsSep "." parts}" (pkg rem subset);
getPkg = name: let parts = builtins.split "\\." name; in pkg parts pkgs; getPkg = name: let parts = builtins.split "\\." name; in pkg parts pkgs;
packages = file: let packages = file:
let
out = builtins.readFile (pkgs.runCommandLocal "extract-deps" out = builtins.readFile (pkgs.runCommandLocal "extract-deps"
{ {
nativeBuildInputs = [pkgs.gnused]; nativeBuildInputs = [ pkgs.gnused ];
__contentAddressed = true; __contentAddressed = true;
} '' } ''
sed -nr 's/.*(deps\["(.*)_path"\]).*/\2/p' ${file} | uniq > $out sed -nr 's/.*(deps\["(.*)_path"\]).*/\2/p' ${file} | uniq > $out
@ -136,7 +139,7 @@ in {
return deps return deps
''; '';
}; };
confDir = lib.sourceFilesBySuffices ./. ["lua" "vim"]; confDir = lib.sourceFilesBySuffices ./. [ "lua" "vim" ];
in in
with lib; '' with lib; ''
vim.cmd [[source ${confDir}/init.vim]] vim.cmd [[source ${confDir}/init.vim]]
@ -144,8 +147,9 @@ in {
dofile("${confDir}/init.lua") dofile("${confDir}/init.lua")
''; '';
}; };
programs.git.ignores = [".nvim_session"]; programs.git.ignores = [ ".nvim_session" ];
xdg.configFile."nvim/coc-settings.json".text = let xdg.configFile."nvim/coc-settings.json".text =
let
preferProjectEnv = binName: alternate: preferProjectEnv = binName: alternate:
pkgs.writeShellScript "${binName}-switcher" '' pkgs.writeShellScript "${binName}-switcher" ''
if command -v ${binName}; then if command -v ${binName}; then
@ -154,15 +158,16 @@ in {
${alternate} ''${@} ${alternate} ''${@}
fi fi
''; '';
addSDK = { addSDK =
name, { name
lsp, , lsp
sdk, , sdk
,
}: }:
with pkgs; with pkgs;
runCommandLocal name runCommandLocal name
{ {
nativeBuildInputs = [makeWrapper]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
makeWrapper ${lsp} $out \ makeWrapper ${lsp} $out \
--prefix PATH : ${lib.makeBinPath sdk} --prefix PATH : ${lib.makeBinPath sdk}
@ -189,55 +194,55 @@ in {
fullFunctionSignatures.enable = true; # https://github.com/rust-lang/rust-analyzer/pull/15582 fullFunctionSignatures.enable = true; # https://github.com/rust-lang/rust-analyzer/pull/15582
snippets = { snippets = {
"return Err(..)" = { "return Err(..)" = {
postfix = ["reterr"]; postfix = [ "reterr" ];
body = ''return Err($${receiver});''; body = ''return Err($${receiver});'';
description = "return expression as Err"; description = "return expression as Err";
scope = "expr"; scope = "expr";
}; };
"format!(..)" = { "format!(..)" = {
postfix = ["fmt"]; postfix = [ "fmt" ];
body = ''format!($${receiver})''; body = ''format!($${receiver})'';
description = "use receiver as format string"; description = "use receiver as format string";
scope = "expr"; scope = "expr";
}; };
"wrap { .. }" = { "wrap { .. }" = {
postfix = ["brace" "wrap"]; postfix = [ "brace" "wrap" ];
body = ''{$${receiver}}''; body = ''{$${receiver}}'';
description = "wrap this type in { .. }"; description = "wrap this type in { .. }";
scope = "expr"; scope = "expr";
}; };
"async move { .. }" = { "async move { .. }" = {
postfix = ["asyncm"]; postfix = [ "asyncm" ];
body = ''async move {$${receiver}}''; body = ''async move {$${receiver}}'';
description = "wrap this type in async move { .. }"; description = "wrap this type in async move { .. }";
scope = "expr"; scope = "expr";
}; };
"try { .. }" = { "try { .. }" = {
postfix = ["try"]; postfix = [ "try" ];
body = ''let result: Result<_,_> = try {$${receiver}};''; body = ''let result: Result<_,_> = try {$${receiver}};'';
description = "wrap this type in try { .. }"; description = "wrap this type in try { .. }";
scope = "expr"; scope = "expr";
}; };
"while let Some(item) = { .. } {}" = { "while let Some(item) = { .. } {}" = {
postfix = ["letwhile"]; postfix = [ "letwhile" ];
body = ''while let Some(item) = $${receiver} {}''; body = ''while let Some(item) = $${receiver} {}'';
description = "wrap this type in while let Some"; description = "wrap this type in while let Some";
scope = "expr"; scope = "expr";
}; };
"let $x = $x.clone()" = { "let $x = $x.clone()" = {
postfix = ["cloned"]; postfix = [ "cloned" ];
body = ''let $${receiver} = $${receiver}.clone();''; body = ''let $${receiver} = $${receiver}.clone();'';
description = "clone a variable into a new binding"; description = "clone a variable into a new binding";
scope = "expr"; scope = "expr";
}; };
"let $x = $x.into()" = { "let $x = $x.into()" = {
postfix = ["into"]; postfix = [ "into" ];
body = ''let $${receiver} = $${receiver}.clone();''; body = ''let $${receiver} = $${receiver}.clone();'';
description = "call into() and create a new binding"; description = "call into() and create a new binding";
scope = "expr"; scope = "expr";
}; };
"assert_eq!($x, .. );" = { "assert_eq!($x, .. );" = {
postfix = ["asseq"]; postfix = [ "asseq" ];
body = ''assert_eq!($${receiver}, );''; body = ''assert_eq!($${receiver}, );'';
description = "create an assertion for the expression"; description = "create an assertion for the expression";
scope = "expr"; scope = "expr";
@ -251,7 +256,7 @@ in {
serverPath = addSDK { serverPath = addSDK {
name = "rust-env"; name = "rust-env";
lsp = "${rust-analyzer}/bin/rust-analyzer"; lsp = "${rust-analyzer}/bin/rust-analyzer";
sdk = [rust-sdk]; sdk = [ rust-sdk ];
}; };
imports.group.enable = true; imports.group.enable = true;
inlayHints = { inlayHints = {
@ -274,7 +279,7 @@ in {
enable = true; enable = true;
experimental.enable = true; experimental.enable = true;
}; };
files.excludeDirs = ["result" "target"]; files.excludeDirs = [ "result" "target" ];
extraEnv = { extraEnv = {
RA_LOG = "debug"; RA_LOG = "debug";
}; };
@ -282,14 +287,14 @@ in {
languageserver = { languageserver = {
ccls = { ccls = {
command = preferProjectEnv "ccls" "${pkgs.ccls}/bin/ccls"; command = preferProjectEnv "ccls" "${pkgs.ccls}/bin/ccls";
filetypes = ["c" "cc" "cpp" "c++" "objc" "objcpp"]; filetypes = [ "c" "cc" "cpp" "c++" "objc" "objcpp" ];
rootPatterns = [".ccls" "compile_commands.json" ".git/" ".hg/"]; rootPatterns = [ ".ccls" "compile_commands.json" ".git/" ".hg/" ];
initializationOptions = { initializationOptions = {
cache = { cache = {
directory = "${config.xdg.cacheHome}/ccls"; directory = "${config.xdg.cacheHome}/ccls";
}; };
}; };
clang.extraOptions = ["-std=c++20"]; clang.extraOptions = [ "-std=c++20" ];
}; };
nix = { nix = {
command = "${pkgs.nil}/bin/nil"; command = "${pkgs.nil}/bin/nil";
@ -299,15 +304,15 @@ in {
autoEvalInputs = true; autoEvalInputs = true;
}; };
maxMemoryMB = 1024 * 4; maxMemoryMB = 1024 * 4;
rootPatterns = ["flake.nix"]; rootPatterns = [ "flake.nix" ];
filetypes = ["nix"]; filetypes = [ "nix" ];
}; };
diagnostic-languageserver = { diagnostic-languageserver = {
filetypes = { filetypes = {
sh = ["${pkgs.shellcheck}/bin/shellcheck"]; sh = [ "${pkgs.shellcheck}/bin/shellcheck" ];
}; };
}; };
cSpell = {diagnosticLevel = "hint";}; cSpell = { diagnosticLevel = "hint"; };
}; };
}; };
home.sessionVariables = rec { home.sessionVariables = rec {