diff --git a/configs/.pnpm-debug.log b/configs/.pnpm-debug.log deleted file mode 100644 index 632a2e3..0000000 --- a/configs/.pnpm-debug.log +++ /dev/null @@ -1,14 +0,0 @@ -{ - "0 debug pnpm:scope": { - "selected": 1 - }, - "1 error pnpm": { - "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", - "err": { - "name": "pnpm", - "message": "No package.json (or package.yaml, or package.json5) was found in \"/home/jim/.dotfiles/configs\".", - "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", - "stack": "pnpm: No package.json (or package.yaml, or package.json5) was found in \"/home/jim/.dotfiles/configs\".\n at readProjectManifest (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:40641:13)\n at async Object.readProjectManifestOnly (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:40645:28)\n at async Object.readProjectManifestOnly (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:40864:24)\n at async Object.handler (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:129763:24)\n at async /home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:133951:20\n at async run (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:133926:34)\n at async runPnpm (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:134137:5)\n at async /home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:134129:7" - } - } -} \ No newline at end of file diff --git a/configs/.tmux.conf b/configs/.tmux.conf index 5eee43a..c77a1da 100644 --- a/configs/.tmux.conf +++ b/configs/.tmux.conf @@ -10,7 +10,7 @@ set -g destroy-unattached unbind C-b set-option -g prefix C-a bind-key C-a send-prefix - +bind b set-option status # split panes using | and - bind | split-window -h -c "#{pane_current_path}" diff --git a/configs/init.lua b/configs/init.lua index 26828ec..5da0f93 100644 --- a/configs/init.lua +++ b/configs/init.lua @@ -25,11 +25,15 @@ if u.has_plugin("cmp") then cmd [[set mouse=a]] -- enable mouse interaction cmd [[set undofile]] cmd [[set fcs=eob:\ ]] --disable showing ~ in empty lines + + cmd [[command Format :lua vim.lsp.buf.formatting()]] cmd [[set noshowmode]] --to get rid of thing like --INSERT-- cmd [[set noshowcmd]] --to get rid of display of last command cmd [[set shortmess+=F]] --to get rid of the file name displayed in the command line bar - cmd [[set noruler]] + cmd [[set noruler]] + + g.ale_fixers = {"prettier", "eslint"} -- Enable Theming / Syntax o.syntax = "enable" diff --git a/configs/lua/autocomplete.lua b/configs/lua/autocomplete.lua index cc8f415..695ad14 100644 --- a/configs/lua/autocomplete.lua +++ b/configs/lua/autocomplete.lua @@ -14,7 +14,7 @@ cmp.setup { end }, mapping = { - [""] = cmp.mapping.complete(), + [""] = cmp.mapping.complete(), [""] = cmp.mapping.close(), [""] = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, diff --git a/configs/lua/lsp-utils.lua b/configs/lua/lsp-utils.lua index 64ee9c4..30db068 100644 --- a/configs/lua/lsp-utils.lua +++ b/configs/lua/lsp-utils.lua @@ -139,6 +139,7 @@ nvim_lsp.diagnosticls.setup { "sh", "markdown", "json", + "jsonc", "yaml", "toml" }, diff --git a/configs/lua/plugins.lua b/configs/lua/plugins.lua index 0ac77f4..cd62b32 100644 --- a/configs/lua/plugins.lua +++ b/configs/lua/plugins.lua @@ -17,7 +17,8 @@ return require("packer").startup(function() use "kyazdani42/nvim-tree.lua" use "nvim-lua/popup.nvim" use "mhinz/vim-startify" - + use "lukas-reineke/indent-blankline.nvim" + -- Code Navigation use "dense-analysis/ale" use "nathanmsmith/nvim-ale-diagnostic" @@ -40,13 +41,14 @@ return require("packer").startup(function() use "weilbith/nvim-code-action-menu" -- Need to find better alternative use "L3MON4D3/LuaSnip" use "windwp/nvim-autopairs" + use "neoclide/jsonc.vim" use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } - -- Formatting - use "mhartington/formatter.nvim" + + use "sbdchd/neoformat" -- General Popup Window use "akinsho/nvim-toggleterm.lua" diff --git a/configs/lua/utils.lua b/configs/lua/utils.lua index dce77cd..36cb918 100644 --- a/configs/lua/utils.lua +++ b/configs/lua/utils.lua @@ -38,4 +38,4 @@ function M.has_plugin(pluginName) return status end -return M \ No newline at end of file +return M diff --git a/configs/polybar-launch.sh b/configs/polybar-launch.sh deleted file mode 100755 index f9b9e66..0000000 --- a/configs/polybar-launch.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# Terminate already running bar instances -killall -q i3bar -killall -q polybar - -# Wait until the processes have been shut down -while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done - -# Launch Polybar, using default config location ~/.conig/polybar/config -polybar base & - -echo "Polybar launched..." diff --git a/configs/polybar.conf b/configs/polybar.conf deleted file mode 100644 index df304ac..0000000 --- a/configs/polybar.conf +++ /dev/null @@ -1,120 +0,0 @@ -;-------------------------------------------- -; settings ; -;-------------------------------------------- - -[settings] - screenchange-reload = true - -;-------------------------------------------- -; colors ; -;-------------------------------------------- - -[colors] - - bar_bg = ${xrdb:color0} - bar_fg = ${xrdb:color7} - - border_col = ${xrdb:color0} - - modules_bg = ${xrdb:color7} - modules_fg = ${xrdb:color0} - - mod_bg = ${xrdb:color7} - - modules_prefix_bg = ${xrdb:color7} - modules_prefix_fg = ${xrdb:color0} - - urgent_bg = ${xrdb:color1} - focused_bg = ${xrdb:color10} - - essid_p_bg = ${xrdb:color6} - down_p_bg = #5e606c - cpu_p_bg = ${xrdb:color5} - ram_p_bg = ${xrdb:color11} - vol_p_bg = #637b81 - bright_p_bg = #c29f6f - battery_p_bg = ${xrdb:color9} - time_p_bg = ${xrdb:color10} - -;-------------------------------------------- -; bars ; -;-------------------------------------------- - -[bar/base] - dpi = 192 - width = 100% - height = 32 - offset-x = 0 - offset-y = 0 - - bottom = false - - background = ${xrdb:background} - foreground = ${xrdb:color7} - - border-bottom-size = 0 - border-top-size = ${xrdb:gap} - - border-left-size = ${xrdb:gap} - border-right-size = ${xrdb:gap} - - border-bottom-color = #000f0f0f - border-top-color = #000f0f0f - - border-left-color = #000f0f0f - border-right-color = #000f0f0f - - spacing = 0 - padding-left = 0 - padding-right = 2 - module-margin-left = 0 - - font-N = ; - font-0 = FiraMono Nerd:size=4;2 - font-1 = Font Awesome 5 Free Regular:pixelsize=14;-1 - font-2 = Font Awesome 5 Brands:pixelsize=4;2 - - fixed-center = true - - modules-left = i3 - modules-center = date - modules-right = cpu ram - -;-------------------------------------------- -; modules ; -;-------------------------------------------- -[module/date] - type = internal/date - interval = 1.0 - time = "%I:%M %p" - label = "%time%" - - format =