From 4de4f3133134cc09b59caee1230df87dc329247d Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:32:00 +0400 Subject: [PATCH] make vscode more ganoo philosopy --- modules/dev/editors/vscode/default.nix | 51 ++++++++++---------------- modules/dev/editors/vscode/fhs.nix | 16 ++------ 2 files changed, 22 insertions(+), 45 deletions(-) diff --git a/modules/dev/editors/vscode/default.nix b/modules/dev/editors/vscode/default.nix index df6328fc..02b95a6b 100644 --- a/modules/dev/editors/vscode/default.nix +++ b/modules/dev/editors/vscode/default.nix @@ -1,41 +1,28 @@ -{ - outputs, - options, - config, - lib, - pkgs, - ... -}: -let - cfg = config.modules.dev.editors.vscode; +{ outputs, options, config, lib, pkgs, ... }: +let cfg = config.modules.dev.editors.vscode; in { - imports = [ - ./fhs.nix - ]; - options.modules.dev.editors.vscode = { - enable = lib.mkEnableOption false; - }; + imports = [ ./fhs.nix ]; + options.modules.dev.editors.vscode = { enable = lib.mkEnableOption false; }; config = lib.mkIf cfg.enable { - users.users.sako.packages = with pkgs; [ - (vscode-with-extensions.override { - vscodeExtensions = with vscode-extensions; - [ - mkhl.direnv - vscodevim.vim - ms-python.vscode-pylance - ms-vscode.cmake-tools - ms-dotnettools.csharp - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { + users.users.sako.packages = with pkgs; + [ + (vscode-with-extensions.override { + vscode = vscodium; + vscodeExtensions = with vscode-extensions; + [ + mkhl.direnv + vscodevim.vim + ms-python.vscode-pylance + ms-vscode.cmake-tools + ms-dotnettools.csharp + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [{ name = "better-comments"; publisher = "aaron-bond"; version = "3.0.2"; sha256 = "hQmA8PWjf2Nd60v5EAuqqD8LIEu7slrNs8luc3ePgZc="; - } - ]; - }) - ]; + }]; + }) + ]; }; } diff --git a/modules/dev/editors/vscode/fhs.nix b/modules/dev/editors/vscode/fhs.nix index d3b6d3c6..a41bfb3b 100644 --- a/modules/dev/editors/vscode/fhs.nix +++ b/modules/dev/editors/vscode/fhs.nix @@ -1,21 +1,11 @@ -{ - outputs, - options, - config, - lib, - pkgs, - ... -}: -let - cfg = config.modules.dev.editors.vscode.fhs; +{ outputs, options, config, lib, pkgs, ... }: +let cfg = config.modules.dev.editors.vscode.fhs; in { options.modules.dev.editors.vscode.fhs = { enable = lib.mkEnableOption false; }; config = lib.mkIf cfg.enable { - users.users.sako.packages = with pkgs; [ - vscode.fhs - ]; + users.users.sako.packages = with pkgs; [ vscodium.fhs ]; }; }