From 87ac7d3773bad71e696529808c89157901a2d22f Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Wed, 23 Aug 2023 07:46:28 +0000 Subject: [PATCH] leap and bufferline --- config/.config/nvim/lazy-lock.json | 74 +++++++++++++++-------------- vim/.vim/lua/plugins/base.lua | 14 ------ vim/.vim/lua/plugins/bufferline.lua | 36 ++++++++++++++ vim/.vim/lua/plugins/google.lua | 38 +-------------- vim/.vim/lua/plugins/leap.lua | 6 +++ vim/.vim/lua/plugins/lualine.lua | 74 ++++++++++++++--------------- vim/.vim/lua/plugins/notify.lua | 14 ++++++ zsh/.bash_profile.google | 1 + 8 files changed, 135 insertions(+), 122 deletions(-) create mode 100644 vim/.vim/lua/plugins/bufferline.lua create mode 100644 vim/.vim/lua/plugins/leap.lua create mode 100644 vim/.vim/lua/plugins/notify.lua diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index d6239df..3119f1a 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -1,11 +1,12 @@ { "LuaSnip": { "branch": "master", "commit": "c7984d1cca3d8615e4daefc196597872a0b8d590" }, "aerial.nvim": { "branch": "master", "commit": "fb1f08c9f90e8b0c04b2f2c5d95d06288a14c5b2" }, - "ai.nvim": { "branch": "main", "commit": "d7391d4782b90ad3501f6f716f2b308092981787" }, - "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" }, - "auto-session": { "branch": "main", "commit": "7afbb149f87be279778689596c781882014f7eef" }, + "ai.nvim": { "branch": "main", "commit": "604713b1a223a6ca9e04a4d0dbbd4b0670c46fd1" }, + "asyncrun.vim": { "branch": "master", "commit": "42385d54b8546c163b946fd50eed2103ef7993c9" }, + "auto-session": { "branch": "main", "commit": "f6d111f3c7ff2fb89c8a39b6280c8f90234196d9" }, + "bufferline.nvim": { "branch": "main", "commit": "d24378edc14a675c820a303b4512af3bbc5761e9" }, "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" }, - "catppuccin": { "branch": "main", "commit": "a84ee1848bfac4601771805396552bdbaa0a0e91" }, + "catppuccin": { "branch": "main", "commit": "b573866ef64122119668f375ebb794bcb3b518e2" }, "ciderlsp-nvim": { "branch": "main", "commit": "45ee3634c6d4224c6981825da5bde39804addc71" }, "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -23,55 +24,59 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" }, "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" }, - "formatter.nvim": { "branch": "master", "commit": "9bf2e7e294b00bac87c6123c889828ee08dc9b46" }, - "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, - "fzf": { "branch": "master", "commit": "3c09c77269d848f5e7dd8f350a90e8d7ed760845" }, - "fzf.vim": { "branch": "master", "commit": "e0d131d95364edf940a70127fcb5748b86e6955e" }, - "git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" }, - "gitsigns.nvim": { "branch": "main", "commit": "adcf2c7f2f495f5df148683764bf7cba6a70f34c" }, - "go.nvim": { "branch": "master", "commit": "6550ddf5ce491d17af009c397aceb25310566eaa" }, - "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" }, + "formatter.nvim": { "branch": "master", "commit": "44c89f09dcc220dc2a9b056e93c3a87c86e79804" }, + "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" }, + "fzf": { "branch": "master", "commit": "11e56403dda81b2226c138606f02fd49a31a6cf4" }, + "fzf.vim": { "branch": "master", "commit": "811f34b70b60b4df2997e3ba8cd109e7d06d683b" }, + "git-conflict.nvim": { "branch": "main", "commit": "f83d81e706d7ebfb914457ea72eee159e0e16fae" }, + "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" }, + "go.nvim": { "branch": "master", "commit": "a370cb932749d071a6bca20211533044c262e66d" }, + "guihua.lua": { "branch": "master", "commit": "5ad8dba19ce9b9fd8965598984dfdc9c119f97e4" }, "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" }, "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" }, "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" }, - "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, + "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" }, "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" }, "lsp-lens.nvim": { "branch": "main", "commit": "13d25ad8bd55aa34cc0aa3082e78a4157c401346" }, + "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "4a2125e8848950c65b5e12f98e2d13e3390ed7ae" }, "lsp_lines.nvim": { "branch": "main", "commit": "f53af96d4789eef39a082dbcce078d2bfc384ece" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "luasnip-google.nvim": { "branch": "main", "commit": "5fd7feb144de0ecea837618c9c9e1bbecc0e3243" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, - "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, + "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, "neoscopes": { "branch": "main", "commit": "88ca15efcc20b267789d74ca483cc8bac85b3083" }, - "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" }, - "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, - "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, + "nerdcommenter": { "branch": "master", "commit": "d2e21d417f6c788b11ae3b90d7ac478930dead36" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, + "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, "nvim-cmp-buffer-lines": { "branch": "master", "commit": "2036e6fbb40c770eb82f1940a0ce0b2988f8ef32" }, - "nvim-lightbulb": { "branch": "master", "commit": "6166029a136afd56cf23384fc31e8ba203a6e102" }, - "nvim-lint": { "branch": "master", "commit": "4744fc04c3a869c9eaa137fec13d992aea7da7ee" }, - "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, + "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, + "nvim-lint": { "branch": "master", "commit": "8864e99d560bbb7eefcdab21c105be91161af0ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "1cfb96490c3889a2c57d1ef5e1acc59e9b47c455" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-surround": { "branch": "main", "commit": "211eaad7c6d01ef4ac02cba9052b3082ec232101" }, - "nvim-treesitter": { "branch": "master", "commit": "9fa6806b88905d52b5ca36094909630919b432cc" }, - "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, - "nvim_figtree": { "branch": "main", "commit": "9bc3025f46e34732382da1019e256a9d8bec1e55" }, + "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" }, + "nvim-treesitter": { "branch": "master", "commit": "9ea7559ea99701c900b08c1f977eca6ca57eadd2" }, + "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, + "nvim_figtree": { "branch": "main", "commit": "13a627633d224b157843405371113b4c1259793f" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, - "refactoring.nvim": { "branch": "master", "commit": "7894b10078a1a70c9b26028f4373bf209968e9bc" }, + "refactoring.nvim": { "branch": "master", "commit": "b1cc851bcb4e3c624abbe2a725237eef6bea765c" }, "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, - "telekasten.nvim": { "branch": "main", "commit": "4a5e57eee9c5154ed77423bb7fa6619fdb0784cd" }, - "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, + "telekasten.nvim": { "branch": "main", "commit": "584783fdbdd13bb691a435f86ed10a3717fa9e9a" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" }, + "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" }, "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" }, - "telescope_fig": { "branch": "main", "commit": "90150e1aa368b49a5125689b3a6da573a99e2bda" }, + "telescope_fig": { "branch": "main", "commit": "f6122fe82417ebeaddb9343cfd5584f62a4b8df8" }, "time-ago.vim": { "branch": "master", "commit": "be978d5c790cfcc41f524205f28783b9937fd0ee" }, - "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, + "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" }, "vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" }, @@ -79,18 +84,17 @@ "vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" }, "vim-floaterm": { "branch": "master", "commit": "bcaeabf89a92a924031d471395054d84bd88ce2f" }, "vim-imp": { "branch": "main", "commit": "394e926ce62010443731f3923031e5afa1279f3e" }, - "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" }, "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" }, - "vim-matchup": { "branch": "master", "commit": "17cc05867cb3314761e4baa20115a27120f8e82c" }, + "vim-matchup": { "branch": "master", "commit": "582cbc8c2dc311deb7a03f7d505d52544c36d4b6" }, "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" }, "vim-searchindex": { "branch": "master", "commit": "b0788c8213210b3bd23b62847dd5a9ebbe4ad648" }, "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" }, "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" }, "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" }, - "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" }, + "vim-tmux-navigator": { "branch": "master", "commit": "addb64a772cb4a3ae1f1363583012b2cada2cd66" }, "vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" }, "vim-tmux-yank": { "branch": "master", "commit": "8432fd440f61ddead070093be06b3dd6b0b5790e" }, "vim-windowswap": { "branch": "master", "commit": "15db3f697aa1fa696d99fcdc920c90cd2cec855e" }, "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" }, - "which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" } + "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } } \ No newline at end of file diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua index 7997f0e..104f7f2 100644 --- a/vim/.vim/lua/plugins/base.lua +++ b/vim/.vim/lua/plugins/base.lua @@ -1,19 +1,6 @@ local use_google = require("utils").use_google return { - -- { - -- "rcarriga/nvim-notify", - -- config = function() - -- local colors = require("catppuccin.palettes").get_palette() - -- require("notify").setup({ - -- background_colour = colors.base, - -- fps = 10, -- default 30 - -- stages = "slide", -- default fade_in_slide_out - -- timeout = 5000, -- default 5000 - -- }) - -- vim.notify = require("notify") - -- end, - -- }, -- Pretty symbols { "nvim-tree/nvim-web-devicons", @@ -34,7 +21,6 @@ return { }, "ntpeters/vim-better-whitespace", "junegunn/fzf.vim", - "nathanaelkane/vim-indent-guides", "tversteeg/registers.nvim", "jremmen/vim-ripgrep", "nvim-lua/plenary.nvim", diff --git a/vim/.vim/lua/plugins/bufferline.lua b/vim/.vim/lua/plugins/bufferline.lua new file mode 100644 index 0000000..53c306d --- /dev/null +++ b/vim/.vim/lua/plugins/bufferline.lua @@ -0,0 +1,36 @@ +return { + -- { + -- "tiagovla/scope.nvim", + -- config = function() + -- -- vim.opt.sessionoptions = { -- required + -- -- "buffers", + -- -- "tabpages", + -- -- "globals", + -- -- } + -- require("scope").setup({}) + -- end, + -- }, + { + "akinsho/bufferline.nvim", + version = "*", + dependencies = "nvim-tree/nvim-web-devicons", + config = function() + vim.opt.termguicolors = true + require("bufferline").setup({ + options = { + mode = "tabs", + diagnostics = "nvim_lsp", + diagnostics_indicator = function(count, level, diagnostics_dict, context) + local symbols = { error = " ", warning = " ", info = " ", hint = " " } + local icon = symbols[level] or level + return "" .. icon .. count + end, + max_name_length = 30, + truncate_name = false, + show_close_icon = false, + show_buffer_close_icons = false, + }, + }) + end, + }, +} diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua index 53359af..ed81cd6 100644 --- a/vim/.vim/lua/plugins/google.lua +++ b/vim/.vim/lua/plugins/google.lua @@ -134,67 +134,33 @@ return { dir = "/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments/", dependencies = { "rktjmp/time-ago.vim", "rcarriga/nvim-notify", "nvim-lua/plenary.nvim" }, config = function() + -- vim.notify = require("notify") -- Here are all the options and their default values: require("google.comments").setup({ -- command = {'/google/bin/releases/editor-devtools/get_comments.par', '--full', '--json', "-x=''"}, stubby = true, - -- command = { - -- "/google/bin/releases/editor-devtools/get_comments.par", - -- "--json", - -- "--full", - -- "--noresolved", - -- "--cl_comments", - -- "--file_comments", - -- }, command = { 'stubby --output_json call blade:codereview-rpc CodereviewRpcService.GetComments "changelist_number: $(/google/data/ro/teams/fig/bin/vcstool pending-change-number)"', }, - -- Define your own icon by `vim.fn.sign_define('ICON_NAME', {text = ' '})`. - -- See :help sign_define - -- The sign property passed to setup should be the 'ICON_NAME' in the define - -- example above. sign = "COMMENT_ICON", -- Fetch the comments after calling `setup`. auto_fetch = true, display = { - -- CTN - virtual_text = true, -- The width of the comment display window. width = 50, -- When showing file paths, use relative paths or not. relative_path = true, - --- Enable viewing comments through floating window - floating = true, - --- Options used when creating the floating window. - floating_window_options = floating_window_options, }, }) - - function floating_window_options(parent_win_id) - local parent_width = vim.api.nvim_win_get_width(parent_win_id) - local parent_height = vim.api.nvim_win_get_height(parent_win_id) - - return { - relative = "win", - anchor = "NW", - width = math.floor(parent_width * 0.5), - height = math.floor(parent_height * 0.3), - row = vim.api.nvim_win_get_cursor(parent_win_id)[1], - col = math.floor(parent_width * 0.25), - border = "rounded", - } - end - local map = require("utils").map -- here are some mappings you might want: map("n", "]c", [[GoogleCommentsGotoNextComment]]) map("n", "[c", [[GoogleCommentsGotoPrevComment]]) - map("n", "nc", [[GoogleCommentsGotoNextComment]]) - map("n", "pc", [[GoogleCommentsGotoPrevComment]]) map("n", "lc", [[GoogleCommentsToggleLineComments]]) map("n", "ac", [[GoogleCommentsToggleAllComments]]) map("n", "fc", [[GoogleCommentsFetchComments]]) + map("n", "tc", [[GoogleCommentsTelescope]]) vim.fn.sign_define("COMMENT_ICON", { text = "" }) end, diff --git a/vim/.vim/lua/plugins/leap.lua b/vim/.vim/lua/plugins/leap.lua new file mode 100644 index 0000000..ccd4ebd --- /dev/null +++ b/vim/.vim/lua/plugins/leap.lua @@ -0,0 +1,6 @@ +return { + "ggandor/leap.nvim", + config = function() + require("leap").add_default_mappings() + end, +} diff --git a/vim/.vim/lua/plugins/lualine.lua b/vim/.vim/lua/plugins/lualine.lua index 3241bcf..6ac469e 100644 --- a/vim/.vim/lua/plugins/lualine.lua +++ b/vim/.vim/lua/plugins/lualine.lua @@ -53,7 +53,7 @@ return { globalstatus = false, refresh = { statusline = 1000, - tabline = 1000, + -- tabline = 1000, winbar = 1000, }, }, @@ -73,42 +73,42 @@ return { lualine_y = { "progress" }, lualine_z = { "location" }, }, - tabline = { - lualine_a = { - { - "tabs", - mode = 1, - use_mode_colors = true, - max_length = (vim.o.columns / 5) * 4, - fmt = function(name, context) - -- Show + if buffer is modified in tab - local buflist = vim.fn.tabpagebuflist(context.tabnr) - local winnr = vim.fn.tabpagewinnr(context.tabnr) - local bufnr = buflist[winnr] - local mod = vim.fn.getbufvar(bufnr, "&mod") - - return name .. (mod == 1 and " +" or "") - end, - }, - }, - lualine_b = { "branch" }, - -- lualine_c = { "filename" }, - lualine_c = { - { - "diagnostics", - sources = { "nvim_workspace_diagnostic" }, - symbols = { error = " ", warn = " ", info = " ", hint = " " }, - }, - }, - -- lualine_y = { getLGTMs } - lualine_z = { - { - "filename", - file_status = false, -- displays file status (readonly status, modified status) - path = 2, -- 0 = just filename, 1 = relative path, 2 = absolute path - }, - }, - }, + -- tabline = { + -- lualine_a = { + -- { + -- "tabs", + -- mode = 1, + -- use_mode_colors = true, + -- max_length = (vim.o.columns / 5) * 4, + -- fmt = function(name, context) + -- -- Show + if buffer is modified in tab + -- local buflist = vim.fn.tabpagebuflist(context.tabnr) + -- local winnr = vim.fn.tabpagewinnr(context.tabnr) + -- local bufnr = buflist[winnr] + -- local mod = vim.fn.getbufvar(bufnr, "&mod") + -- + -- return name .. (mod == 1 and " +" or "") + -- end, + -- }, + -- }, + -- lualine_b = { "branch" }, + -- -- lualine_c = { "filename" }, + -- lualine_c = { + -- { + -- "diagnostics", + -- sources = { "nvim_workspace_diagnostic" }, + -- symbols = { error = " ", warn = " ", info = " ", hint = " " }, + -- }, + -- }, + -- -- lualine_y = { getLGTMs } + -- lualine_z = { + -- { + -- "filename", + -- file_status = false, -- displays file status (readonly status, modified status) + -- path = 2, -- 0 = just filename, 1 = relative path, 2 = absolute path + -- }, + -- }, + -- }, }) end, } diff --git a/vim/.vim/lua/plugins/notify.lua b/vim/.vim/lua/plugins/notify.lua new file mode 100644 index 0000000..62b99a5 --- /dev/null +++ b/vim/.vim/lua/plugins/notify.lua @@ -0,0 +1,14 @@ +return { + "rcarriga/nvim-notify", + event = "VimEnter", + lazy = true, + config = function() + local colors = require("catppuccin.palettes").get_palette() + require("notify").setup({ + background_colour = colors.base, + fps = 10, -- default 30 + stages = "slide", -- default fade_in_slide_out + timeout = 5000, -- default 5000 + }) + end, +} diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google index f99cbbd..a528bb3 100644 --- a/zsh/.bash_profile.google +++ b/zsh/.bash_profile.google @@ -50,6 +50,7 @@ source ~/g3path.zsh source /etc/bash_completion.d/hgd source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh +alias aapt2=/google/src/head/depot/google3/third_party/java/android/android_sdk_linux/platform-tools/aapt2 alias acid=/google/bin/releases/mobile-devx-platform/acid/acid alias apido='/google/data/ro/teams/oneplatform/apido' alias bugs=/google/data/rw/users/mk/mkannan/www/bin/bugs