fireproof/nixos
1
0
Fork 0
mirror of https://github.com/nickolaj-jepsen/nixos.git synced 2026-01-22 08:06:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: wrangle vscode config

Browse source
This commit is contained in:
Nickolaj Jepsen 2025-03-07 10:12:35 +01:00
parent 9548960d6a
commit c5f8df4b9f
3 changed files with 59 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/apps/vscode.nix
View file

@ -5,13 +5,9 @@
lib,
...
}: let
# stable = inputs.nix-vscode-extensions.extensions.${pkgs.system}.vscode-marketplace-release;
nix-vscode-extensions = (inputs.nix-vscode-extensions.overlays.default pkgs pkgsUnstable);
# vscode-extensions = nix-vscode-extensions.extensions.${pkgs.system};
vscodePackage = pkgsUnstable.vscode;
vscodeMarketplace = nix-vscode-extensions.vscode-marketplace;
vscodeMarketplaceRelease = nix-vscode-extensions.vscode-marketplace-release;
vscodePkgs = vscodeMarketplace // vscodeMarketplaceRelease; # Prefer release over pre-release
vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};
vscodePkgs = vscode-extensions.vscode-marketplace // vscode-extensions.vscode-marketplace-release; # Prefer release over pre-release
mkFormatter = formatter: languages: {
"[${lib.concatStringsSep "][" languages}]" = {
@ -19,6 +15,9 @@
"editor.formatOnSave" = true;
};
};
# I can't get nix-vscode-extensions to respect allowUnfree, so this is a workaround
allowUnfree = ext: ext.override {meta.license = [];};
in {
fireproof.home-manager = {
programs.vscode = {
@ -59,11 +58,11 @@ in {
];
extensions = with vscodePkgs; [
# Remote
ms-vscode-remote.remote-ssh
(allowUnfree ms-vscode-remote.remote-ssh)
# AI
github.copilot
github.copilot-chat
(allowUnfree github.copilot)
(allowUnfree github.copilot-chat)
# Python
ms-pyright.pyright

92
modules/shell/neovim.nix
View file

@ -1,61 +1,61 @@
_: {
config = {
programs.neovim = {
enable = true;
vimAlias = true;
defaultEditor = true;
};
programs.nvf = {
enable = true;
settings.vim = {
viAlias = true;
programs.neovim = {
enable = true;
vimAlias = true;
defaultEditor = true;
};
lineNumberMode = "number";
programs.nvf = {
enable = true;
lsp = {
enable = true;
lightbulb.enable = true;
};
settings.vim = {
viAlias = true;
vimAlias = true;
languages = {
enableLSP = true;
enableFormat = true;
enableTreesitter = true;
lineNumberMode = "number";
nix.enable = true;
markdown.enable = true;
rust.enable = true;
sql.enable = true;
ts.enable = true;
html.enable = true;
python.enable = true;
};
lsp = {
enable = true;
lightbulb.enable = true;
};
git.enable = true;
languages = {
enableLSP = true;
enableFormat = true;
enableTreesitter = true;
telescope.enable = true;
autopairs.nvim-autopairs.enable = true;
autocomplete.blink-cmp.enable = true;
statusline.lualine.enable = true;
nix.enable = true;
markdown.enable = true;
rust.enable = true;
sql.enable = true;
ts.enable = true;
html.enable = true;
python.enable = true;
};
utility = {
ccc.enable = false;
vim-wakatime.enable = false;
icon-picker.enable = false;
motion.leap.enable = true;
};
ui = {
borders.enable = true;
colorizer.enable = true;
};
git.enable = true;
binds = {
whichKey.enable = true;
telescope.enable = true;
autopairs.nvim-autopairs.enable = true;
autocomplete.blink-cmp.enable = true;
statusline.lualine.enable = true;
utility = {
ccc.enable = false;
vim-wakatime.enable = false;
icon-picker.enable = false;
motion.leap.enable = true;
};
ui = {
borders.enable = true;
colorizer.enable = true;
};
binds = {
whichKey.enable = true;
};
};
};
};
};
}