Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusandre committed Mar 10, 2024
1 parent b8ea6a0 commit d56802b
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 75 deletions.
3 changes: 1 addition & 2 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ tap "homebrew/cask"
tap "homebrew/cask-fonts"
tap "homebrew/core"
brew "atuin"
brew "bandwhich"
brew "bash"
brew "bat"
brew "btop"
Expand Down Expand Up @@ -35,10 +36,8 @@ brew "moar"
brew "mprocs"
brew "neovim"
brew "nushell"
brew "opam"
brew "pwgen"
brew "restic"
brew "riff"
brew "ripgrep"
brew "rustup"
brew "sk"
Expand Down
146 changes: 90 additions & 56 deletions Brewfile.lock.json

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions git/config
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@

[pager]
difftool = true
diff = riff
show = riff
log = riff

[interactive]
diffFilter = riff --color=on

[log]
date = local
Expand Down
16 changes: 8 additions & 8 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
"lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "55716a879568a498fa236593c8119789054a3b8e" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
"mini.nvim": { "branch": "main", "commit": "70d8a16399ca6df759d20bea302d6dfd710a1df8" },
"mini.nvim": { "branch": "main", "commit": "d7d079d6f99c95218d6059e0eaf83997990b2e0e" },
"nightfox.nvim": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" },
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
"nvim-coverage": { "branch": "main", "commit": "cf4b5c61dfac977026a51a2bcad9173c272986ce" },
"nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
"nvim-lspconfig": { "branch": "master", "commit": "e172dd599cff2ae5267871b5e33fb42934c4df43" },
"nvim-treesitter": { "branch": "master", "commit": "9775d5d7c724f81acdd441e7e9edefc4514e990b" },
"nvim-lspconfig": { "branch": "master", "commit": "99330586c6e1912c890fc39d19d97571fde660cd" },
"nvim-treesitter": { "branch": "master", "commit": "488bec03254207b1dd071be8cb1fb78434b6e777" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
"nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
"obsidian.nvim": { "branch": "main", "commit": "b1f5eb198a6e8dffffc484e803f0b3de4e15f815" },
"nvim-web-devicons": { "branch": "master", "commit": "75df79feb02d5e0ec114e447453775d4d291ea03" },
"obsidian.nvim": { "branch": "main", "commit": "b136c1545fb9c4888d37ba482bfc77f222bbdf52" },
"oil.nvim": { "branch": "master", "commit": "18dfd2458dc741fea683357a17aaa95870b25a3c" },
"playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
"tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" },
"tree-sitter-nu": { "branch": "main", "commit": "7dd29f9616822e5fc259f5b4ae6c4ded9a71a132" },
"tokyonight.nvim": { "branch": "main", "commit": "c025baf23b62f044eff1f4ef561c45de636f0e32" },
"tree-sitter-nu": { "branch": "main", "commit": "c5b7816043992b1cdc1462a889bc74dc08576fa6" },
"ts-error-translator.nvim": { "branch": "main", "commit": "1d24a38427fd2030c5f4e82156c87ab7d6d44814" },
"tsc.nvim": { "branch": "main", "commit": "ec4e6c2493df1b3a8d381ff7a482685cb4122063" },
"typescript-tools.nvim": { "branch": "master", "commit": "c43d9580c3ff5999a1eabca849f807ab33787ea7" },
Expand Down
2 changes: 1 addition & 1 deletion nvim/lua/plugins/colors.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ return {
'EdenEast/nightfox.nvim',
lazy = false,
priority = 1000,
config = function() vim.cmd([[colorscheme nightfox]]) end,
config = function() vim.cmd([[colorscheme duskfox]]) end,
},
}
2 changes: 1 addition & 1 deletion nvim/lua/plugins/lspconfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ return { -- LSP Configuration & Plugins
terraformls = {},
dockerls = {},
marksman = {},
ocamllsp = {},
-- ocamllsp = {},
}

local ensure_installed = vim.tbl_keys(servers or {})
Expand Down
3 changes: 3 additions & 0 deletions nvim/lua/plugins/mini.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ return {
},
})

-- Handling pairing characters
require('mini.pairs').setup()

-- Configurable Lua functions to go forward/backward to a certain target.
require('mini.bracketed').setup()

Expand Down
2 changes: 1 addition & 1 deletion wezterm/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config.font = wezterm.font('Berkeley Mono')
config.line_height = 1.125

-- Colors
config.color_scheme = 'nightfox'
config.color_scheme = 'duskfox'
-- config.color_scheme = 'tokyonight_moon'
-- config.color_scheme = 'Gruvbox dark, dark (base16)'
-- config.color_scheme = 'Everforest Dark (Gogh)'
Expand Down

0 comments on commit d56802b

Please sign in to comment.