Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into vm
Browse files Browse the repository at this point in the history
  • Loading branch information
inclyc committed Dec 25, 2024
2 parents 07842c8 + 168ea1e commit acb715f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion home/lyc/configurations/aplax/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

home.packages = with pkgs; [
nerd-fonts.fira-code
(hiPrio clang-tools_16)
(texlive.combine { inherit (texlive) scheme-full; })
clash-meta
pinentry_mac
Expand Down
2 changes: 1 addition & 1 deletion home/lyc/modules/programs/vscode/vscode.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"terminal.integrated.profiles.osx".zsh.path = zshPath;
"terminal.integrated.profiles.linux".zsh.path = zshPath;
"nix.enableLanguageServer" = true;
"nix.serverPath" = "${lib.getExe pkgs.nixd}";
"nix.serverPath" = "nixd";
"nix.serverSettings" = {
nixd = {
formatting.command = [ "nixfmt" ];
Expand Down

0 comments on commit acb715f

Please sign in to comment.