Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

vscode: apply nixfmt

Browse source
This commit is contained in:
Robert Helgesson 2020-10-12 22:51:12 +02:00
parent aecd4acfb4
commit e7d5531cfa
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
format
View file

@ -38,7 +38,6 @@ find . -name '*.nix' \
! -path ./modules/programs/lesspipe.nix \
! -path ./modules/programs/ssh.nix \
! -path ./modules/programs/tmux.nix \
! -path ./modules/programs/vscode.nix \
! -path ./modules/programs/zsh.nix \
! -path ./modules/services/gpg-agent.nix \
! -path ./modules/services/kbfs.nix \

58
modules/programs/vscode.nix
View file

@ -20,20 +20,18 @@ let
"vscodium" = "vscode-oss";
}.${vscodePname};
userDir =
if pkgs.stdenv.hostPlatform.isDarwin then
"Library/Application Support/${configDir}/User"
else
"${config.xdg.configHome}/${configDir}/User";
userDir = if pkgs.stdenv.hostPlatform.isDarwin then
"Library/Application Support/${configDir}/User"
else
"${config.xdg.configHome}/${configDir}/User";
configFilePath = "${userDir}/settings.json";
keybindingsFilePath = "${userDir}/keybindings.json";
# TODO: On Darwin where are the extensions?
extensionPath = ".${extensionDir}/extensions";
in
{
in {
options = {
programs.vscode = {
enable = mkEnableOption "Visual Studio Code";
@ -49,7 +47,7 @@ in
userSettings = mkOption {
type = types.attrs;
default = {};
default = { };
example = literalExample ''
{
"update.channel" = "none";
@ -85,7 +83,7 @@ in
};
};
});
default = [];
default = [ ];
example = literalExample ''
[
{
@ -103,7 +101,7 @@ in
extensions = mkOption {
type = types.listOf types.package;
default = [];
default = [ ];
example = literalExample "[ pkgs.vscode-extensions.bbenoist.Nix ]";
description = ''
The extensions Visual Studio Code should be started with.
@ -117,29 +115,21 @@ in
home.packages = [ cfg.package ];
# Adapted from https://discourse.nixos.org/t/vscode-extensions-setup/1801/2
home.file =
let
subDir = "share/vscode/extensions";
toPaths = path:
# Links every dir in path to the extension path.
mapAttrsToList (k: _:
{
"${extensionPath}/${k}".source = "${path}/${subDir}/${k}";
}) (builtins.readDir (path + "/${subDir}"));
toSymlink = concatMap toPaths cfg.extensions;
in
foldr
(a: b: a // b)
{
"${configFilePath}" =
mkIf (cfg.userSettings != {}) {
text = builtins.toJSON cfg.userSettings;
};
"${keybindingsFilePath}" =
mkIf (cfg.keybindings != []) {
text = builtins.toJSON cfg.keybindings;
};
}
toSymlink;
home.file = let
subDir = "share/vscode/extensions";
toPaths = path:
# Links every dir in path to the extension path.
mapAttrsToList
(k: _: { "${extensionPath}/${k}".source = "${path}/${subDir}/${k}"; })
(builtins.readDir (path + "/${subDir}"));
toSymlink = concatMap toPaths cfg.extensions;
in foldr (a: b: a // b) {
"${configFilePath}" = mkIf (cfg.userSettings != { }) {
text = builtins.toJSON cfg.userSettings;
};
"${keybindingsFilePath}" = mkIf (cfg.keybindings != [ ]) {
text = builtins.toJSON cfg.keybindings;
};
} toSymlink;
};
}