From 71dc19966279a2de5f59917312f0f101f6f8102b Mon Sep 17 00:00:00 2001 From: foglar Date: Sun, 16 Mar 2025 13:12:27 +0100 Subject: [PATCH] vscode profile style fix --- nixos/home/apps/hacking.nix | 1 + nixos/home/packages/programming/code.nix | 22 +++++++++++----------- nixos/home/packages/style.nix | 2 ++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/home/apps/hacking.nix b/nixos/home/apps/hacking.nix index 8014c46..448c332 100644 --- a/nixos/home/apps/hacking.nix +++ b/nixos/home/apps/hacking.nix @@ -12,6 +12,7 @@ home.packages = with pkgs; [ ffuf wireshark + whois termshark nmap netcat-openbsd diff --git a/nixos/home/packages/programming/code.nix b/nixos/home/packages/programming/code.nix index fefc8b3..405e09c 100644 --- a/nixos/home/packages/programming/code.nix +++ b/nixos/home/packages/programming/code.nix @@ -45,7 +45,7 @@ programs.vscode = { enable = true; package = pkgs-stable.vscode; - profiles.default = { + profiles.${userSettings.username} = { userSettings = { "files.autoSave" = "afterDelay"; "explorer.confirmDragAndDrop" = false; @@ -94,7 +94,7 @@ }; }) (lib.mkIf config.program.vscode.ide.python.enable { - programs.vscode.profiles.default = { + programs.vscode.profiles.${userSettings.username} = { userSettings = { "[python]" = { "editor.defaultFormatter" = "ms-python.black-formatter"; @@ -116,7 +116,7 @@ }) (lib.mkIf config.program.vscode.ide.go.enable { - programs.vscode.profiles.default = { + programs.vscode.profiles.${userSettings.username} = { userSettings = { "go.alternateTools" = { "go-langserver" = "${pkgs.gopls}/bin/gopls"; @@ -136,7 +136,7 @@ }) (lib.mkIf config.program.vscode.ide.csharp.enable { - programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [ + programs.vscode.profiles.${userSettings.username}.extensions = with pkgs-stable.vscode-extensions; [ ms-dotnettools.csharp ms-dotnettools.csdevkit ms-dotnettools.vscodeintellicode-csharp @@ -145,7 +145,7 @@ }) (lib.mkIf config.program.vscode.nix.enable { - programs.vscode.profiles.default = { + programs.vscode.profiles.${userSettings.username} = { userSettings = { "nix.serverPath" = "nixd"; "nix.enableLanguageServer" = true; @@ -178,7 +178,7 @@ }) (lib.mkIf config.program.vscode.ide.web.enable { - programs.vscode.profiles.default = { + programs.vscode.profiles.${userSettings.username} = { userSettings = { "[json]" = { "editor.defaultFormatter" = "esbenp.prettier-vscode"; @@ -202,7 +202,7 @@ }) (lib.mkIf config.program.vscode.git.enable { - programs.vscode.profiles.default = { + programs.vscode.profiles.${userSettings.username} = { userSettings = { "git.autofetch" = true; }; @@ -217,7 +217,7 @@ }) (lib.mkIf config.program.vscode.markdown.enable { - programs.vscode.profiles.default = { + programs.vscode.profiles.${userSettings.username} = { userSettings = { "[markdown]" = { "editor.defaultFormatter" = "yzhang.markdown-all-in-one"; @@ -233,7 +233,7 @@ }) (lib.mkIf config.program.vscode.themes.enable { - programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [ + programs.vscode.profiles.${userSettings.username}.extensions = with pkgs-stable.vscode-extensions; [ catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons zhuangtongfa.material-theme @@ -243,7 +243,7 @@ }) (lib.mkIf config.program.vscode.ai.enable { - programs.vscode.profiles.default = { + programs.vscode.profiles.${userSettings.username} = { userSettings = { "github.copilot.editor.enableAutoCompletions" = true; }; @@ -256,7 +256,7 @@ }) (lib.mkIf config.program.vscode.ide.cpp.enable { - programs.vscode.profiles.default.extensions = with pkgs-stable.vscode-extensions; [ + programs.vscode.profiles.${userSettings.username}.extensions = with pkgs-stable.vscode-extensions; [ twxs.cmake ms-vscode.cmake-tools ]; diff --git a/nixos/home/packages/style.nix b/nixos/home/packages/style.nix index 628935d..6bf0eff 100644 --- a/nixos/home/packages/style.nix +++ b/nixos/home/packages/style.nix @@ -2,6 +2,7 @@ lib, config, pkgs, + userSettings, ... }: { options = { @@ -20,6 +21,7 @@ btop.enable = lib.mkDefault true; fzf.enable = lib.mkDefault true; swaync.enable = true; + vscode.profileNames = [ "${userSettings.username}" ]; tmux.enable = if config.program.tmux.enable