Compare commits
No commits in common. "d87462981e7e420b011da9629a4fd4668af6513e" and "80ad498f9405245e7ae2277cea474ab71b2a5f7e" have entirely different histories.
d87462981e
...
80ad498f94
4 changed files with 1 additions and 51 deletions
|
|
@ -87,6 +87,7 @@
|
||||||
# TODO: move this into a fonts module
|
# TODO: move this into a fonts module
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
aileron
|
aileron
|
||||||
|
nerd-fonts.open-dyslexic
|
||||||
];
|
];
|
||||||
fonts.fontconfig.enable = true;
|
fonts.fontconfig.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ in {
|
||||||
"javascript.updateImportsOnFileMove.enabled" = "always";
|
"javascript.updateImportsOnFileMove.enabled" = "always";
|
||||||
"editor.tabSize" = 2;
|
"editor.tabSize" = 2;
|
||||||
"editor.insertSpaces" = false;
|
"editor.insertSpaces" = false;
|
||||||
"terminal.integrated.fontFamily" = "'Droid Sans Mono', 'monospace', monospace";
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -41,7 +40,6 @@ in {
|
||||||
oneDark.enable = true;
|
oneDark.enable = true;
|
||||||
atomKeybindings.enable = true;
|
atomKeybindings.enable = true;
|
||||||
openRemoteSsh.enable = true;
|
openRemoteSsh.enable = true;
|
||||||
openDyslexicFont.enable = true;
|
|
||||||
|
|
||||||
# html development
|
# html development
|
||||||
autoRenameTag.enable = true;
|
autoRenameTag.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,5 @@
|
||||||
./vitest.nix
|
./vitest.nix
|
||||||
./direnv.nix
|
./direnv.nix
|
||||||
./conventionalCommits.nix
|
./conventionalCommits.nix
|
||||||
./openDyslexicFont.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
options.programs.vscode.profiles = lib.mkOption {
|
|
||||||
type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
|
|
||||||
options = {
|
|
||||||
extraExtensions.openDyslexicFont = {
|
|
||||||
enable = lib.mkEnableOption "should OpenDyslexic font be set as the default font for VSCode";
|
|
||||||
package = lib.mkPackageOption pkgs "nerd-fonts.open-dyslexic" {
|
|
||||||
default = ["nerd-fonts" "open-dyslexic"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = lib.mkIf config.extraExtensions.openDyslexicFont.enable {
|
|
||||||
userSettings = {
|
|
||||||
"editor.fontFamily" = "'OpenDyslexicM Nerd Font Mono', Droid Sans Mono, monospace";
|
|
||||||
"editor.fontSize" = 14;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
|
|
||||||
config = let
|
|
||||||
enabledProfiles =
|
|
||||||
lib.filter (profile: profile.extraExtensions.openDyslexicFont.enable or false)
|
|
||||||
(lib.attrValues config.programs.vscode.profiles);
|
|
||||||
|
|
||||||
anyProfileUsesOpenDyslexicFont = enabledProfiles != [];
|
|
||||||
|
|
||||||
fontPackages = lib.unique (map (profile: profile.extraExtensions.openDyslexicFont.package) enabledProfiles);
|
|
||||||
in {
|
|
||||||
# Ensure OpenDyslexic font packages are installed when any VSCode profile uses them
|
|
||||||
home.packages = fontPackages;
|
|
||||||
|
|
||||||
fonts.fontconfig.enable = lib.mkIf anyProfileUsesOpenDyslexicFont true;
|
|
||||||
|
|
||||||
# Add assertion to ensure the fonts are available
|
|
||||||
assertions =
|
|
||||||
map (fontPkg: {
|
|
||||||
assertion = lib.elem fontPkg config.home.packages;
|
|
||||||
message = "OpenDyslexic font package '${fontPkg.name or "unknown"}' must be installed when using openDyslexicFont extension for VSCode.";
|
|
||||||
})
|
|
||||||
fontPackages;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue