Skip to content

Commit c5ee7b7

Browse files
David Barbosa MaiaDavid Barbosa Maia
David Barbosa Maia
authored and
David Barbosa Maia
committed
update dotfiles for new mac
1 parent ef1fbac commit c5ee7b7

File tree

18 files changed

+85
-74
lines changed

18 files changed

+85
-74
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
macos/Alfred.alfredpreferences/preferences/local/

‎.rgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
submodules/

‎bootstrap.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ set -x
2121
# include common gitconfig file on dotfiles repo
2222
git config --global include.path .gitconfig_global
2323

24+
# setup brew
25+
brew bundle --no-lock --file macos/Brewfile
26+
27+
# set homebrew's zsh as the default shell for everyone
28+
sh -c "echo $(which zsh) >> /etc/shells"
29+
chsh -s $(which zsh)
30+
2431
# setup asdf
2532
## go
2633
asdf plugin add golang
@@ -52,14 +59,6 @@ asdf install direnv latest
5259
asdf global direnv $(asdf latest direnv)
5360
asdf direnv setup --shell zsh --version $(asdf latest direnv)
5461

55-
# set homebrew's zsh as the default shell for everyone
56-
sudo sh -c "echo $(which zsh) >> /etc/shells"
57-
chsh -s $(which zsh)
58-
sudo chsh -s $(which zsh)
59-
60-
# setup brew
61-
brew bundle --no-lock --file macos/Brewfile
62-
6362
# neovim
6463
## nvr
6564
pip3 install --upgrade neovim-remote

‎macos/Alfred.alfredpreferences/preferences/appearance/options/prefs.plist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>hidemenu</key>
6+
<true/>
7+
<key>hideshortcuts</key>
8+
<true/>
59
<key>nativedarkmode</key>
610
<true/>
11+
<key>visibleresults</key>
12+
<integer>4</integer>
713
</dict>
814
</plist>

‎macos/Alfred.alfredpreferences/preferences/features/defaultresults/prefs.plist

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
4+
<dict>
5+
<key>showAppleScripts</key>
6+
<true/>
7+
<key>showArchives</key>
8+
<true/>
9+
<key>showDocuments</key>
10+
<true/>
11+
<key>showFolders</key>
12+
<true/>
13+
<key>showImages</key>
14+
<true/>
15+
<key>showTextFiles</key>
16+
<true/>
17+
</dict>
518
</plist>

‎macos/Brewfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ brew "ripgrep"
2323
brew "fd"
2424
brew "bat"
2525
brew "tree"
26-
brew "xplr"
26+
brew "ranger"
2727
brew "htop"
2828
brew "jq"
2929
brew "curl"
@@ -34,18 +34,19 @@ cask "kitty"
3434
cask "warp"
3535
cask "hyper"
3636
cask "alacritty"
37-
cask "fig"
3837
cask "wez/wezterm/wezterm"
3938

4039
# apps
4140
cask "alfred"
4241
cask "raycast"
4342
cask "penc"
43+
cask "fig"
4444
cask "visual-studio-code"
4545
cask "bitwarden"
4646
cask "brave-browser"
4747
cask "discord"
4848
cask "whatsapp"
49+
cask "slack"
4950

5051
# fonts
5152
cask "font-jetbrains-mono-nerd-font"

‎nvim/config/mappings.lua

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ function M.lsp_mappings(bufnr)
152152
map('n', '<Leader>ldp', '<Cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
153153
map('n', '<Leader>ldn', '<Cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
154154
map('n', '<Leader>ldq', '<Cmd>lua vim.lsp.buf.set_loclist()<CR>', opts)
155-
-- Virtual Text/Lines
156-
map('n', '<Leader>lv', '<Cmd>lua vim.diagnostic.config({ virtual_text = not vim.diagnostic.config().virtual_text, virtual_lines = not vim.diagnostic.config().virtual_lines })<CR>', opts)
157155
end
158156

159-
return M
157+
return M

‎nvim/config/options.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ vim.o.hidden = true
2121
-- Turn swap files off
2222
vim.o.swapfile = false
2323

24-
-- Setup colorscheme
25-
vim.cmd 'colorscheme onedark'
26-
2724
-- Show tabs and space
2825
vim.wo.list = true
2926
vim.bo.tabstop = 4

‎nvim/lazy/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ if not vim.loop.fs_stat(lazypath) then
55
end
66
vim.opt.rtp:prepend(lazypath)
77

8+
-- reference: https://github.com/folke/lazy.nvim#%EF%B8%8F-configuration
89
require('lazy').setup('plugins', {
9-
-- reference: https://github.com/folke/lazy.nvim#%EF%B8%8F-configuration
1010
defaults = { lazy = true, version = '*' },
1111
lockfile = vim.fn.expand('~/.config/nvim/lua/lazy/lazy-lock.json'),
1212
concurrency = nil,
13-
install = { missing = true, colorscheme = { 'onedark' } },
13+
install = { missing = true },
1414
checker = { enabled = false },
1515
diff = {
1616
cmd = 'terminal_git',

‎nvim/lazy/lazy-lock.json

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"LuaSnip": { "branch": "master", "commit": "5570fd797eae0790affb54ea669a150cad76db5d" },
3-
"bufferline.nvim": { "branch": "main", "commit": "c7492a76ce8218e3335f027af44930576b561013" },
2+
"LuaSnip": { "branch": "master", "commit": "563827f00bb4fe43269e3be653deabc0005f1302" },
3+
"bufferline.nvim": { "branch": "main", "commit": "028a87933d99f8bb88f2f70a4def3ff9574f3594" },
44
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
55
"cmp-calc": { "branch": "main", "commit": "50792f34a628ea6eb31d2c90e8df174671e4e7a0" },
66
"cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
@@ -16,31 +16,30 @@
1616
"copilot.lua": { "branch": "master", "commit": "81eb5d1bc2eddad5ff0b4e3c1c4be5c09bdfaa63" },
1717
"dirbuf.nvim": { "branch": "main", "commit": "ac7ad3c8e61630d15af1f6266441984f54f54fd2" },
1818
"fidget.nvim": { "branch": "main", "commit": "44585a0c0085765195e6961c15529ba6c5a2a13b" },
19-
"friendly-snippets": { "branch": "main", "commit": "1a6a02350568d6830bcfa167c72f9b6e75e454ae" },
20-
"gitsigns.nvim": { "branch": "main", "commit": "2ab3bdf0a40bab53033048c6be75bda86316b55d" },
21-
"lazy.nvim": { "branch": "main", "commit": "277a2ab10baeebf64548a6b5a606d7b82f8e3165" },
22-
"lsp_lines.nvim": { "branch": "main", "commit": "ec98b45c8280e5ef8c84028d4f38aa447276c002" },
19+
"friendly-snippets": { "branch": "main", "commit": "484fb38b8f493ceeebf4e6fc499ebe41e10aae25" },
20+
"gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" },
21+
"lazy.nvim": { "branch": "main", "commit": "c1a50a7fc5900a3f89f1c5754bb48310ae619e35" },
2322
"lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
2423
"lualine.nvim": { "branch": "master", "commit": "32a7382a75a52e8ad05f4cec7eeb8bbfbe80d461" },
2524
"mason-lspconfig.nvim": { "branch": "main", "commit": "aa25b4153d2f2636c3b3a8c8360349d2b29e7ae3" },
26-
"mason-null-ls.nvim": { "branch": "main", "commit": "4480bc59b72866376fc2f83048a932fa598d89a8" },
25+
"mason-null-ls.nvim": { "branch": "main", "commit": "1fcf055cf3e76e2c228400b504f63fee590863f2" },
2726
"mason-nvim-dap.nvim": { "branch": "main", "commit": "d6cb770928b5cb9a6e3880d6bbb58858c1deeb18" },
2827
"mason-tool-installer.nvim": { "branch": "main", "commit": "27f61f75a71bb3c2504a17e02b571f79cae43676" },
29-
"mason.nvim": { "branch": "main", "commit": "b8c3fceed16d29a166cf73ce55358f13c9f6cfcc" },
30-
"neodev.nvim": { "branch": "main", "commit": "c045c0fe93b1f9c78443d0f3b88660fffbcf64a7" },
28+
"mason.nvim": { "branch": "main", "commit": "4b8fc830fa111c22e9ceb313689b3b35cccb6779" },
29+
"neodev.nvim": { "branch": "main", "commit": "d20006b7ca5c6bcf0c4f955d07947fdf06c360e7" },
3130
"null-ls.nvim": { "branch": "main", "commit": "d09d7d82cc26d63673cef85cb62895dd68aab6d8" },
3231
"numb.nvim": { "branch": "master", "commit": "d95b7ea62e320b02ca1aa9df3635471a88d6f3b1" },
33-
"nvim-bqf": { "branch": "main", "commit": "b418b0a241d36509196944a6f6bee886c775d54f" },
34-
"nvim-cmp": { "branch": "main", "commit": "c49ad26e894e137e401b1d294948c46327877eaf" },
35-
"nvim-dap": { "branch": "master", "commit": "69b7c684cd42e60b48875c580e616a70bccfdbe7" },
36-
"nvim-dap-ui": { "branch": "master", "commit": "54365d2eb4cb9cfab0371306c6a76c913c5a67e3" },
32+
"nvim-bqf": { "branch": "main", "commit": "aac1ff94a8b411a08810117f41e948743a4df69e" },
33+
"nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" },
34+
"nvim-dap": { "branch": "master", "commit": "764899df5ca39076acb08a447f7e5bd0b4fa3147" },
35+
"nvim-dap-ui": { "branch": "master", "commit": "1e21b3b50e67700e32285b5a74e645311fd8bbea" },
3736
"nvim-dap-virtual-text": { "branch": "master", "commit": "2971ce3e89b1711cc26e27f73d3f854b559a77d4" },
3837
"nvim-dap-vscode-js": { "branch": "main", "commit": "e7c05495934a658c8aa10afd995dacd796f76091" },
3938
"nvim-lightbulb": { "branch": "master", "commit": "56b9ce31ec9d09d560fe8787c0920f76bc208297" },
40-
"nvim-lspconfig": { "branch": "master", "commit": "6b43ce561d97412cc512b569db6938e44529293e" },
39+
"nvim-lspconfig": { "branch": "master", "commit": "22c87d6f48c4fb1daf33476450d0b14a64230809" },
4140
"nvim-lsputils": { "branch": "master", "commit": "ae1a4a62449863ad82c70713d5b6108f3a07917c" },
42-
"nvim-surround": { "branch": "main", "commit": "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e" },
43-
"nvim-treesitter": { "branch": "master", "commit": "12e95e160d7d45b76a36bca6303dd8447ab77490" },
41+
"nvim-surround": { "branch": "main", "commit": "a06dea11e7fdcf338776fa51fa5277163ffb048d" },
42+
"nvim-treesitter": { "branch": "master", "commit": "69388e84c34d40c3d5c7d2f310db13276f2179e1" },
4443
"nvim-treesitter-refactor": { "branch": "master", "commit": "75f5895cc662d61eb919da8050b7a0124400d589" },
4544
"nvim-treesitter-textobjects": { "branch": "master", "commit": "d816761ec1ea4a605689bc5f4111088459cf74d4" },
4645
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "bc047b20768845fd54340eb76272b2cf2f6fa3f3" },
@@ -50,30 +49,30 @@
5049
"onedark.nvim": { "branch": "master", "commit": "89dde4963ad198c9b6144dee3d5e8bcbb7559ddc" },
5150
"plenary.nvim": { "branch": "master", "commit": "4b7e52044bbb84242158d977a50c4cbcd85070c7" },
5251
"popfix": { "branch": "master", "commit": "bf3cc436df63cd535350d5ef1b951c91554d4b01" },
53-
"registers.nvim": { "branch": "main", "commit": "667ae447d2c7efb64461a2c58f5311d1248cdb5f" },
54-
"targets.vim": { "branch": "master", "commit": "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d" },
52+
"registers.nvim": { "branch": "main", "commit": "2c4f82a8a68b7d3cee7bd345669f2f50bdc6f889" },
53+
"targets.vim": { "branch": "master", "commit": "4a5e9c09ec2ba63c8cd16b433453e41c22efab22" },
5554
"telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
5655
"telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" },
5756
"telescope-live-grep-args.nvim": { "branch": "master", "commit": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a" },
5857
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
59-
"telescope.nvim": { "branch": "master", "commit": "a606bd10c79ec5989c76c49cc6f736e88b63f0da" },
60-
"tmuxline.vim": { "branch": "master", "commit": "4119c553923212cc67f4e135e6f946dc3ec0a4d6" },
61-
"toggleterm.nvim": { "branch": "main", "commit": "b02a1674bd0010d7982b056fd3df4f717ff8a57a" },
62-
"typescript.nvim": { "branch": "main", "commit": "b96b3f8db2c0e156a6f8734bf794cc7803454e21" },
58+
"telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" },
59+
"tmuxline.vim": { "branch": "master", "commit": "05c687014272abca548d72cfd5d8a7b7c3fb7e5e" },
60+
"toggleterm.nvim": { "branch": "main", "commit": "2a787c426ef00cb3488c11b14f5dcf892bbd0bda" },
61+
"typescript.nvim": { "branch": "main", "commit": "f66d4472606cb24615dfb7dbc6557e779d177624" },
6362
"undotree": { "branch": "master", "commit": "1a23ea84bd02c34f50d8e10a8b4bfc89597ffe4e" },
64-
"vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
65-
"vim-fugitive": { "branch": "master", "commit": "99cdb88bc64063dc4656ae53496f06fb2a394cd4" },
66-
"vim-indent-object": { "branch": "master", "commit": "5c5b24c959478929b54a9e831a8e2e651a465965" },
67-
"vim-matchup": { "branch": "master", "commit": "db5120dd9887c988de7cd973ddb951e465d413e5" },
63+
"vim-commentary": { "branch": "master", "commit": "34976d96b61d49cafce624cdd947317111c43bd8" },
64+
"vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" },
65+
"vim-indent-object": { "branch": "master", "commit": "eb911bc389d0beed9198dd5995fdcca95572719a" },
66+
"vim-matchup": { "branch": "master", "commit": "0ee65c75117c242683d1e8debfc52efec22b9b2c" },
6867
"vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" },
69-
"vim-polyglot": { "branch": "master", "commit": "bc8a81d3592dab86334f27d1d43c080ebf680d42" },
68+
"vim-polyglot": { "branch": "master", "commit": "1d1f36b24ea601eb950865982e05b875aa702330" },
7069
"vim-prosession": { "branch": "master", "commit": "249b635d7483c8e1f8fcdcc50e1457b65a2bbf29" },
71-
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
72-
"vim-snippets": { "branch": "master", "commit": "8c917944354552c1263159a4a218ad924969be0c" },
73-
"vim-test": { "branch": "master", "commit": "c6e5d249241342fd4592a67113cb539427d57e23" },
70+
"vim-repeat": { "branch": "master", "commit": "8106e142dfdc278ff3eaaadd7b362ad7949d4357" },
71+
"vim-snippets": { "branch": "master", "commit": "4ed409154bcaa32fba6fd153cc0c915e44982872" },
72+
"vim-test": { "branch": "master", "commit": "ec07294b8dcdd16e13e1b77a84d483f58cbb9738" },
7473
"vim-tmux-clipboard": { "branch": "master", "commit": "47187740b88f9dab213f44678800cc797223808e" },
75-
"vim-tmux-navigator": { "branch": "master", "commit": "18f0c7fc1e7181e6422247505727d7111c5da544" },
76-
"vim-unimpaired": { "branch": "master", "commit": "6d44a6dc2ec34607c41ec78acf81657248580bf1" },
74+
"vim-tmux-navigator": { "branch": "master", "commit": "85b8e5f60c1690cde57dbb66467ce39cd1b63343" },
75+
"vim-unimpaired": { "branch": "master", "commit": "efdc6475f7ea789346716dabf9900ac04ee8604a" },
7776
"vue-vscode-snippets": { "branch": "main", "commit": "69c744b2a4898d0009b0c552efa74c491d4e7e3f" },
7877
"which-key.nvim": { "branch": "main", "commit": "8682d3003595017cd8ffb4c860a07576647cc6f8" }
7978
}

0 commit comments

Comments
 (0)