Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:80eaacd3a36d553767ec0eaceaf29db8bb8c445c
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
...
compare: Toast:fea701c7b85002d4899bee1a27ad54020cc026ae
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

2 commits
80eaacd3a3 ... fea701c7b8

Author SHA1 Message Date
Toast
fea701c7b8 Desktop/vscode: configure nil to use nixpkgs-fmt to format 2024-02-09 15:40:43 +01:00
Toast
b27ddf6aad Common/helix: manually write languages.toml and configure nil for formatting 2024-02-09 14:12:43 +01:00
2 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

17
roles/common/programs/helix.nix
View file

@ -22,12 +22,17 @@
indent-guides.render = true; indent-guides.render = true;
}; };
}; };
languages = [ };
{ # The builtin languages options have issues
name = "nix"; # https://github.com/nix-community/home-manager/issues/3299
formatter.command = "nixpkgs-fmt"; xdg.configFile."helixLanguages" = {
} target = "helix/languages.toml";
]; text = ''
[language-server.nil]
config.nil.formatting.command = [ "nixpkgs-fmt" ]
[[language]]
name = "nix"
'';
}; };
}; };
} }

56
roles/desktop/programs/vscode.nix
View file

@ -2,31 +2,39 @@
let inputs = flakeSelf.inputs; in let inputs = flakeSelf.inputs; in
{ {
nixpkgs.overlays = [ inputs.catppuccin-vsc.overlays.default ]; nixpkgs.overlays = [ inputs.catppuccin-vsc.overlays.default ];
home-manager.users.toast.programs.vscode = { home-manager.users.toast = {
enable = true; home.packages = with pkgs; [
package = pkgs.vscodium; nixpkgs-fmt
mutableExtensionsDir = false;
extensions = with inputs.vscode-extensions.extensions.x86_64-linux.open-vsx; [
jnoortheen.nix-ide
(pkgs.catppuccin-vsc.override {
workbenchMode = "flat";
extraBordersEnabled = true;
})
catppuccin.catppuccin-vsc-icons
waderyan.gitblame
]; ];
userSettings = { programs.vscode = {
# VSCode doesn't like nested settings enable = true;
# https://stackoverflow.com/questions/74134436/is-it-possible-to-express-settings-in-vs-codes-settings-json-where-each-dot-sep package = pkgs.vscodium;
# TODO: write a function that unnests settings mutableExtensionsDir = false;
"workbench.colorTheme" = "Catppuccin Mocha"; extensions = with inputs.vscode-extensions.extensions.x86_64-linux.open-vsx; [
"workbench.iconTheme" = "catppuccin-mocha"; jnoortheen.nix-ide
"editor.fontFamily" = "JetBrainsMono Nerd Font"; (pkgs.catppuccin-vsc.override {
"editor.semanticHighlighting.enabled" = true; workbenchMode = "flat";
"nix.enableLanguageServer" = true; extraBordersEnabled = true;
"nix.serverPath" = "${pkgs.nil}/bin/nil"; })
"terminal.integrated.minimumContrastRatio" = 1; catppuccin.catppuccin-vsc-icons
"window.titleBarStyle" = "custom"; waderyan.gitblame
];
userSettings = {
# VSCode doesn't like nested settings
# https://stackoverflow.com/questions/74134436/is-it-possible-to-express-settings-in-vs-codes-settings-json-where-each-dot-sep
# TODO: write a function that unnests settings
"workbench.colorTheme" = "Catppuccin Mocha";
"workbench.iconTheme" = "catppuccin-mocha";
"editor.fontFamily" = "JetBrainsMono Nerd Font";
"editor.semanticHighlighting.enabled" = true;
"nix.enableLanguageServer" = true;
"nix.serverPath" = "${pkgs.nil}/bin/nil";
"nix.serverSettings" = {
"nil"."formatting"."command" = [ "nixpkgs-fmt" ];
};
"terminal.integrated.minimumContrastRatio" = 1;
"window.titleBarStyle" = "custom";
};
}; };
}; };
} }