From d83f895351cbf2c0dee0cac27218b512b4f4383b Mon Sep 17 00:00:00 2001 From: Nikos Papadakis Date: Wed, 24 May 2023 12:44:09 +0300 Subject: [PATCH] nvim --- .../nvim/after/plugin/catppuccin.lua | 2 +- nvim/dot-config/nvim/after/plugin/oil.lua | 24 +++++++++++++++++++ .../nvim/after/plugin/treesitter.lua | 6 ++--- .../nvim/after/queries/heex/highlights.scm | 1 - .../after/queries/html_tags/highlights.scm | 6 ----- nvim/dot-config/nvim/init.lua | 4 +++- nvim/dot-config/nvim/lua/my/plugins.lua | 7 +++--- wezterm/dot-config/wezterm/wezterm.lua | 2 +- 8 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 nvim/dot-config/nvim/after/plugin/oil.lua delete mode 120000 nvim/dot-config/nvim/after/queries/heex/highlights.scm delete mode 100644 nvim/dot-config/nvim/after/queries/html_tags/highlights.scm diff --git a/nvim/dot-config/nvim/after/plugin/catppuccin.lua b/nvim/dot-config/nvim/after/plugin/catppuccin.lua index cf1dfa7..2bf14af 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 = "latte" -- latte, frappe, macchiato, mocha +vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha catppuccin.setup { compile = { diff --git a/nvim/dot-config/nvim/after/plugin/oil.lua b/nvim/dot-config/nvim/after/plugin/oil.lua new file mode 100644 index 0000000..0dcade6 --- /dev/null +++ b/nvim/dot-config/nvim/after/plugin/oil.lua @@ -0,0 +1,24 @@ +local ok, oil = pcall(require, "oil") + +if not ok then + return +end + +oil.setup { + keymaps = { + ["g?"] = "actions.show_help", + [""] = "actions.select", + [""] = "actions.select_vsplit", + [""] = "actions.select_split", + [""] = "actions.select_tab", + [""] = "actions.preview", + [""] = "actions.close", + ["r"] = "actions.refresh", + ["-"] = "actions.parent", + ["_"] = "actions.open_cwd", + ["`"] = "actions.cd", + ["~"] = "actions.tcd", + ["g."] = "actions.toggle_hidden", + }, + use_default_keymaps = false, +} diff --git a/nvim/dot-config/nvim/after/plugin/treesitter.lua b/nvim/dot-config/nvim/after/plugin/treesitter.lua index 5934b7f..b3e6bb4 100644 --- a/nvim/dot-config/nvim/after/plugin/treesitter.lua +++ b/nvim/dot-config/nvim/after/plugin/treesitter.lua @@ -8,9 +8,9 @@ treesitter.setup { enable = true, additional_vim_regex_highlighting = false, }, - -- indent = { - -- enable = { "php" }, - -- }, + indent = { + enable = false, + }, textobjects = { select = { enable = true, diff --git a/nvim/dot-config/nvim/after/queries/heex/highlights.scm b/nvim/dot-config/nvim/after/queries/heex/highlights.scm deleted file mode 120000 index ed5a293..0000000 --- a/nvim/dot-config/nvim/after/queries/heex/highlights.scm +++ /dev/null @@ -1 +0,0 @@ -/home/nikos/.dotfiles/nvim/dot-config/nvim/after/queries/html_tags/highlights.scm \ No newline at end of file diff --git a/nvim/dot-config/nvim/after/queries/html_tags/highlights.scm b/nvim/dot-config/nvim/after/queries/html_tags/highlights.scm deleted file mode 100644 index 39a8249..0000000 --- a/nvim/dot-config/nvim/after/queries/html_tags/highlights.scm +++ /dev/null @@ -1,6 +0,0 @@ -;; extends - -(attribute - (attribute_name) @name (#eq? @name "class") - (quoted_attribute_value) @comment -) diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index f6c8ddc..6b6ce23 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -6,7 +6,9 @@ Configuration Home: https://github.com/esprssoo/dotfiles --]] vim.g.mapleader = " " -vim.g.netrw_banner = 0 +-- vim.g.netrw_banner = 0 +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 require "my.plugins" require "my.options" diff --git a/nvim/dot-config/nvim/lua/my/plugins.lua b/nvim/dot-config/nvim/lua/my/plugins.lua index fc05aeb..88dfd1b 100644 --- a/nvim/dot-config/nvim/lua/my/plugins.lua +++ b/nvim/dot-config/nvim/lua/my/plugins.lua @@ -19,15 +19,16 @@ end require "paq" { "savq/paq-nvim", "nvim-lua/plenary.nvim", - { "nvim-telescope/telescope.nvim", branch = "0.1.x" }, - { "catppuccin/nvim", as = "catppuccin" }, "lewis6991/gitsigns.nvim", "kyazdani42/nvim-web-devicons", "lukas-reineke/indent-blankline.nvim", "nvim-lualine/lualine.nvim", "windwp/nvim-autopairs", "mickael-menu/zk-nvim", - "williamboman/mason.nvim", + { "nvim-telescope/telescope.nvim", branch = "0.1.x" }, + { "catppuccin/nvim", as = "catppuccin" }, + { "williamboman/mason.nvim", branch = "v1.0.1" }, + "stevearc/oil.nvim", -- Treesitter { "nvim-treesitter/nvim-treesitter", run = vim.cmd.TSUpdate, branch = "v0.9.0" }, diff --git a/wezterm/dot-config/wezterm/wezterm.lua b/wezterm/dot-config/wezterm/wezterm.lua index f2b9499..5dcde3b 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 Frappe', + color_scheme = 'Catppuccin Mocha', window_background_opacity = 0.9, max_fps = 165, front_end = "WebGpu",