modules/home-manager/programs/neovim/colors/catppuccin-frappe-base16.lua

@@ -1,54 +0,0 @@
-local colors = {
-  base00 = "#303446", -- base
-  base01 = "#292c3c", -- mantle
-  base02 = "#414559", -- surface0
-  base03 = "#51576d", -- surface1
-  base04 = "#626880", -- surface2
-  base05 = "#c6d0f5", -- text
-  base06 = "#f2d5cf", -- rosewater
-  base07 = "#babbf1", -- lavender
-  base08 = "#e78284", -- red
-  base09 = "#ef9f76", -- peach
-  base0A = "#e5c890", -- yellow
-  base0B = "#a6d189", -- green
-  base0C = "#81c8be", -- teal
-  base0D = "#8caaee", -- blue
-  base0E = "#ca9ee6", -- mauve
-  base0F = "#eebebe", -- flamingo
-}
-
-require("mini.base16").setup({
-  palette = colors,
-})
-
-vim.g.colors_name = "catppuccin-frappe-base16"
-
-local function hl(highlight, options)
-  vim.api.nvim_set_hl(0, highlight, options)
-end
-
-local function fg(color)
-  return { fg = color, bg = nil, attr = nil, sp = nil }
-end
-
-----------------------------
--- Further customizations --
-----------------------------
-
--- General
-hl("Delimiter", fg(colors.base05))
-hl("Tag", fg(colors.base08))
-
--- Treesitter
-hl("@keyword.return", fg(colors.base0E))
-hl("@variable", fg(colors.base08))
-
--- Tags
-hl("@tag.attribute", fg(colors.base09))
-hl("@tag.delimiter", fg(colors.base05))
-
--- LSP Semantic Highlight
-hl("@lsp.mod.deprecated", fg(colors.base0F))
-hl("@lsp.type.parameter", fg(colors.base05))
-hl("@lsp.type.property", fg(colors.base05))
-hl("@lsp.type.variable", fg(colors.base08))

modules/home-manager/programs/neovim/default.nix

@@ -74,6 +74,7 @@ in
         # Markdown
         markdownlint-cli
         marksman
+        prettierd
 
         # Nix
         nixd
@@ -84,15 +85,13 @@ in
         python312Packages.flake8
         ruff
 
-        # TypeScript/JavaScript
+        # TypeScript
-        deno
         typescript-language-server
-        vscode-js-debug
 
         # Rust
         rust-analyzer
         taplo
-        vscode-extensions.vadimcn.vscode-lldb
+        vscode-extensions.vadimcn.vscode-lldb.adapter
 
         # Vue
         vue-language-server
@@ -114,7 +113,5 @@ in
       config = config;
       pkgs = pkgs;
     };
-
-    xdg.configFile."nvim/colors/catppuccin-frappe-base16.lua".source = ./colors/catppuccin-frappe-base16.lua;
   };
 }

modules/home-manager/programs/neovim/lua/community.lua

@@ -14,7 +14,6 @@ return {
       config.transparent_background = true
     end,
   },
-  { import = "astrocommunity.colorscheme.mini-base16" },
 
   { import = "astrocommunity.editing-support.todo-comments-nvim" },
   { import = "astrocommunity.editing-support.zen-mode-nvim" },

modules/home-manager/programs/neovim/lua/plugins/astroui.lua

@@ -9,7 +9,7 @@ return {
   ---@type AstroUIOpts
   opts = {
     -- change colorscheme
-    colorscheme = "catppuccin-frappe-base16",
+    colorscheme = "catppuccin",
     -- AstroUI allows you to easily modify highlight groups easily for any and all colorschemes
     highlights = {
       init = { -- this table overrides highlights in all themes

modules/home-manager/programs/neovim/lua/plugins/none-ls.lua

@@ -9,35 +9,6 @@ return {
   opts = function(_, config)
     -- config variable is the default configuration table for the setup function call
     local null_ls = require("null-ls")
-    local helpers = require("null-ls.helpers")
-
-    local deno_fmt = helpers.make_builtin({
-      name = "deno_fmt",
-      filetypes = {
-        "angular",
-        "astro",
-        "css",
-        "html",
-        "javascript",
-        "json",
-        "jsonc",
-        "less",
-        "markdown",
-        "sass",
-        "scss",
-        "svelte",
-        "typescript",
-        "vue",
-        "yaml",
-      },
-      method = { null_ls.methods.FORMATTING },
-      generator_opts = {
-        command = "deno",
-        args = { "fmt", "--unstable-component", "-" },
-        to_stdin = true,
-      },
-      factory = helpers.formatter_factory,
-    })
 
     -- Check supported formatters and linters
     -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
@@ -49,8 +20,8 @@ return {
       null_ls.builtins.formatting.clang_format,
       null_ls.builtins.formatting.csharpier,
       null_ls.builtins.formatting.nixfmt,
+      null_ls.builtins.formatting.prettier,
       null_ls.builtins.formatting.stylua,
-      deno_fmt,
     }
     return config -- return final config table
   end,

modules/home-manager/programs/neovim/lua/plugins/user.lua

@@ -26,73 +26,6 @@ return {
     end,
   },
 
-  -- Makes most if not all groups have a transparent background.
-  {
-    "xiyaowong/transparent.nvim",
-    opts = function(_, opts)
-      local transparent = require("transparent")
-
-      opts.groups = {
-        "Comment",
-        "Conditional",
-        "Constant",
-        "CursorLine",
-        "CursorLineNr",
-        "EndOfBuffer",
-        "Function",
-        "Identifier",
-        "LineNr",
-        "NonText",
-        "Normal",
-        "NormalNC",
-        "Operator",
-        "PreProc",
-        "Repeat",
-        "SignColumn",
-        "Special",
-        "Statement",
-        -- "StatusLine",
-        -- "StatusLineNC",
-        "String",
-        "Structure",
-        "Todo",
-        "Type",
-        "Underlined",
-      }
-
-      opts.extra_groups = {
-        "CursorColumn",
-        "CursorLineFold",
-        "CursorLineSign",
-        "DiagnosticSignError",
-        "DiagnosticSignHint",
-        "DiagnosticSignInfo",
-        "DiagnosticSignOk",
-        "DiagnosticSignWarn",
-        "FloatBorder",
-        "FoldColumn",
-        "Folded",
-        "GitSignsAdd",
-        "GitSignsChange",
-        "GitSignsDelete",
-        "LineNr",
-        "LineNrAbove",
-        "LineNrBelow",
-        "LineNrBelow",
-        "NvimTreeWindowPicker",
-        "TabLine",
-        "TabLineFill",
-        "VertSplit",
-        "WinBar",
-        "WinBarNC",
-        "WinSeparator",
-      }
-
-      transparent.clear_prefix("BufferLine")
-      transparent.clear_prefix("NeoTree")
-    end,
-  },
-
   -- Adds highlighting and lsp features for embedded code in documents.
   {
     "jmbuhr/otter.nvim",