Refactor packages

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/user/gui/vscode/default.nix

@@ -21,75 +21,76 @@ in
 
     programs.vscode = {
       enable = true;
-
       mutableExtensionsDir = false;
 
-      extensions = with pkgs.vscode-extensions; [
-        mkhl.direnv
-        mhutchie.git-graph
-        ms-vsliveshare.vsliveshare
-        naumovs.color-highlight
-      ];
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          mkhl.direnv
+          mhutchie.git-graph
+          ms-vsliveshare.vsliveshare
+          naumovs.color-highlight
+        ];
 
-      userSettings = {
-        "diffEditor.ignoreTrimWhitespace" = false;
-        "editor.accessibilitySupport" = "off";
-        "editor.cursorBlinking" = "phase";
-        "editor.cursorSmoothCaretAnimation" = "on";
-        "editor.fontFamily" = builtins.concatStringsSep ", " hmConfig.theme.font.monospace.names;
-        "editor.fontLigatures" = true;
-        "editor.fontSize" = hmConfig.theme.font.size;
-        "editor.formatOnPaste" = true;
-        "editor.formatOnSave" = true;
-        "editor.formatOnType" = true;
-        "editor.indentSize" = "tabSize";
-        "editor.inlineSuggest.enabled" = true;
-        "editor.largeFileOptimizations" = false;
-        "editor.linkedEditing" = true;
-        "editor.renderFinalNewline" = "on";
-        "editor.smoothScrolling" = true;
-        "editor.stickyScroll.enabled" = true;
-        "editor.suggestSelection" = "first";
-        "editor.tabSize" = 2;
-        "editor.unicodeHighlight.includeComments" = true;
-        "editor.unicodeHighlight.nonBasicASCII" = true;
-        "explorer.confirmDelete" = false;
-        "explorer.confirmDragAndDrop" = false;
-        "explorer.confirmPasteNative" = false;
-        "extensions.autoCheckUpdates" = false;
-        "extensions.autoUpdate" = false;
-        "extensions.ignoreRecommendations" = true;
-        "files.autoSave" = "afterDelay";
-        "files.eol" = "\n";
-        "files.insertFinalNewline" = true;
-        "files.trimFinalNewlines" = true;
-        "files.trimTrailingWhitespace" = true;
-        "git.allowForcePush" = true;
-        "git.alwaysSignOff" = true;
-        "git.autofetch" = "all";
-        "git.closeDiffOnOperation" = true;
-        "git.confirmForcePush" = false;
-        "git.confirmSync" = false;
-        "git.enableCommitSigning" = true;
-        "git.enableSmartCommit" = true;
-        "git.ignoreRebaseWarning" = true;
-        "git.openRepositoryInParentFolders" = "always";
-        "git.path" = lib.meta.getExe pkgs.git;
-        "mergeEditor.diffAlgorithm" = "advanced";
-        "security.workspace.trust.enabled" = false;
-        "telemetry.telemetryLevel" = "off";
-        "terminal.external.linuxExec" = "kitty";
-        "terminal.integrated.confirmOnExit" = "hasChildProcesses";
-        "terminal.integrated.copyOnSelection" = true;
-        "terminal.integrated.fontFamily" =
-          builtins.concatStringsSep ", " hmConfig.theme.font.monospace.names;
-        "terminal.integrated.fontSize" = hmConfig.theme.font.size;
-        "update.mode" = "none";
-        "window.autoDetectColorScheme" = true;
-        "window.autoDetectHighContrast" = false;
-        "window.menuBarVisibility" = "toggle";
-        "workbench.editor.historyBasedLanguageDetection" = true;
-        "workbench.list.smoothScrolling" = true;
+        userSettings = {
+          "diffEditor.ignoreTrimWhitespace" = false;
+          "editor.accessibilitySupport" = "off";
+          "editor.cursorBlinking" = "phase";
+          "editor.cursorSmoothCaretAnimation" = "on";
+          "editor.fontFamily" = builtins.concatStringsSep ", " hmConfig.theme.font.monospace.names;
+          "editor.fontLigatures" = true;
+          "editor.fontSize" = hmConfig.theme.font.size;
+          "editor.formatOnPaste" = true;
+          "editor.formatOnSave" = true;
+          "editor.formatOnType" = true;
+          "editor.indentSize" = "tabSize";
+          "editor.inlineSuggest.enabled" = true;
+          "editor.largeFileOptimizations" = false;
+          "editor.linkedEditing" = true;
+          "editor.renderFinalNewline" = "on";
+          "editor.smoothScrolling" = true;
+          "editor.stickyScroll.enabled" = true;
+          "editor.suggestSelection" = "first";
+          "editor.tabSize" = 2;
+          "editor.unicodeHighlight.includeComments" = true;
+          "editor.unicodeHighlight.nonBasicASCII" = true;
+          "explorer.confirmDelete" = false;
+          "explorer.confirmDragAndDrop" = false;
+          "explorer.confirmPasteNative" = false;
+          "extensions.autoCheckUpdates" = false;
+          "extensions.autoUpdate" = false;
+          "extensions.ignoreRecommendations" = true;
+          "files.autoSave" = "afterDelay";
+          "files.eol" = "\n";
+          "files.insertFinalNewline" = true;
+          "files.trimFinalNewlines" = true;
+          "files.trimTrailingWhitespace" = true;
+          "git.allowForcePush" = true;
+          "git.alwaysSignOff" = true;
+          "git.autofetch" = "all";
+          "git.closeDiffOnOperation" = true;
+          "git.confirmForcePush" = false;
+          "git.confirmSync" = false;
+          "git.enableCommitSigning" = true;
+          "git.enableSmartCommit" = true;
+          "git.ignoreRebaseWarning" = true;
+          "git.openRepositoryInParentFolders" = "always";
+          "git.path" = lib.meta.getExe pkgs.git;
+          "mergeEditor.diffAlgorithm" = "advanced";
+          "security.workspace.trust.enabled" = false;
+          "telemetry.telemetryLevel" = "off";
+          "terminal.external.linuxExec" = "kitty";
+          "terminal.integrated.confirmOnExit" = "hasChildProcesses";
+          "terminal.integrated.copyOnSelection" = true;
+          "terminal.integrated.fontFamily" =
+            builtins.concatStringsSep ", " hmConfig.theme.font.monospace.names;
+          "terminal.integrated.fontSize" = hmConfig.theme.font.size;
+          "update.mode" = "none";
+          "window.autoDetectColorScheme" = true;
+          "window.autoDetectHighContrast" = false;
+          "window.menuBarVisibility" = "toggle";
+          "workbench.editor.historyBasedLanguageDetection" = true;
+          "workbench.list.smoothScrolling" = true;
+        };
       };
     };
 

hosts/common/configs/user/gui/vscode/langs/c/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.c.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
     ms-vscode.cpptools
     ms-vscode.cmake-tools
   ];

hosts/common/configs/user/gui/vscode/langs/docker/default.nix

@@ -5,5 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.docker.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ ms-azuretools.vscode-docker ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
+    ms-azuretools.vscode-docker
+  ];
 }

hosts/common/configs/user/gui/vscode/langs/go/default.nix

@@ -5,5 +5,5 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.go.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ golang.go ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ golang.go ];
 }

hosts/common/configs/user/gui/vscode/langs/java/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.java.enable {
-  programs.vscode = {
+  programs.vscode.profiles.default = {
     extensions =
       with pkgs;
       with vscode-extensions;

hosts/common/configs/user/gui/vscode/langs/jinja/default.nix

@@ -5,5 +5,5 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.jinja.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ wholroyd.jinja ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ wholroyd.jinja ];
 }

hosts/common/configs/user/gui/vscode/langs/lua/default.nix

@@ -5,5 +5,5 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.lua.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ sumneko.lua ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ sumneko.lua ];
 }

hosts/common/configs/user/gui/vscode/langs/markdown/default.nix

@@ -5,5 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.markdown.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ yzhang.markdown-all-in-one ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
+    yzhang.markdown-all-in-one
+  ];
 }

hosts/common/configs/user/gui/vscode/langs/nix/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.nix.enable {
-  programs.vscode = {
+  programs.vscode.profiles.default = {
     userSettings = {
       "nix.enableLanguageServer" = true;
       "nix.serverPath" = lib.meta.getExe pkgs.nil;

hosts/common/configs/user/gui/vscode/langs/python/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.python.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
     ms-python.python
     ms-python.vscode-pylance
     ms-python.debugpy

hosts/common/configs/user/gui/vscode/langs/rest/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.rest.enable {
-  programs.vscode = {
+  programs.vscode.profiles.default = {
     extensions = with pkgs.vscode-extensions; [ humao.rest-client ];
 
     userSettings = {

hosts/common/configs/user/gui/vscode/langs/rust/default.nix

@@ -5,5 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.python.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ rust-lang.rust-analyzer ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
+    rust-lang.rust-analyzer
+  ];
 }

hosts/common/configs/user/gui/vscode/langs/sas/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.sas.enable {
-  programs.vscode = {
+  programs.vscode.profiles.default = {
     extensions = with pkgs.vscode-extensions; [ sas.sas-lsp ];
 
     userSettings = {

hosts/common/configs/user/gui/vscode/langs/sops/default.nix

@@ -5,5 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.sops.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ signageos.signageos-vscode-sops ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
+    signageos.signageos-vscode-sops
+  ];
 }

hosts/common/configs/user/gui/vscode/langs/svelte/default.nix

@@ -5,7 +5,7 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.svelte.enable {
-  programs.vscode = {
+  programs.vscode.profiles.default = {
     userSettings = {
       "svelte.enable-ts-plugin" = true;
     };

hosts/common/configs/user/gui/vscode/langs/typescript/default.nix

@@ -1,11 +1,6 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, ... }:
 lib.mkIf config.programs.vscode.languages.typescript.enable {
-  programs.vscode.userSettings = {
+  programs.vscode.profiles.default.userSettings = {
     "typescript.updateImportsOnFileMove.enabled" = "always";
   };
 }

hosts/common/configs/user/gui/vscode/langs/yaml/default.nix

@@ -5,5 +5,5 @@
   ...
 }:
 lib.mkIf config.programs.vscode.languages.yaml.enable {
-  programs.vscode.extensions = with pkgs.vscode-extensions; [ redhat.vscode-yaml ];
+  programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [ redhat.vscode-yaml ];
 }

hosts/common/configs/user/gui/vscode/options.nix

@@ -51,7 +51,7 @@ in
   ];
 
   config = {
-    programs.vscode = {
+    programs.vscode.profiles.default = {
       extensions =
         with pkgs.vscode-extensions;
         [ ]