~jacqueline/dotfiles

a5baf4d71986f003ee7fe25b11c7dc8ae4da8fb5 — jacqueline a month ago d47e910
pwetty colours
3 files changed, 7 insertions(+), 200 deletions(-)

M sway/.config/waybar/style.css
M vim/.config/nvim/init.lua
M wezterm/.wezterm.lua
M sway/.config/waybar/style.css => sway/.config/waybar/style.css +4 -0
@@ 65,6 65,10 @@ button:hover { background: inherit; }
  font-size: 12pt;
}

#mpd.stopped {
  background: transparent;
}

#mpd.paused {
  color: @subtext0;
  background: @surface0;

M vim/.config/nvim/init.lua => vim/.config/nvim/init.lua +2 -199
@@ 36,7 36,7 @@ require('packer').startup({function(use)
  use 'wbthomason/packer.nvim'

  -- Themes
  use { "catppuccin/nvim", as = "catppuccin" }
  use 'folke/tokyonight.nvim'

  -- Displays nice git diff information in the sidebar
  use {


@@ 204,205 204,8 @@ augroup end
-- Color scheme configuration
--------------------------------------------------------------------------------

require("catppuccin").setup({
  flavour = "mocha",
  background = { light = "latte", dark = "mocha" },
  dim_inactive = {
    enabled = false,
    -- Dim inactive splits/windows/buffers.
    -- NOT recommended if you use old palette (a.k.a., mocha).
    shade = "dark",
    percentage = 0.15,
  },
  transparent_background = false,
  term_colors = true,
  compile_path = vim.fn.stdpath("cache") .. "/catppuccin",
  styles = {
    comments = { "italic" },
    properties = { "italic" },
    functions = { "italic", "bold" },
    keywords = { "italic" },
    operators = { "bold" },
    conditionals = { "bold" },
    loops = { "bold" },
    booleans = { "bold", "italic" },
    numbers = {},
    types = {},
    strings = {},
    variables = {},
  },
  integrations = {
    treesitter = true,
    native_lsp = {
      enabled = true,
      virtual_text = {
        errors = { "italic" },
        hints = { "italic" },
        warnings = { "italic" },
        information = { "italic" },
      },
      underlines = {
        errors = { "underline" },
        hints = { "underline" },
        warnings = { "underline" },
        information = { "underline" },
      },
    },
    lsp_trouble = true,
    gitsigns = true,
    telescope = true,
    nvimtree = true,
    mason = true,
    cmp = true,
    dap = { enabled = true, enable_ui = true },
    neotree = { enabled = true, show_root = true, transparent_panel = false },
  },
  color_overrides = {
    mocha = {
      rosewater = "#F5E0DC",
      flamingo = "#F2CDCD",
      mauve = "#DDB6F2",
      pink = "#F5C2E7",
      red = "#F28FAD",
      maroon = "#E8A2AF",
      peach = "#F8BD96",
      yellow = "#FAE3B0",
      green = "#ABE9B3",
      blue = "#96CDFB",
      sky = "#89DCEB",
      teal = "#B5E8E0",
      lavender = "#C9CBFF",

      text = "#D9E0EE",
      subtext1 = "#BAC2DE",
      subtext0 = "#A6ADC8",
      overlay2 = "#C3BAC6",
      overlay1 = "#988BA2",
      overlay0 = "#6E6C7E",
      surface2 = "#6E6C7E",
      surface1 = "#575268",
      surface0 = "#302D41",

      base = "#1E1E2E",
      mantle = "#1A1826",
      crust = "#161320",
    },
  },
  highlight_overrides = {
    mocha = function(cp)
      return {
        -- For base configs.
        CursorLineNr = { fg = cp.green },
        Search = { bg = cp.surface1, fg = cp.pink, style = { "bold" } },
        IncSearch = { bg = cp.pink, fg = cp.surface1 },

        -- For native lsp configs.
        DiagnosticVirtualTextError = { bg = cp.none },
        DiagnosticVirtualTextWarn = { bg = cp.none },
        DiagnosticVirtualTextInfo = { bg = cp.none },
        DiagnosticVirtualTextHint = { fg = cp.rosewater, bg = cp.none },

        DiagnosticHint = { fg = cp.rosewater },
        LspDiagnosticsDefaultHint = { fg = cp.rosewater },
        LspDiagnosticsHint = { fg = cp.rosewater },
        LspDiagnosticsVirtualTextHint = { fg = cp.rosewater },
        LspDiagnosticsUnderlineHint = { sp = cp.rosewater },

        -- For fidget.
        FidgetTask = { bg = cp.none, fg = cp.surface2 },
        FidgetTitle = { fg = cp.blue, style = { "bold" } },

        -- For treesitter.
        ["@field"] = { fg = cp.rosewater },
        ["@property"] = { fg = cp.yellow },

        ["@include"] = { fg = cp.teal },
        ["@operator"] = { fg = cp.sky },
        ["@keyword.operator"] = { fg = cp.sky },
        ["@punctuation.special"] = { fg = cp.maroon },

        -- ["@float"] = { fg = cp.peach },
        -- ["@number"] = { fg = cp.peach },
        -- ["@boolean"] = { fg = cp.peach },

        ["@constructor"] = { fg = cp.lavender },
        -- ["@constant"] = { fg = cp.peach },
        -- ["@conditional"] = { fg = cp.mauve },
        -- ["@repeat"] = { fg = cp.mauve },
        ["@exception"] = { fg = cp.peach },

        ["@constant.builtin"] = { fg = cp.lavender },
        -- ["@function.builtin"] = { fg = cp.peach, style = { "italic" } },
        -- ["@type.builtin"] = { fg = cp.yellow, style = { "italic" } },
        ["@variable.builtin"] = { fg = cp.red, style = { "italic" } },

        -- ["@function"] = { fg = cp.blue },
        ["@function.macro"] = { fg = cp.red, style = {} },
        ["@parameter"] = { fg = cp.rosewater },
        ["@keyword.function"] = { fg = cp.maroon },
        ["@keyword"] = { fg = cp.red },
        ["@keyword.return"] = { fg = cp.pink, style = {} },

        -- ["@text.note"] = { fg = cp.base, bg = cp.blue },
        -- ["@text.warning"] = { fg = cp.base, bg = cp.yellow },
        -- ["@text.danger"] = { fg = cp.base, bg = cp.red },
        -- ["@constant.macro"] = { fg = cp.mauve },

        -- ["@label"] = { fg = cp.blue },
        ["@method"] = { style = { "italic" } },
        ["@namespace"] = { fg = cp.rosewater, style = {} },

        ["@punctuation.delimiter"] = { fg = cp.teal },
        ["@punctuation.bracket"] = { fg = cp.overlay2 },
        -- ["@string"] = { fg = cp.green },
        -- ["@string.regex"] = { fg = cp.peach },
        -- ["@type"] = { fg = cp.yellow },
        ["@variable"] = { fg = cp.text },
        ["@tag.attribute"] = { fg = cp.mauve, style = { "italic" } },
        ["@tag"] = { fg = cp.peach },
        ["@tag.delimiter"] = { fg = cp.maroon },
        ["@text"] = { fg = cp.text },

        -- ["@text.uri"] = { fg = cp.rosewater, style = { "italic", "underline" } },
        -- ["@text.literal"] = { fg = cp.teal, style = { "italic" } },
        -- ["@text.reference"] = { fg = cp.lavender, style = { "bold" } },
        -- ["@text.title"] = { fg = cp.blue, style = { "bold" } },
        -- ["@text.emphasis"] = { fg = cp.maroon, style = { "italic" } },
        -- ["@text.strong"] = { fg = cp.maroon, style = { "bold" } },
        -- ["@string.escape"] = { fg = cp.pink },

        -- ["@property.toml"] = { fg = cp.blue },
        -- ["@field.yaml"] = { fg = cp.blue },

        -- ["@label.json"] = { fg = cp.blue },

        ["@function.builtin.bash"] = { fg = cp.red, style = { "italic" } },
        ["@parameter.bash"] = { fg = cp.yellow, style = { "italic" } },

        ["@field.lua"] = { fg = cp.lavender },
        ["@constructor.lua"] = { fg = cp.flamingo },

        ["@constant.java"] = { fg = cp.teal },

        ["@property.typescript"] = { fg = cp.lavender, style = { "italic" } },
        -- ["@constructor.typescript"] = { fg = cp.lavender },

        -- ["@constructor.tsx"] = { fg = cp.lavender },
        -- ["@tag.attribute.tsx"] = { fg = cp.mauve },

        ["@type.css"] = { fg = cp.lavender },
        ["@property.css"] = { fg = cp.yellow, style = { "italic" } },

        ["@property.cpp"] = { fg = cp.text },

        -- ["@symbol"] = { fg = cp.flamingo },
      }
    end,
  },
})

vim.opt.termguicolors = true
vim.cmd.colorscheme "catppuccin"
vim.cmd.colorscheme "tokyonight"

--------------------------------------------------------------------------------
-- Treesitter configuration

M wezterm/.wezterm.lua => wezterm/.wezterm.lua +1 -1
@@ 60,7 60,7 @@ return {
    harfbuzz_features = features,
  },
  font_size = 14,
  color_scheme = "Catppuccin Mocha",
  color_scheme = "tokyonight-storm",
  hide_tab_bar_if_only_one_tab = true,
  window_padding = {
      left = 0,