diff --git a/modules/home/firefox/default.nix b/modules/home/firefox/default.nix index 3f90e82..f4bc4ed 100644 --- a/modules/home/firefox/default.nix +++ b/modules/home/firefox/default.nix @@ -58,7 +58,7 @@ user_pref("media.rdd-vpx.enabled", true); ''; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin facebook-container metamask diff --git a/modules/home/floorp/default.nix b/modules/home/floorp/default.nix index e365cad..8b0a785 100644 --- a/modules/home/floorp/default.nix +++ b/modules/home/floorp/default.nix @@ -31,7 +31,7 @@ user_pref("media.rdd-vpx.enabled", true); ''; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin facebook-container metamask diff --git a/modules/home/vs-code/default.nix b/modules/home/vs-code/default.nix index 811ba1e..21a20b1 100644 --- a/modules/home/vs-code/default.nix +++ b/modules/home/vs-code/default.nix @@ -3,72 +3,74 @@ enable = true; package = pkgs.vscodium; - keybindings = [ - { - "key" = "f7"; - "command" = "-editor.action.wordHighlight.next"; - "when" = "editorTextFocus && hasWordHighlights"; - } - { - "key" = "f7"; - "command" = "-editor.action.accessibleDiffViewer.next"; - "when" = "isInDiffEditor"; - } - { - "key" = "f7"; - "command" = "workbench.action.terminal.toggleTerminal"; - "when" = "terminal.active"; - } - { - "key" = "ctrl+`"; - "command" = "-workbench.action.terminal.toggleTerminal"; - "when" = "terminal.active"; - } - ]; + profiles.default = { + keybindings = [ + { + "key" = "f7"; + "command" = "-editor.action.wordHighlight.next"; + "when" = "editorTextFocus && hasWordHighlights"; + } + { + "key" = "f7"; + "command" = "-editor.action.accessibleDiffViewer.next"; + "when" = "isInDiffEditor"; + } + { + "key" = "f7"; + "command" = "workbench.action.terminal.toggleTerminal"; + "when" = "terminal.active"; + } + { + "key" = "ctrl+`"; + "command" = "-workbench.action.terminal.toggleTerminal"; + "when" = "terminal.active"; + } + ]; - userSettings = { - "window.zoomLevel" = 2; - "window.menuBarVisibility" = "toggle"; + userSettings = { + "window.zoomLevel" = 2; + "window.menuBarVisibility" = "toggle"; - "workbench.colorTheme" = "Poimandres Alternate"; - "workbench.startupEditor" = "none"; + "workbench.colorTheme" = "Poimandres Alternate"; + "workbench.startupEditor" = "none"; - "editor.fontFamily" = "FiraCode NF, FiraCode Nerd Font"; - "editor.fontLigatures" = true; - "editor.cursorBlinking" = "smooth"; - "editor.minimap.enabled" = false; + "editor.fontFamily" = "FiraCode NF, FiraCode Nerd Font"; + "editor.fontLigatures" = true; + "editor.cursorBlinking" = "smooth"; + "editor.minimap.enabled" = false; - "terminal.integrated.fontFamily" = "FiraCode NF, FiraCode Nerd Font , FiraCode"; + "terminal.integrated.fontFamily" = "FiraCode NF, FiraCode Nerd Font , FiraCode"; + }; + + extensions = + (with pkgs.vscode-extensions; [ + wakatime.vscode-wakatime + ms-dotnettools.csharp + naumovs.color-highlight + ms-vscode-remote.remote-containers + ms-azuretools.vscode-docker + mikestead.dotenv + golang.go + wix.vscode-import-cost + sumneko.lua + yzhang.markdown-all-in-one + jnoortheen.nix-ide + esbenp.prettier-vscode + prisma.prisma + ms-python.python + ms-vscode-remote.remote-ssh + humao.rest-client + bradlc.vscode-tailwindcss + gruntfuggly.todo-tree + ]) + ++ (with pkgs.vscode-marketplace; [ + danielpriestley.poimandres-alternate + pufferbommy.pretty-poimandres + yoavbls.pretty-ts-errors + formulahendry.auto-rename-tag + chakrounanas.turbo-console-log + streetsidesoftware.code-spell-checker + ]); }; - - extensions = - (with pkgs.vscode-extensions; [ - wakatime.vscode-wakatime - ms-dotnettools.csharp - naumovs.color-highlight - ms-vscode-remote.remote-containers - ms-azuretools.vscode-docker - mikestead.dotenv - golang.go - wix.vscode-import-cost - sumneko.lua - yzhang.markdown-all-in-one - jnoortheen.nix-ide - esbenp.prettier-vscode - prisma.prisma - ms-python.python - ms-vscode-remote.remote-ssh - humao.rest-client - bradlc.vscode-tailwindcss - gruntfuggly.todo-tree - ]) - ++ (with pkgs.vscode-marketplace; [ - danielpriestley.poimandres-alternate - pufferbommy.pretty-poimandres - yoavbls.pretty-ts-errors - formulahendry.auto-rename-tag - chakrounanas.turbo-console-log - streetsidesoftware.code-spell-checker - ]); }; }