Skip to content

Commit a328e3c

Browse files
Minor config updates
1 parent 1c41a4b commit a328e3c

File tree

6 files changed

+35
-44
lines changed

6 files changed

+35
-44
lines changed

.commonrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr
157157

158158
# yazi
159159
if command -v yazi >/dev/null; then
160-
function yy() {
160+
function y() {
161161
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")"
162162
yazi "$@" --cwd-file="$tmp"
163163
if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then

.config/alias/config.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ alias cl="clear"
3434

3535
alias e="exit"
3636
alias d="du -shcL"
37+
alias s="ssh"
3738
alias pd="pushd"
3839
alias xd="popd"
3940
alias ...="cd ../.."
@@ -42,6 +43,7 @@ alias ll="ls -l --icons"
4243
alias lla="ls -lA --icons"
4344
alias la="ls -A"
4445
alias grep="grep --color=auto"
46+
if command -v rg &> /dev/null; then alias g="rg"; else alias g="grep"; fi
4547
alias fgrep="fgrep --color=auto"
4648
alias egrep="egrep --color=auto"
4749
alias rr="rm -r"
@@ -61,7 +63,7 @@ if command -v wslpath &> /dev/null; then cdw() { builtin cd -- "`wslpath "$1"`";
6163

6264
# Goes up a specified number of directories
6365
up() {
64-
if [ $# -eq 1 ] && [ $1 -gt 0 ]; then
66+
if [ $# -eq 1 ] && [ "$1" -gt 0 ]; then
6567
local input="../"
6668
local count="$1"
6769
printf -v string "%*s" "$count"

.config/nvim/lazy-lock.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
{
22
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
3-
"blink.cmp": { "branch": "main", "commit": "705f20f92bb5edffaab3598fbb484dc37a558bc9" },
3+
"blink.cmp": { "branch": "main", "commit": "1c8d8e45d6fba3d11512f4762b1fdf906bffca42" },
44
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
55
"cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
6-
"conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" },
6+
"conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
77
"duck.nvim": { "branch": "main", "commit": "d8a6b08af440e5a0e2b3b357e2f78bb1883272cd" },
88
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
99
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
1010
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
11-
"gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
12-
"grug-far.nvim": { "branch": "main", "commit": "309ecac6e6240d37c0be3c567d9f7cc95f63d255" },
11+
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
12+
"grug-far.nvim": { "branch": "main", "commit": "6b1aca6018cb6ce18a46b9e8583074a2f820b51e" },
1313
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
1414
"incline.nvim": { "branch": "main", "commit": "0eb5b7f6fc6636a4e7b2eb2800b7650fd6d164a2" },
15-
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
15+
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
1616
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
1717
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
18-
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
18+
"lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
1919
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
2020
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
2121
"mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" },
2222
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
23-
"mini.nvim": { "branch": "main", "commit": "e554890210cd29d017d6a0c1b1a46f995dcf9e64" },
23+
"mini.nvim": { "branch": "main", "commit": "0429e9ee9d35faef51971abdbb1b26d2540b5a5f" },
2424
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
25-
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
26-
"nvim-lspconfig": { "branch": "master", "commit": "5344e00b86d1ea50c39a1da8af9f3d197234bcfe" },
27-
"nvim-treesitter": { "branch": "master", "commit": "8bc635a25f581d42b0a0e5ba8870bd73244dcdea" },
28-
"nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
25+
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
26+
"nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" },
27+
"nvim-treesitter": { "branch": "master", "commit": "b10436b9fb29d3c3c406c07ce813f70245f9bc7b" },
28+
"nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
2929
"onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" },
3030
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
31-
"snacks.nvim": { "branch": "main", "commit": "07f4b9adff7af45a7e0eb22d85a422e32ed4b1ca" },
31+
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
3232
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
3333
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
34-
"undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" },
34+
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
3535
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
3636
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
3737
"vim-tmux-navigator": { "branch": "master", "commit": "791dacfcfc8ccb7f6eb1c853050883b03e5a22fe" },

.config/nvim/lua/config/autocmds.lua

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,3 @@ vim.api.nvim_create_autocmd('FileType', {
7070
})
7171
end,
7272
})
73-
74-
-- Prompt to Open Trouble Quickfix when the qf list opens
75-
-- NOTE: Prevents opening empty Quickfix
76-
vim.api.nvim_create_autocmd('BufRead', {
77-
callback = function(event)
78-
if vim.bo[event.buf].buftype == 'quickfix' then
79-
if vim.tbl_isempty(vim.fn.getqflist()) then
80-
return vim.schedule(function() vim.cmd([[cclose]]) end)
81-
end
82-
83-
local choice = vim.fn.confirm('Open Trouble Quickfix?', '&Yes\n&No\n&Cancel')
84-
vim.schedule(function()
85-
if choice == 1 then -- Yes
86-
vim.cmd([[cclose]])
87-
vim.cmd([[Trouble qflist open]])
88-
end
89-
end)
90-
end
91-
end,
92-
})

.config/nvim/lua/plugins/colorscheme.lua

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
return { -- You can easily change to a different colorscheme.
2-
-- Change the name of the colorscheme plugin below, and then
3-
-- change the command in the config to whatever the name of that colorscheme is
4-
--
5-
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`
1+
return {
62
'navarasu/onedark.nvim',
73
lazy = false, -- make sure we load this during startup if it is your main colorscheme
84
priority = 1000, -- make sure to load this before all the other start plugins
@@ -46,4 +42,3 @@ return { -- You can easily change to a different colorscheme.
4642
vim.cmd.hi('Comment gui=none')
4743
end,
4844
}
49-

.config/nvim/lua/plugins/snacks.lua

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ return {
77
bigfile = { enabled = true },
88
dashboard = {
99
enabled = true,
10+
preset = {
11+
keys = {
12+
{ icon = "", key = "f", desc = "Find File", action = ":lua Snacks.dashboard.pick('files', { hidden = true })" },
13+
{ icon = "", key = "n", desc = "New File", action = ":ene | startinsert" },
14+
{ icon = "", key = "g", desc = "Find Text", action = ":lua Snacks.dashboard.pick('grep', { hidden = true })" },
15+
{ icon = "", key = ".", desc = "Recent Files", action = ":lua Snacks.dashboard.pick('oldfiles')" },
16+
{ icon = "", key = "n", desc = "Config", action = ":lua Snacks.dashboard.pick('files', { cwd = vim.fn.stdpath('config'), follow = true })" },
17+
-- { icon = " ", key = "s", desc = "Restore Session", section = "session" },
18+
{ icon = "󰒲 ", key = "z", desc = "Lazy", action = ":Lazy", enabled = package.loaded.lazy ~= nil },
19+
{ icon = "", key = "q", desc = "Quit", action = ":qa" },
20+
},
21+
},
1022
sections = {
1123
{ section = 'header' },
1224
{ icon = '', title = 'Keymaps', section = 'keys', indent = 2, padding = 1 },
@@ -146,6 +158,7 @@ return {
146158
['<c-a>'] = { 'select_all', mode = { 'n', 'i' } },
147159
['<c-b>'] = { 'preview_scroll_up', mode = { 'i', 'n' } },
148160
['<c-d>'] = { 'list_scroll_down', mode = { 'i', 'n' } },
161+
['<PageDown>'] = { 'list_scroll_down', mode = { 'i', 'n' } },
149162
['<c-f>'] = { 'preview_scroll_down', mode = { 'i', 'n' } },
150163
['<c-g>'] = { 'toggle_live', mode = { 'i', 'n' } },
151164
['<c-j>'] = { 'list_down', mode = { 'i', 'n' } },
@@ -155,6 +168,7 @@ return {
155168
['<c-q>'] = { 'qflist', mode = { 'i', 'n' } },
156169
['<c-s>'] = { 'edit_split', mode = { 'i', 'n' } },
157170
['<c-u>'] = { 'list_scroll_up', mode = { 'i', 'n' } },
171+
['<PageUp>'] = { 'list_scroll_up', mode = { 'i', 'n' } },
158172
['<c-v>'] = { 'edit_vsplit', mode = { 'i', 'n' } },
159173
['?'] = 'toggle_help_input',
160174
['G'] = 'list_bottom',
@@ -354,9 +368,9 @@ return {
354368
{ '<leader>sC', function() Snacks.picker.commands() end, desc = 'Commands' },
355369
{ '<leader>sD', function() Snacks.picker.diagnostics() end, desc = '[S]earch [D]iagnostics' },
356370
{ '<leader>sd', function() Snacks.picker.diagnostics_buffer() end, desc = '[S]earch [D]iagnostics buffer' },
357-
{ '<leader>sf', function() Snacks.picker.files() end, desc = '[S]earch [F]iles' },
371+
{ '<leader>sf', function() Snacks.picker.files({ hidden = true }) end, desc = '[S]earch [F]iles' },
358372
{ '<leader>sF', function() Snacks.picker.smart() end, desc = '[S]mart Find [F]iles' },
359-
{ '<leader>sg', function() Snacks.picker.grep() end, desc = 'Grep' },
373+
{ '<leader>sg', function() Snacks.picker.grep({ hidden = true }) end, desc = 'Grep' },
360374
{ '<leader>sh', function() Snacks.picker.help() end, desc = '[S]earch [H]elp' },
361375
{ '<leader>sH', function() Snacks.picker.highlights() end, desc = 'Highlights' },
362376
{ '<leader>si', function() Snacks.picker.icons() end, desc = 'Icons' },
@@ -365,7 +379,7 @@ return {
365379
{ '<leader>sl', function() Snacks.picker.loclist() end, desc = 'Location List' },
366380
{ '<leader>sM', function() Snacks.picker.man() end, desc = 'Man Pages' },
367381
{ '<leader>sm', function() Snacks.picker.marks() end, desc = 'Marks' },
368-
{ '<leader>sn', function() Snacks.picker.files({ cwd = vim.fn.stdpath('config') }) end, desc = '[S]earch [N]eovim files' },
382+
{ '<leader>sn', function() Snacks.picker.files({ cwd = vim.fn.stdpath('config'), follow = true }) end, desc = '[S]earch [N]eovim files' },
369383
{ '<leader>sp', function() Snacks.picker.projects() end, desc = '[S]earch [P]rojects' },
370384
{ '<leader>sq', function() Snacks.picker.qflist() end, desc = '[S]earch [Q]uickfix' },
371385
{ '<leader>sr', function() Snacks.picker.resume() end, desc = '[S]earch [R]esume last command/query' },

0 commit comments

Comments
 (0)