Switch to 4 space indentation

This commit is contained in:
SebastianStork 2024-03-17 13:15:01 +01:00
parent a4cc33577c
commit d7aed49725
32 changed files with 796 additions and 783 deletions

View file

@ -1,50 +1,63 @@
{
config,
pkgs,
lib,
...
config,
pkgs,
lib,
...
}: {
options.myConfig.vscode.enable = lib.mkEnableOption "";
options.myConfig.vscode.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.vscode.enable {
home.packages = [pkgs.nil];
config = lib.mkIf config.myConfig.vscode.enable {
home.packages = let
alejandra4 = pkgs.alejandra.overrideAttrs {
passthru.tests.version = lib.mkForce {};
postPatch = ''
substituteInPlace src/alejandra/src/builder.rs \
--replace '2 * build_ctx.indentation' '4 * build_ctx.indentation'
substituteInPlace src/alejandra/src/rules/string.rs \
--replace 'format!(" {}", line)' 'format!(" {}", line)'
rm -r src/alejandra/tests
'';
};
in [
pkgs.nil
alejandra4
];
programs.vscode = {
enable = true;
package = pkgs.vscodium;
programs.vscode = {
enable = true;
package = pkgs.vscodium;
mutableExtensionsDir = false;
extensions = [
pkgs.vscode-extensions.jnoortheen.nix-ide
pkgs.vscode-extensions.kamadorueda.alejandra
pkgs.vscode-extensions.pkief.material-icon-theme
pkgs.vscode-extensions.mkhl.direnv
];
mutableExtensionsDir = false;
extensions = [
pkgs.vscode-extensions.jnoortheen.nix-ide
pkgs.vscode-extensions.pkief.material-icon-theme
pkgs.vscode-extensions.mkhl.direnv
];
};
systemd.user.tmpfiles.rules = let
settings = builtins.replaceStrings ["\n"] ["\\n"] ''
{
"editor.fontFamily": "JetBrainsMono Nerd Font",
"explorer.confirmDelete": false,
"explorer.confirmDragAndDrop": false,
"extensions.autoCheckUpdates": false,
"files.autoSave": "afterDelay",
"git.autofetch": true,
"git.confirmSync": false,
"nix.enableLanguageServer": true,
"nix.serverPath": "nil",
"update.mode": "none",
"git.suggestSmartCommit": false,
"workbench.sideBar.location": "right",
"editor.renderWhitespace": "none",
"workbench.iconTheme": "material-icon-theme",
"editor.minimap.enabled": false
}
'';
in [
"f+ %h/.config/VSCodium/User/settings.json - - - - ${settings}"
"f+ %h/.config/VSCodium/User/settings-default.json - - - - ${settings}"
];
};
systemd.user.tmpfiles.rules = let
settings = builtins.replaceStrings ["\n"] ["\\n"] ''
{
"editor.fontFamily": "JetBrainsMono Nerd Font",
"explorer.confirmDelete": false,
"explorer.confirmDragAndDrop": false,
"extensions.autoCheckUpdates": false,
"files.autoSave": "afterDelay",
"git.autofetch": true,
"git.confirmSync": false,
"nix.enableLanguageServer": true,
"nix.serverPath": "nil",
"update.mode": "none",
"git.suggestSmartCommit": false,
"workbench.sideBar.location": "right",
"editor.renderWhitespace": "none",
"workbench.iconTheme": "material-icon-theme",
"editor.minimap.enabled": false
}
'';
in [
"f+ %h/.config/VSCodium/User/settings.json - - - - ${settings}"
"f+ %h/.config/VSCodium/User/settings-default.json - - - - ${settings}"
];
};
}