From 1112efda92d54dadd0df8cf44229dd838f1f9ac4 Mon Sep 17 00:00:00 2001 From: Sashanoraa Date: Wed, 15 Feb 2023 02:07:16 -0500 Subject: [PATCH] More shell stuff --- .config/fish/config.fish | 2 +- .config/kitty/kitty.conf | 2 +- .config/lvim/config.lua | 126 ++++++--------------------------------- 3 files changed, 21 insertions(+), 109 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 1cc244a..e619b28 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,5 +1,5 @@ # shell env -set -x fish_greeting 💖 heya $USER, welcome to (gethost) "~" 🏳️‍⚧️ +set -x fish_greeting 💖 hiya sashanoraa, welcome to (gethost) "~" 🏳️‍⚧️ set -x EDITOR nvim # Fzf setting diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 00268fd..36bcfac 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1919,7 +1919,7 @@ map super+v send_text kitty \x16 #: New tab -# map kitty_mod+t new_tab +map kitty_mod+t new_tab_with_cwd # map cmd+t new_tab #: Close tab diff --git a/.config/lvim/config.lua b/.config/lvim/config.lua index ecd4601..7ddf5ff 100644 --- a/.config/lvim/config.lua +++ b/.config/lvim/config.lua @@ -11,7 +11,7 @@ an executable lvim.log.level = "warn" lvim.format_on_save = false lvim.lint_on_save = true -lvim.colorscheme = "onedarker" +lvim.colorscheme = "tokyonight-night" -- keymappings [view all the defaults by pressing Lk] lvim.leader = "space" @@ -24,23 +24,6 @@ lvim.keys.normal_mode[""] = ":bnext" lvim.keys.normal_mode[""] = ":bprevious" lvim.keys.insert_mode[""] = "o" --- unmap a default keymapping --- lvim.keys.normal_mode[""] = "" --- edit a default keymapping --- lvim.keys.normal_mode[""] = ":q" - --- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode. --- lvim.builtin.telescope.on_config_done = function() --- local actions = require "telescope.actions" --- -- for input mode --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_previous --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_prev --- -- for normal mode --- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_previous --- end -- Use which-key to add extra bindings with the leader-key prefix lvim.builtin.which_key.mappings.q = { @@ -61,69 +44,28 @@ lvim.builtin.alpha.mode = "dashboard" lvim.builtin.terminal.active = true lvim.builtin.dap.active = true lvim.builtin.nvimtree.setup.view.side = "left" --- lvim.builtin.nvimtree.setup.renderer.icons.show.git = false lvim.builtin.lualine.sections.lualine_y = { "location" } -- if you don't want all the parsers change this to a table of the ones you want -lvim.builtin.treesitter.ensure_installed = { - "bash", - "c", - "javascript", - "json", - "lua", - "python", - "typescript", - "tsx", - "css", - "rust", - "java", - "yaml", -} -lvim.builtin.treesitter.ignore_install = { "haskell" } -lvim.builtin.treesitter.highlight.enabled = true - -lvim.builtin.terminal.open_mapping = [[]] - --- generic LSP settings --- you can set a custom on_attach function that will be used for all the language servers --- See --- lvim.lsp.on_attach_callback = function(client, bufnr) --- local function buf_set_option(...) --- vim.api.nvim_buf_set_option(bufnr, ...) --- end --- --Enable completion triggered by --- buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") --- end --- you can overwrite the null_ls setup table (useful for setting the root_dir function) --- lvim.lsp.null_ls.setup = { --- root_dir = require("lspconfig").util.root_pattern("Makefile", ".git", "node_modules"), +-- lvim.builtin.treesitter.ensure_installed = { +-- "bash", +-- "c", +-- "javascript", +-- "json", +-- "lua", +-- "python", +-- "typescript", +-- "tsx", +-- "css", +-- "rust", +-- "java", +-- "yaml", -- } --- or if you need something more advanced --- lvim.lsp.null_ls.setup.root_dir = function(fname) --- if vim.bo.filetype == "javascript" then --- return require("lspconfig/util").root_pattern("Makefile", ".git", "node_modules")(fname) --- or require("lspconfig/util").path.dirname(fname) --- elseif vim.bo.filetype == "php" then --- return require("lspconfig/util").root_pattern("Makefile", ".git", "composer.json")(fname) or vim.fn.getcwd() --- else --- return require("lspconfig/util").root_pattern("Makefile", ".git")(fname) or require("lspconfig/util").path.dirname(fname) --- end --- end +-- lvim.builtin.treesitter.ignore_install = { "haskell" } +-- lvim.builtin.treesitter.highlight.enabled = true + +-- lvim.builtin.terminal.open_mapping = [[]] --- set a formatter if you want to override the default lsp one (if it exists) --- lvim.lang.python.formatters = { --- { --- exe = "black", --- args = {} --- } --- } --- set an additional linter --- lvim.lang.python.linters = { --- { --- exe = "flake8", --- args = {} --- } --- } -- Additional Plugins lvim.plugins = { @@ -132,6 +74,7 @@ lvim.plugins = { { "tpope/vim-repeat" }, { "kana/vim-textobj-user" }, { "npxbr/glow.nvim" }, + { "folke/tokyonight.nvim" }, { "gpanders/vim-scdoc", ft = "scdoc" @@ -150,17 +93,6 @@ lvim.plugins = { ]] end }, - { - "aserowy/tmux.nvim", - config = function() - require("tmux").setup({ - navigation = { - -- enables default keybindings (C-hjkl) for normal mode - enable_default_keybindings = true, - }, - }) - end, - }, { "windwp/nvim-spectre", event = "BufRead", @@ -168,26 +100,6 @@ lvim.plugins = { require("spectre").setup() end, }, - -- { - -- "simrat39/rust-tools.nvim", - -- config = function() - -- require("rust-tools").setup({ - -- tools = { - -- autoSetHints = true, - -- hover_with_actions = true, - -- runnables = { - -- use_telescope = true, - -- }, - -- }, - -- server = { - -- cmd = { vim.fn.stdpath "data" .. "/lspinstall/rust/rust-analyzer" }, - -- on_attach = require("lsp").common_on_attach, - -- on_init = require("lsp").common_on_init, - -- }, - -- }) - -- end, - -- ft = { "rust", "rs" }, - -- }, { "editorconfig/editorconfig-vim", setup = function() -- 2.45.2