From f8889da8d8f45d94f329840e03df32696d1ecc0e Mon Sep 17 00:00:00 2001 From: brice Date: Sat, 1 Jul 2023 20:34:19 +0200 Subject: [PATCH] stuff --- .tmux.conf | 2 - alacritty/alacritty.yml | 2 +- nvim/after/plugin/lsp.lua | 81 +++++++---- nvim/after/plugin/nullls.lua | 55 ++++++++ nvim/after/plugin/nvimtree.lua | 12 +- nvim/after/plugin/telescope.lua | 21 +-- nvim/after/plugin/treesitter.lua | 4 +- nvim/lua/mimu/init.lua | 3 +- nvim/lua/mimu/packer.lua | 90 ++++++++++++ nvim/lua/mimu/remap.lua | 2 +- nvim/lua/mimu/set.lua | 2 + nvim/plugin/packer_compiled.lua | 234 +++++++++++++++++++++++++++++++ zsh/.zshrc | 6 +- 13 files changed, 452 insertions(+), 62 deletions(-) create mode 100644 nvim/after/plugin/nullls.lua create mode 100644 nvim/lua/mimu/packer.lua create mode 100644 nvim/plugin/packer_compiled.lua diff --git a/.tmux.conf b/.tmux.conf index cb94463..88723b8 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -45,8 +45,6 @@ set -g @continuum-status-right 'Continuum status: #{continuum_status}' set -g @plugin 'dracula/tmux' set -g @dracula-plugins 'git' set -g @dracula-show-left-icon session -set -g @dracula-show-left-icon-colors 'pink dark_gray' -set -g @dracula-attached-clients-colors 'cyan dark_gray' set -g @dracula-show-empty-plugins false # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 18126b3..4ae006a 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -1,6 +1,6 @@ font: # Point size - size: 10.0 + size: 14.0 window: opacity: 1.0 diff --git a/nvim/after/plugin/lsp.lua b/nvim/after/plugin/lsp.lua index 7eb9b23..32b483b 100644 --- a/nvim/after/plugin/lsp.lua +++ b/nvim/after/plugin/lsp.lua @@ -1,8 +1,12 @@ -- Learn the keybindings, see :help lsp-zero-keybindings -- Learn to configure LSP servers, see :help lsp-zero-api-showcase -local lsp = require('lsp-zero') +local lsp = require("lsp-zero") -lsp.preset('recommended') +lsp.preset({ + manage_nvim_cmp = { + set_sources = "lsp", + }, +}) lsp.ensure_installed({ "tsserver", @@ -22,7 +26,7 @@ local cmp_mappings = lsp.defaults.cmp_mappings({ }) lsp.set_preferences({ - sign_icons = { }, + sign_icons = {}, }) lsp.setup_nvim_cmp({ @@ -32,32 +36,55 @@ lsp.setup_nvim_cmp({ lsp.on_attach(function(client, bufnr) local opts = { buffer = bufnr, remap = false } - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) - vim.keymap.set("n", "gr", function() vim.lsp.buf.references() end, opts) - vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) - vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) - vim.keymap.set("n", "vd", function() vim.lsp.diagnostic.open_float() end, opts) - vim.keymap.set("n", "[d", function() vim.lsp.diagnostic.goto_next() end, opts) - vim.keymap.set("n", "]d", function() vim.lsp.diagnostic.goto_prev() end, opts) - vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) - vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) - vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) + lsp.default_keymaps({ buffer = bufnr }) + lsp.buffer_autoformat() + + vim.keymap.set("n", "gd", function() + vim.lsp.buf.definition() + end, opts) + vim.keymap.set("n", "gr", function() + vim.lsp.buf.references() + end, opts) + vim.keymap.set("n", "K", function() + vim.lsp.buf.hover() + end, opts) + vim.keymap.set("n", "vws", function() + vim.lsp.buf.workspace_symbol() + end, opts) + vim.keymap.set("n", "vd", function() + vim.lsp.diagnostic.open_float() + end, opts) + vim.keymap.set("n", "[d", function() + vim.lsp.diagnostic.goto_next() + end, opts) + vim.keymap.set("n", "]d", function() + vim.lsp.diagnostic.goto_prev() + end, opts) + vim.keymap.set("n", "vca", function() + vim.lsp.buf.code_action() + end, opts) + vim.keymap.set("n", "vrn", function() + vim.lsp.buf.rename() + end, opts) + vim.keymap.set("i", "", function() + vim.lsp.buf.signature_help() + end, opts) end) lsp.setup() vim.diagnostic.config({ - virtual_text = true, - signs = false, - update_in_insert = false, - underline = true, - severity_sort = true, - float = { - focusable = false, - style = 'minimal', - border = 'rounded', - source = 'always', - header = '', - prefix = '', - }, -}); + virtual_text = true, + signs = false, + update_in_insert = false, + underline = true, + severity_sort = true, + float = { + focusable = false, + style = "minimal", + border = "rounded", + source = "always", + header = "", + prefix = "", + }, +}) diff --git a/nvim/after/plugin/nullls.lua b/nvim/after/plugin/nullls.lua new file mode 100644 index 0000000..0c3e27f --- /dev/null +++ b/nvim/after/plugin/nullls.lua @@ -0,0 +1,55 @@ +-- null-ls setup +local null_ls = require("null-ls") + +-- for conciseness +local formatting = null_ls.builtins.formatting -- to setup formatters +local diagnostics = null_ls.builtins.diagnostics -- to setup linters + +-- to setup format on save +local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) + +-- configure null_ls +null_ls.setup({ + debug = true, + + -- setup formatters & linters + sources = { + -- to disable file types use + -- "formatting.prettier.with({disabled_filetypes: {}})" (see null-ls docs) + formatting.prettier, -- js/ts formatter + formatting.rustfmt, -- rust formatter + formatting.stylua, -- lua formatter + formatting.gofumpt, -- go formatter + formatting.goimports, -- go auto-imports + diagnostics.eslint_d.with({ + -- js/ts linter + -- only enable eslint if root has .eslintrc.js (not in youtube nvim video) + condition = function(utils) + return utils.root_has_file(".eslintrc.js") -- change file extension if you use something else + end, + }), + }, + + -- you can reuse a shared lspconfig on_attach callback here + on_attach = function(current_client, bufnr) + if current_client.supports_method("textDocument/formatting") then + vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + buffer = bufnr, + callback = function() + -- on 0.8, you should use vim.lsp.buf.format({ bufnr = bufnr }) instead + -- on later neovim version, you should use vim.lsp.buf.format({ async = false }) instead + vim.lsp.buf.format({ + bufnr = bufnr, + async = false, + filter = function(client) + return client.name == "null-ls" + end, + }) + -- vim.lsp.buf.formatting_sync() + end, + }) + end + end, +}) diff --git a/nvim/after/plugin/nvimtree.lua b/nvim/after/plugin/nvimtree.lua index 90819f1..c6e6a99 100644 --- a/nvim/after/plugin/nvimtree.lua +++ b/nvim/after/plugin/nvimtree.lua @@ -76,11 +76,11 @@ require("nvim-tree").setup { -- BEGIN_DEFAULT_OPTS padding = " ", symlink_arrow = " âž› ", show = { - file = true, - folder = true, - folder_arrow = true, - git = true, - modified = true, + file = false, + folder = false, + folder_arrow = false, + git = false, + modified = false, }, glyphs = { default = " ", @@ -108,7 +108,7 @@ require("nvim-tree").setup { -- BEGIN_DEFAULT_OPTS }, }, }, - special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" }, + special_files = {}, symlink_destination = true, }, hijack_directories = { diff --git a/nvim/after/plugin/telescope.lua b/nvim/after/plugin/telescope.lua index 2caa29f..3679413 100644 --- a/nvim/after/plugin/telescope.lua +++ b/nvim/after/plugin/telescope.lua @@ -1,23 +1,8 @@ local builtin = require("telescope.builtin") - -local M = {} - -require("telescope").load_extension("fzf") - -M.project_files = function() - local opts = require("telescope.themes").get_ivy({}) - opts.find_command = { "rg", "--files", "--hidden", "--follow", "--glob", "!.git/*" } - vim.fn.system("git rev-parse --is-inside-work-tree") - if vim.v.shell_error == 0 then - builtin.git_files(opts) - else - opts.hidden = true - builtin.find_files(opts) - end -end - vim.keymap.set("n", "pf", builtin.find_files, {}) -vim.keymap.set("n", "", builtin.git_files, {}) +vim.keymap.set("n", "pb", builtin.buffers, {}) +vim.keymap.set("n", "pd", builtin.diagnostics, {}) vim.keymap.set("n", "ps", function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) end) diff --git a/nvim/after/plugin/treesitter.lua b/nvim/after/plugin/treesitter.lua index 2fbbbeb..a4709cc 100644 --- a/nvim/after/plugin/treesitter.lua +++ b/nvim/after/plugin/treesitter.lua @@ -1,6 +1,6 @@ -require'nvim-treesitter.configs'.setup { +require 'nvim-treesitter.configs'.setup { -- A list of parser names, or "all" (the four listed parsers should always be installed) - ensure_installed = { "help", "javascript", "typescript", "c", "lua", "vim", "rust", "go" }, + ensure_installed = { "javascript", "typescript", "c", "lua", "vim", "rust", "go" }, -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, diff --git a/nvim/lua/mimu/init.lua b/nvim/lua/mimu/init.lua index df3a703..cbdf8e7 100644 --- a/nvim/lua/mimu/init.lua +++ b/nvim/lua/mimu/init.lua @@ -1,3 +1,4 @@ -require("mimu.plugins") +require("mimu.packer") require("mimu.remap") require("mimu.set") + diff --git a/nvim/lua/mimu/packer.lua b/nvim/lua/mimu/packer.lua new file mode 100644 index 0000000..f7a0977 --- /dev/null +++ b/nvim/lua/mimu/packer.lua @@ -0,0 +1,90 @@ +-- This file can be loaded by calling `lua require('plugins')` from your init.vim + +-- Only required if you have packer configured as `opt` +vim.cmd [[packadd packer.nvim]] + +return require('packer').startup(function(use) + -- Packer can manage itself + use 'wbthomason/packer.nvim' + + -- telescope + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.1', + -- or , branch = '0.1.x', + requires = { { 'nvim-lua/plenary.nvim' } } + } + + -- theme + use({ + 'ramojus/mellifluous.nvim', + requires = { 'rktjmp/lush.nvim' }, + config = function() + require 'mellifluous'.setup({ + styles = { + comments = '', + }, + }) -- optional, see configuration section. + vim.cmd('colorscheme mellifluous') + end + }) + + + -- treesitter + use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) + + -- nvim-tree + use { + 'nvim-tree/nvim-tree.lua', + config = function() + require("nvim-tree").setup {} + end + } + + -- harpoon + use("theprimeagen/harpoon") + + -- null-ls, depends on plenary + use("nvim-lua/plenary.nvim") + use("jose-elias-alvarez/null-ls.nvim") + + -- git / vim-fugitive + use("tpope/vim-fugitive") + use { + 'lewis6991/gitsigns.nvim', + config = function() + require('gitsigns').setup({ + current_line_blame = true, + }) + end + } + + -- lualine + use { 'nvim-lualine/lualine.nvim' } + + -- Comment + use { 'numToStr/Comment.nvim' } + + -- LSP + use { + 'VonHeikemen/lsp-zero.nvim', + branch = 'v1.x', + requires = { + -- LSP Support + { 'neovim/nvim-lspconfig' }, -- Required + { 'williamboman/mason.nvim' }, -- Optional + { 'williamboman/mason-lspconfig.nvim' }, -- Optional + + -- Autocompletion + { 'hrsh7th/nvim-cmp' }, -- Required + { 'hrsh7th/cmp-nvim-lsp' }, -- Required + { 'hrsh7th/cmp-buffer' }, -- Optional + { 'hrsh7th/cmp-path' }, -- Optional + { 'saadparwaiz1/cmp_luasnip' }, -- Optional + { 'hrsh7th/cmp-nvim-lua' }, -- Optional + + -- Snippets + { 'L3MON4D3/LuaSnip' }, -- Required + { 'rafamadriz/friendly-snippets' }, -- Optional + } + } +end) diff --git a/nvim/lua/mimu/remap.lua b/nvim/lua/mimu/remap.lua index f34c768..2435bda 100644 --- a/nvim/lua/mimu/remap.lua +++ b/nvim/lua/mimu/remap.lua @@ -31,4 +31,4 @@ vim.keymap.set("n", "j", "lprevzz") vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) -- toggle nvim-tree -vim.keymap.set("n", "", "NvimTreeToggle") +vim.keymap.set("n", "", "NvimTreeFindFileToggle") diff --git a/nvim/lua/mimu/set.lua b/nvim/lua/mimu/set.lua index 6a5d387..300f32d 100644 --- a/nvim/lua/mimu/set.lua +++ b/nvim/lua/mimu/set.lua @@ -23,3 +23,5 @@ vim.opt.updatetime = 50 vim.opt.colorcolumn = "120" vim.g.mapleader = " " + +vim.o.cmdheight = 0 diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua new file mode 100644 index 0000000..6d57bfb --- /dev/null +++ b/nvim/plugin/packer_compiled.lua @@ -0,0 +1,234 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/Users/brice/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/brice/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/brice/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/brice/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/Users/brice/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + ["Comment.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/Comment.nvim", + url = "https://github.com/numToStr/Comment.nvim" + }, + LuaSnip = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["cmp-buffer"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-nvim-lua"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + url = "https://github.com/hrsh7th/cmp-nvim-lua" + }, + ["cmp-path"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + cmp_luasnip = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" + }, + ["friendly-snippets"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/friendly-snippets", + url = "https://github.com/rafamadriz/friendly-snippets" + }, + ["gitsigns.nvim"] = { + config = { "\27LJ\2\nQ\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\23current_line_blame\2\nsetup\rgitsigns\frequire\0" }, + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + url = "https://github.com/lewis6991/gitsigns.nvim" + }, + harpoon = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/harpoon", + url = "https://github.com/theprimeagen/harpoon" + }, + ["lsp-zero.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", + url = "https://github.com/VonHeikemen/lsp-zero.nvim" + }, + ["lualine.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, + ["lush.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/lush.nvim", + url = "https://github.com/rktjmp/lush.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["mellifluous.nvim"] = { + config = { "\27LJ\2\nŒ\1\0\0\4\0\t\0\r6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\0016\0\6\0009\0\a\0'\2\b\0B\0\2\1K\0\1\0\28colorscheme mellifluous\bcmd\bvim\vstyles\1\0\0\1\0\1\rcomments\5\nsetup\16mellifluous\frequire\0" }, + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/mellifluous.nvim", + url = "https://github.com/ramojus/mellifluous.nvim" + }, + ["null-ls.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/null-ls.nvim", + url = "https://github.com/jose-elias-alvarez/null-ls.nvim" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-tree.lua"] = { + config = { "\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14nvim-tree\frequire\0" }, + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", + url = "https://github.com/nvim-tree/nvim-tree.lua" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["packer.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["telescope.nvim"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + ["vim-fugitive"] = { + loaded = true, + path = "/Users/brice/.local/share/nvim/site/pack/packer/start/vim-fugitive", + url = "https://github.com/tpope/vim-fugitive" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: gitsigns.nvim +time([[Config for gitsigns.nvim]], true) +try_loadstring("\27LJ\2\nQ\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\23current_line_blame\2\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim") +time([[Config for gitsigns.nvim]], false) +-- Config for: mellifluous.nvim +time([[Config for mellifluous.nvim]], true) +try_loadstring("\27LJ\2\nŒ\1\0\0\4\0\t\0\r6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\0016\0\6\0009\0\a\0'\2\b\0B\0\2\1K\0\1\0\28colorscheme mellifluous\bcmd\bvim\vstyles\1\0\0\1\0\1\rcomments\5\nsetup\16mellifluous\frequire\0", "config", "mellifluous.nvim") +time([[Config for mellifluous.nvim]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14nvim-tree\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end diff --git a/zsh/.zshrc b/zsh/.zshrc index 54d95c6..2a88ba9 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -9,7 +9,7 @@ fi # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/home/mimu/.oh-my-zsh" +export ZSH="/Users/brice/.oh-my-zsh" # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, @@ -108,9 +108,7 @@ source $ZSH/oh-my-zsh.sh # alias ohmyzsh="mate ~/.oh-my-zsh" # -export DEFAULT_USER="$(whoami)" - -setxkbmap -layout us -variant intl +export DEFAULT_USER="test" export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm