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

Compare commits

base: 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
..
compare: 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

No commits in common. "fea701c7b85002d4899bee1a27ad54020cc026ae" and "80eaacd3a36d553767ec0eaceaf29db8bb8c445c" have entirely different histories.
fea701c7b8 ... 80eaacd3a3

2 changed files with 30 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,17 +22,12 @@
indent-guides.render = true; indent-guides.render = true;
}; };
}; };
}; languages = [
# The builtin languages options have issues {
# https://github.com/nix-community/home-manager/issues/3299 name = "nix";
xdg.configFile."helixLanguages" = { formatter.command = "nixpkgs-fmt";
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,39 +2,31 @@
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 = { home-manager.users.toast.programs.vscode = {
home.packages = with pkgs; [ enable = true;
nixpkgs-fmt package = pkgs.vscodium;
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
]; ];
programs.vscode = { userSettings = {
enable = true; # VSCode doesn't like nested settings
package = pkgs.vscodium; # https://stackoverflow.com/questions/74134436/is-it-possible-to-express-settings-in-vs-codes-settings-json-where-each-dot-sep
mutableExtensionsDir = false; # TODO: write a function that unnests settings
extensions = with inputs.vscode-extensions.extensions.x86_64-linux.open-vsx; [ "workbench.colorTheme" = "Catppuccin Mocha";
jnoortheen.nix-ide "workbench.iconTheme" = "catppuccin-mocha";
(pkgs.catppuccin-vsc.override { "editor.fontFamily" = "JetBrainsMono Nerd Font";
workbenchMode = "flat"; "editor.semanticHighlighting.enabled" = true;
extraBordersEnabled = true; "nix.enableLanguageServer" = true;
}) "nix.serverPath" = "${pkgs.nil}/bin/nil";
catppuccin.catppuccin-vsc-icons "terminal.integrated.minimumContrastRatio" = 1;
waderyan.gitblame "window.titleBarStyle" = "custom";
];
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";
};
}; };
}; };
} }