From e1512e79af449a1fb11285c3d80681cc87846188 Mon Sep 17 00:00:00 2001 From: Nikos Papadakis Date: Wed, 3 May 2023 13:27:09 +0300 Subject: [PATCH] stuff --- .../nvim/after/plugin/catppuccin.lua | 2 +- .../nvim/after/plugin/treesitter.lua | 17 --- nvim/dot-config/nvim/lua/my/options.lua | 4 +- nvim/dot-config/nvim/lua/my/plugins.lua | 4 +- starship/dot-config/starship.toml | 124 +++++++++++++++++- wezterm/dot-config/wezterm/wezterm.lua | 8 +- 6 files changed, 131 insertions(+), 28 deletions(-) diff --git a/nvim/dot-config/nvim/after/plugin/catppuccin.lua b/nvim/dot-config/nvim/after/plugin/catppuccin.lua index 9b4610d..cf1dfa7 100644 --- a/nvim/dot-config/nvim/after/plugin/catppuccin.lua +++ b/nvim/dot-config/nvim/after/plugin/catppuccin.lua @@ -3,7 +3,7 @@ if not ok then return end -vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha +vim.g.catppuccin_flavour = "latte" -- latte, frappe, macchiato, mocha catppuccin.setup { compile = { diff --git a/nvim/dot-config/nvim/after/plugin/treesitter.lua b/nvim/dot-config/nvim/after/plugin/treesitter.lua index 35bed9c..6a96a98 100644 --- a/nvim/dot-config/nvim/after/plugin/treesitter.lua +++ b/nvim/dot-config/nvim/after/plugin/treesitter.lua @@ -4,22 +4,6 @@ if not ok then end treesitter.setup { - ensure_installed = { - "c", - "css", - "go", - "javascript", - "json", - "lua", - "markdown", - "php", - "python", - "rust", - "svelte", - "tsx", - "typescript", - "yaml", - }, highlight = { enable = true, }, @@ -32,7 +16,6 @@ treesitter.setup { keymaps = { ["af"] = "@function.outer", ["if"] = "@function.inner", - ["ia"] = "@parameter.inner", }, }, diff --git a/nvim/dot-config/nvim/lua/my/options.lua b/nvim/dot-config/nvim/lua/my/options.lua index 70df8ea..23d6dea 100644 --- a/nvim/dot-config/nvim/lua/my/options.lua +++ b/nvim/dot-config/nvim/lua/my/options.lua @@ -11,7 +11,8 @@ local options = { hidden = true, ignorecase = true, inccommand = "split", - langmap = "ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,ρr,σs,τt,θu,ωv,ςw,χx,υy,ζz", + langmap = + "ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,ρr,σs,τt,θu,ωv,ςw,χx,υy,ζz", list = true, listchars = { tab = "→ ", @@ -41,7 +42,6 @@ local options = { "**/.git/**", }, wrap = false, - -- Indent Behavior autoindent = true, expandtab = true, diff --git a/nvim/dot-config/nvim/lua/my/plugins.lua b/nvim/dot-config/nvim/lua/my/plugins.lua index c5ba739..e72fe4a 100644 --- a/nvim/dot-config/nvim/lua/my/plugins.lua +++ b/nvim/dot-config/nvim/lua/my/plugins.lua @@ -20,7 +20,7 @@ require "paq" { "savq/paq-nvim", "nvim-lua/plenary.nvim", { "nvim-telescope/telescope.nvim", branch = "0.1.x" }, - { "catppuccin/nvim", as = "catppuccin", run = vim.cmd.CatppuccinCompile }, + { "catppuccin/nvim", as = "catppuccin" }, "lewis6991/gitsigns.nvim", "kyazdani42/nvim-web-devicons", "lukas-reineke/indent-blankline.nvim", @@ -30,7 +30,7 @@ require "paq" { "mickael-menu/zk-nvim", -- Treesitter - { "nvim-treesitter/nvim-treesitter", run = vim.cmd.TSUpdate }, + { "nvim-treesitter/nvim-treesitter", run = vim.cmd.TSUpdate, branch = "v0.9.0" }, "nvim-treesitter/playground", "nvim-treesitter/nvim-treesitter-textobjects", diff --git a/starship/dot-config/starship.toml b/starship/dot-config/starship.toml index 82cb8fc..5b615f2 100644 --- a/starship/dot-config/starship.toml +++ b/starship/dot-config/starship.toml @@ -1,3 +1,123 @@ +palette = "catppuccin_frappe" + [character] -success_symbol = "[➜](bold green)" -error_symbol = "[➜](bold red)" +success_symbol = "[[♥](green) ❯](maroon)" +error_symbol = "[❯](red)" +vicmd_symbol = "[❮](green)" + +[directory] +truncation_length = 4 +# Catppuccin 'lavender' +style = "bold lavender" + +[palettes.catppuccin_macchiato] +rosewater = "#f4dbd6" +flamingo = "#f0c6c6" +pink = "#f5bde6" +mauve = "#c6a0f6" +red = "#ed8796" +maroon = "#ee99a0" +peach = "#f5a97f" +yellow = "#eed49f" +green = "#a6da95" +teal = "#8bd5ca" +sky = "#91d7e3" +sapphire = "#7dc4e4" +blue = "#8aadf4" +lavender = "#b7bdf8" +text = "#cad3f5" +subtext1 = "#b8c0e0" +subtext0 = "#a5adcb" +overlay2 = "#939ab7" +overlay1 = "#8087a2" +overlay0 = "#6e738d" +surface2 = "#5b6078" +surface1 = "#494d64" +surface0 = "#363a4f" +base = "#24273a" +mantle = "#1e2030" +crust = "#181926" + +[palettes.catppuccin_frappe] +rosewater = "#f2d5cf" +flamingo = "#eebebe" +pink = "#f4b8e4" +mauve = "#ca9ee6" +red = "#e78284" +maroon = "#ea999c" +peach = "#ef9f76" +yellow = "#e5c890" +green = "#a6d189" +teal = "#81c8be" +sky = "#99d1db" +sapphire = "#85c1dc" +blue = "#8caaee" +lavender = "#babbf1" +text = "#c6d0f5" +subtext1 = "#b5bfe2" +subtext0 = "#a5adce" +overlay2 = "#949cbb" +overlay1 = "#838ba7" +overlay0 = "#737994" +surface2 = "#626880" +surface1 = "#51576d" +surface0 = "#414559" +base = "#303446" +mantle = "#292c3c" +crust = "#232634" + +[palettes.catppuccin_latte] +rosewater = "#dc8a78" +flamingo = "#dd7878" +pink = "#ea76cb" +mauve = "#8839ef" +red = "#d20f39" +maroon = "#e64553" +peach = "#fe640b" +yellow = "#df8e1d" +green = "#40a02b" +teal = "#179299" +sky = "#04a5e5" +sapphire = "#209fb5" +blue = "#1e66f5" +lavender = "#7287fd" +text = "#4c4f69" +subtext1 = "#5c5f77" +subtext0 = "#6c6f85" +overlay2 = "#7c7f93" +overlay1 = "#8c8fa1" +overlay0 = "#9ca0b0" +surface2 = "#acb0be" +surface1 = "#bcc0cc" +surface0 = "#ccd0da" +base = "#eff1f5" +mantle = "#e6e9ef" +crust = "#dce0e8" + +[palettes.catppuccin_mocha] +rosewater = "#f5e0dc" +flamingo = "#f2cdcd" +pink = "#f5c2e7" +mauve = "#cba6f7" +red = "#f38ba8" +maroon = "#eba0ac" +peach = "#fab387" +yellow = "#f9e2af" +green = "#a6e3a1" +teal = "#94e2d5" +sky = "#89dceb" +sapphire = "#74c7ec" +blue = "#89b4fa" +lavender = "#b4befe" +text = "#cdd6f4" +subtext1 = "#bac2de" +subtext0 = "#a6adc8" +overlay2 = "#9399b2" +overlay1 = "#7f849c" +overlay0 = "#6c7086" +surface2 = "#585b70" +surface1 = "#45475a" +surface0 = "#313244" +base = "#1e1e2e" +mantle = "#181825" +crust = "#11111b" diff --git a/wezterm/dot-config/wezterm/wezterm.lua b/wezterm/dot-config/wezterm/wezterm.lua index 12bb0bc..f2b9499 100644 --- a/wezterm/dot-config/wezterm/wezterm.lua +++ b/wezterm/dot-config/wezterm/wezterm.lua @@ -4,7 +4,7 @@ return { font = wezterm.font 'JetBrainsMono Nerd Font Mono', -- freetype_load_target = 'Light', -- freetype_render_target = 'HorizontalLcd', - color_scheme = 'Catppuccin Mocha', + color_scheme = 'Catppuccin Frappe', window_background_opacity = 0.9, max_fps = 165, front_end = "WebGpu", @@ -12,8 +12,8 @@ return { initial_cols = 160, initial_rows = 48, window_padding = { - left = 0, - right = 0, + left = 10, + right = 5, top = 0, bottom = 0, }, @@ -51,7 +51,7 @@ return { { key = '{', mods = 'CTRL|SHIFT', - action = wezterm.action.ActivateTabRelative( -1), + action = wezterm.action.ActivateTabRelative(-1), }, { key = '}',