Skip to content

Commit

Permalink
update dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
llago-atlassian committed Feb 3, 2025
1 parent dc90f18 commit 28b3a6e
Show file tree
Hide file tree
Showing 15 changed files with 183 additions and 99 deletions.
32 changes: 19 additions & 13 deletions com.googlecode.iterm2.plist
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@
<dict>
<key>AllowClipboardAccess</key>
<true/>
<key>AppleAntiAliasingThreshold</key>
<integer>1</integer>
<key>ApplePressAndHoldEnabled</key>
<false/>
<key>AppleScrollAnimationEnabled</key>
<integer>0</integer>
<key>AppleSmoothFixedFontsSizeThreshold</key>
<integer>1</integer>
<key>AppleWindowTabbingMode</key>
<string>manual</string>
<key>Custom Color Presets</key>
<dict>
<key>Gruvbox Dark</key>
Expand Down Expand Up @@ -177,17 +167,25 @@
<string>E756D64B-FFAE-4ACF-9AA9-FC2ACB21AD39</string>
<key>DisableFullscreenTransparency</key>
<false/>
<key>FlashTabBarInFullscreen</key>
<false/>
<key>HTMLTabTitles</key>
<false/>
<key>HapticFeedbackForEsc</key>
<false/>
<key>HideScrollbar</key>
<false/>
<key>HideTab</key>
<true/>
<key>HotkeyMigratedFromSingleToMulti</key>
<true/>
<key>New Bookmarks</key>
<array>
<dict>
<key>ASCII Anti Aliased</key>
<true/>
<key>ASCII Ligatures</key>
<false/>
<key>Ambiguous Double Width</key>
<false/>
<key>Ansi 0 Color</key>
Expand Down Expand Up @@ -339,7 +337,7 @@
<real>0.98431372549019602</real>
</dict>
<key>BM Growl</key>
<true/>
<false/>
<key>Background Color</key>
<dict>
<key>Blue Component</key>
Expand Down Expand Up @@ -438,6 +436,8 @@
<string>Default</string>
<key>Disable Window Resizing</key>
<true/>
<key>Draw Powerline Glyphs</key>
<false/>
<key>Flashing Bell</key>
<false/>
<key>Foreground Color</key>
Expand Down Expand Up @@ -914,7 +914,7 @@
<key>Non-ASCII Anti Aliased</key>
<true/>
<key>Normal Font</key>
<string>FiraCodeNerdFontComplete-Regular 16</string>
<string>FiraCodeNF-Ret 16</string>
<key>Option Key Sends</key>
<integer>2</integer>
<key>Prompt Before Closing 2</key>
Expand Down Expand Up @@ -982,7 +982,7 @@
<key>Vertical Spacing</key>
<real>1</real>
<key>Visual Bell</key>
<true/>
<false/>
<key>Window Type</key>
<integer>0</integer>
<key>Working Directory</key>
Expand Down Expand Up @@ -1026,10 +1026,16 @@
<string>kNextWindowPointerAction</string>
</dict>
</dict>
<key>PreserveWindowSizeWhenTabBarVisibilityChanges</key>
<false/>
<key>Print In Black And White</key>
<true/>
<key>SavePasteHistory</key>
<true/>
<key>SoundForEsc</key>
<false/>
<key>SplitPaneDimmingAmount</key>
<real>0.40073649878640771</real>
<key>TabStyleWithAutomaticOption</key>
<integer>5</integer>
<key>TabViewType</key>
Expand Down
7 changes: 7 additions & 0 deletions ghostty
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
theme = "GruvboxDark"
font-family = "FiraCode Nerd Font"
font-size = 16
font-feature = -liga
font-feature = -calt
font-feature = -dlig
selection-invert-fg-bg = true
9 changes: 8 additions & 1 deletion gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@
[init]
defaultBranch = main
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[trace2]
eventTarget = af_unix:/Users/llago/atlassian/.canvas/telemetry/git-tracing.sock
eventBrief = true
eventNesting = 1
configparams = custom.metacommands
[maintenance]
repo = /Users/llago/Development/atlassian/atlassian-frontend-monorepo
1 change: 1 addition & 0 deletions macos-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ln -sf $(pwd)/tmux.conf "${HOME}/.tmux.conf"
ln -sf $(pwd)/tmate.conf "${HOME}/.tmate.conf"
ln -sf $(pwd)/gitconfig "${HOME}/.gitconfig"
ln -sf "$(pwd)/nvim" "${HOME}/.config/nvim"
ln -sf $(pwd)/ghostty "${HOME}/Library/Application Support/com.mitchellh.ghostty/config"

mkdir -p "${HOME}/.config/coc/extensions"

Expand Down
21 changes: 21 additions & 0 deletions nvim/after/plugin/barbecue.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
-- triggers CursorHold event faster
vim.opt.updatetime = 200

require("barbecue").setup({
create_autocmd = false, -- prevent barbecue from updating itself automatically
})

vim.api.nvim_create_autocmd({
"WinScrolled", -- or WinResized on NVIM-v0.9 and higher
"BufWinEnter",
"CursorHold",
"InsertLeave",

-- include this if you have set `show_modified` to `true`
"BufModifiedSet",
}, {
group = vim.api.nvim_create_augroup("barbecue.updater", {}),
callback = function()
require("barbecue.ui").update()
end,
})
18 changes: 18 additions & 0 deletions nvim/after/plugin/conform.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
require("conform").setup({
formatters_by_ft = {
lua = { "stylua" },
-- Conform will run multiple formatters sequentially
python = { "isort", "black" },
-- You can customize some of the format options for the filetype (:help conform.format)
rust = { "rustfmt", lsp_format = "fallback" },
javascript = { "prettierd", stop_after_first = false },
typescript = { "prettierd", stop_after_first = false },
typescriptreact = { "prettierd", stop_after_first = false },
javascriptreact = { "prettierd", stop_after_first = false },
},
format_on_save = {
-- These options will be passed to conform.format()
timeout_ms = 500,
lsp_format = "fallback",
},
})
1 change: 1 addition & 0 deletions nvim/after/plugin/dap-ui.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require("dapui").setup()
33 changes: 0 additions & 33 deletions nvim/after/plugin/dap.lua
Original file line number Diff line number Diff line change
@@ -1,33 +0,0 @@
-- local dap = require('dap')

-- dap.adapters.chrome = {
-- type = "executable",
-- command = "node",
-- args = {os.getenv("HOME") .. "/path/to/vscode-chrome-debug/out/src/chromeDebug.js"} -- TODO adjust
-- }

-- dap.configurations.javascriptreact = { -- change this to javascript if needed
-- {
-- type = "chrome",
-- request = "attach",
-- program = "${file}",
-- cwd = vim.fn.getcwd(),
-- sourceMaps = true,
-- protocol = "inspector",
-- port = 9222,
-- webRoot = "${workspaceFolder}"
-- }
-- }

-- dap.configurations.typescriptreact = { -- change to typescript if needed
-- {
-- type = "chrome",
-- request = "attach",
-- program = "${file}",
-- cwd = vim.fn.getcwd(),
-- sourceMaps = true,
-- protocol = "inspector",
-- port = 9222,
-- webRoot = "${workspaceFolder}"
-- }
-- }
12 changes: 6 additions & 6 deletions nvim/after/plugin/harpoon.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
local mark = require('harpoon.mark')
local ui = require('harpoon.ui')

vim.keymap.set('n', '<leader>a', mark.add_file)
vim.keymap.set('n', '<C-e>', ui.toggle_quick_menu)
-- vim.keymap.set('n', '<leader>a', mark.add_file)
-- vim.keymap.set('n', '<C-e>', ui.toggle_quick_menu)

vim.keymap.set('n', '<C-h>', function () ui.nav_file(1) end)
vim.keymap.set('n', '<C-t>', function () ui.nav_file(2) end)
vim.keymap.set('n', '<C-n>', function () ui.nav_file(3) end)
vim.keymap.set('n', '<C-s>', function () ui.nav_file(4) end)
-- vim.keymap.set('n', '<C-h>', function () ui.nav_file(1) end)
-- vim.keymap.set('n', '<C-t>', function () ui.nav_file(2) end)
-- vim.keymap.set('n', '<C-n>', function () ui.nav_file(3) end)
-- vim.keymap.set('n', '<C-s>', function () ui.nav_file(4) end)
2 changes: 1 addition & 1 deletion nvim/after/plugin/lsp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ lsp.preset("recommended")

lsp.ensure_installed({
'html',
'tsserver',
'ts_ls',
'eslint',
'lua_ls',
'rust_analyzer',
Expand Down
10 changes: 9 additions & 1 deletion nvim/after/plugin/nvimtree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1

-- 24 bit colors
vim.opt.termguicolors = true

vim.keymap.set("n", "<C-n>", vim.cmd.NvimTreeToggle)
vim.keymap.set("n", "<leader>r", vim.cmd.NvimTreeRefresh)
vim.keymap.set("n", "<leader>n", vim.cmd.NvimTreeFindFile)

require("nvim-tree").setup()
require("nvim-tree").setup({
view = {
width = 100,
side = "left",
}
})
7 changes: 6 additions & 1 deletion nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
require("llago")
if vim.g.vscode then
-- VSCode Neovim specific stuff
else
require("llago")
end

9 changes: 5 additions & 4 deletions nvim/lua/llago/autocmd.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
vim.api.nvim_create_autocmd('BufWritePre', {
pattern = { '*.tsx', '*.ts', '*.jsx', '*.js' },
command = 'silent! EslintFixAll',
group = vim.api.nvim_create_augroup('MyAutocmdsJavaScripFormatting', {}),
vim.api.nvim_create_autocmd("BufWritePre", {
pattern = "*",
callback = function(args)
require("conform").format({ bufnr = args.buf, lsp_fallback = true })
end,
})
99 changes: 61 additions & 38 deletions nvim/lua/llago/packer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,43 @@ local ensure_packer = function()
return false
end

if vim.g.vscode == nil then
-- File explorer
local packer_bootstrap = ensure_packer()

return require('packer').startup(function(use)
-- Plugin manager
use 'wbthomason/packer.nvim'
-- Fuzzy finder
use {
'nvim-telescope/telescope.nvim', tag = '0.1.6',
requires = {
{ 'nvim-lua/plenary.nvim' },
{ 'nvim-telescope/telescope-fzf-native.nvim',
-- File explorer
local packer_bootstrap = ensure_packer()

return require('packer').startup(function(use)
-- Plugin manager
use 'wbthomason/packer.nvim'
-- Fuzzy finder
use {
'nvim-telescope/telescope.nvim', tag = '0.1.6',
requires = {
{ 'nvim-lua/plenary.nvim' },
{ 'nvim-telescope/telescope-fzf-native.nvim',
run = 'make' }
}
}
-- Theme
use { "ellisonleao/gruvbox.nvim" }
use {
'nvim-tree/nvim-tree.lua',
requires = {
'nvim-tree/nvim-web-devicons', -- optional, for file icons
},
}
-- Icons
-- use('kyazdani42/nvim-web-devicons')
-- Highlighting
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
-- AST debugger
use('nvim-treesitter/playground')
-- File navigation "favorites"
use('ThePrimeagen/harpoon')
-- Undo history
use('mbbill/undotree')
-- Git support
use('tpope/vim-fugitive')
-- LSP
use { 'VonHeikemen/lsp-zero.nvim',
}
-- Theme
use { "ellisonleao/gruvbox.nvim" }
use {
'nvim-tree/nvim-tree.lua',
requires = {
'nvim-tree/nvim-web-devicons', -- optional, for file icons
},
}
-- Icons
-- use('kyazdani42/nvim-web-devicons')
-- Highlighting
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
-- AST debugger
use('nvim-treesitter/playground')
-- File navigation "favorites"
use('ThePrimeagen/harpoon')
-- Undo history
use('mbbill/undotree')
-- Git support
use('tpope/vim-fugitive')
-- LSP
use { 'VonHeikemen/lsp-zero.nvim',
requires = {
-- LSP Support
{ 'neovim/nvim-lspconfig' },
Expand All @@ -62,7 +61,7 @@ if vim.g.vscode == nil then
{ 'hrsh7th/cmp-nvim-lua' },

-- Help signatures for function parameters in insert
{'hrsh7th/cmp-nvim-lsp-signature-help'},
{ 'hrsh7th/cmp-nvim-lsp-signature-help' },

-- Snippets
{ 'L3MON4D3/LuaSnip' },
Expand Down Expand Up @@ -100,10 +99,34 @@ if vim.g.vscode == nil then

use('jose-elias-alvarez/null-ls.nvim')
use('MunifTanjim/prettier.nvim')
use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } }

-- yarn pnp support https://yarnpkg.com/getting-started/editor-sdks
use('lbrayner/vim-rzip')
-- Automatically set up your configuration after cloning packer.nvim
-- Put this at the end after all plugins

-- Formatter
use({
"stevearc/conform.nvim",
config = function()
require("conform").setup()
end,
})

use({
"utilyre/barbecue.nvim",
tag = "*",
requires = {
"SmiteshP/nvim-navic",
"nvim-tree/nvim-web-devicons", -- optional dependency
},
after = "nvim-web-devicons", -- keep this if you're using NvChad
config = function()
require("barbecue").setup()
end,
})
if packer_bootstrap then
require('packer').sync()
end
end)
end
Loading

0 comments on commit 28b3a6e

Please sign in to comment.