From f08b8054a80c8185eabfe44b44b75672e8994b55 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Mon, 30 May 2022 15:25:46 +0400 Subject: [PATCH] Add vscode tasks --- .vscode/tasks.json | 32 ++++++++++++++++++++++ profiles/applications/vscodium/default.nix | 7 +++++ profiles/applications/vscodium/theme.nix | 20 +++++++------- 3 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..180fcd7 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,32 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Build", + "type": "shell", + "command": "nixos-rebuild", + "args": [ + "build", + "--flake", + "${workspaceFolder}" + ], + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "Switch", + "type": "shell", + "command": "nixos-rebuild", + "args": [ + "switch", + "--flake", + "${workspaceFolder}", + "--use-remote-sudo" + ], + "problemMatcher": [] + } + ] +} \ No newline at end of file diff --git a/profiles/applications/vscodium/default.nix b/profiles/applications/vscodium/default.nix index a296540..17e8951 100644 --- a/profiles/applications/vscodium/default.nix +++ b/profiles/applications/vscodium/default.nix @@ -22,6 +22,7 @@ (pkgs.callPackage ./theme.nix { } config.themes.colors) matklad.rust-analyzer + ocamllabs.ocaml-platform redhat.vscode-yaml bbenoist.nix brettm12345.nixfmt-vscode @@ -34,7 +35,13 @@ "update.channel" = "none"; "[nix]"."editor.tabSize" = 2; "workbench.colorTheme" = "Balsoft's generated theme"; + "vim.useCtrlKeys" = false; }; + keybindings = [{ + key = "ctrl+shift+r"; + command = "workbench.action.tasks.runTask"; + when = "textInputFocus"; + }]; }; }; } diff --git a/profiles/applications/vscodium/theme.nix b/profiles/applications/vscodium/theme.nix index f8b68de..4cf7c3b 100644 --- a/profiles/applications/vscodium/theme.nix +++ b/profiles/applications/vscodium/theme.nix @@ -34,7 +34,7 @@ let "charts.purple" = "#${base0E}"; "charts.red" = "#${base08}"; "charts.yellow" = "#${base0A}"; - "checkbox.background" = "#${base00}"; + "checkbox.background" = "#${base01}"; "checkbox.foreground" = "#${base05}"; "debugConsole.errorForeground" = "#${base08}"; "debugConsole.infoForeground" = "#${base05}"; @@ -152,14 +152,14 @@ let "extensionButton.prominentHoverBackground" = "#${base02}"; foreground = "#${base05}"; "gitDecoration.addedResourceForeground" = "#${base0B}"; - "gitDecoration.conflictingResourceForeground" = "#${base0A}"; + "gitDecoration.conflictingResourceForeground" = "#${base09}"; "gitDecoration.deletedResourceForeground" = "#${base08}"; "gitDecoration.ignoredResourceForeground" = "#${base03}"; - "gitDecoration.modifiedResourceForeground" = "#${base0E}"; - "gitDecoration.stageDeletedResourceForeground" = "#${base08}"; - "gitDecoration.stageModifiedResourceForeground" = "#${base0E}"; + "gitDecoration.modifiedResourceForeground" = "#${base0A}"; + "gitDecoration.stageDeletedResourceForeground" = "#${base0C}"; + "gitDecoration.stageModifiedResourceForeground" = "#${base0C}"; "gitDecoration.submoduleResourceForeground" = "#${base0F}"; - "gitDecoration.untrackedResourceForeground" = "#${base09}"; + "gitDecoration.untrackedResourceForeground" = "#${base0E}"; "icon.foreground" = "#${base04}"; "input.background" = "#${base00}"; "input.foreground" = "#${base05}"; @@ -260,9 +260,9 @@ let "scrollbarSlider.background" = "#${base02}6f"; "scrollbarSlider.hoverBackground" = "#${base03}6f"; "selection.background" = "#${base01}"; - "settings.checkboxBackground" = "#${base00}"; + "settings.checkboxBackground" = "#${base01}"; "settings.checkboxForeground" = "#${base05}"; - "settings.dropdownBackground" = "#${base00}"; + "settings.dropdownBackground" = "#${base01}"; "settings.dropdownForeground" = "#${base05}"; "settings.focusedRowBackground" = "#${base02}"; "settings.headerForeground" = "#${base05}"; @@ -270,7 +270,7 @@ let "settings.modifiedItemIndicator" = "#${base0D}"; "settings.numberInputBackground" = "#${base00}"; "settings.numberInputForeground" = "#${base05}"; - "settings.textInputBackground" = "#${base00}"; + "settings.textInputBackground" = "#${base01}"; "settings.textInputForeground" = "#${base05}"; "sideBar.background" = "#${base00}"; "sideBar.dropBackground" = "#${base01}6f"; @@ -481,7 +481,7 @@ let { name = "Embedded"; scope = [ "punctuation.section.embedded" "variable.interpolation" ]; - settings = { foreground = "#${base0F}"; }; + settings = { foreground = "#${base0C}"; }; } { name = "Tag";