mikkel/dotfiles
1
0
Fork 0
mirror of https://github.com/mikkelsvartveit/dotfiles.git synced 2025-12-22 19:22:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change color scheme to catppuccin-macchiato

Browse source
This commit is contained in:
Mikkel Svartveit 2023-03-21 23:24:09 +01:00
parent 16a0fcf9ac
commit 0886cfc653
3 changed files with 772 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

863
iterm2-preferences/com.googlecode.iterm2.plist
View file

File diff suppressed because it is too large Load diff

4
nvim/lazy-lock.json
View file

@ -1,6 +1,7 @@
{ {
"Comment.nvim": { "branch": "master", "commit": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20" }, "Comment.nvim": { "branch": "master", "commit": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20" },
"auto-session": { "branch": "main", "commit": "1d3dd70a2d48e0f3441128eb4fb0b437a0bf2cc4" }, "auto-session": { "branch": "main", "commit": "1d3dd70a2d48e0f3441128eb4fb0b437a0bf2cc4" },
"catppuccin": { "branch": "main", "commit": "128af65c3a23c94b324dc8d7f02a34feee8722d4" },
"coc.nvim": { "branch": "release", "commit": "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043" }, "coc.nvim": { "branch": "release", "commit": "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043" },
"code_runner.nvim": { "branch": "main", "commit": "a010649236fe245eaab2641a13228cd601499715" }, "code_runner.nvim": { "branch": "main", "commit": "a010649236fe245eaab2641a13228cd601499715" },
"copilot.vim": { "branch": "release", "commit": "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b" }, "copilot.vim": { "branch": "release", "commit": "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b" },
@ -11,10 +12,9 @@
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" },
"nvim-scrollbar": { "branch": "main", "commit": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943" }, "nvim-scrollbar": { "branch": "main", "commit": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943" },
"nvim-toggleterm.lua": { "branch": "main", "commit": "2a787c426ef00cb3488c11b14f5dcf892bbd0bda" }, "nvim-toggleterm.lua": { "branch": "main", "commit": "a5638b2206c3930a16a24e5c184dddd572f8cd34" },
"nvim-tree.lua": { "branch": "master", "commit": "e14989c0eaa6f9c299d48f7e45ce1ed04b21180f" }, "nvim-tree.lua": { "branch": "master", "commit": "e14989c0eaa6f9c299d48f7e45ce1ed04b21180f" },
"nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" }, "nvim-web-devicons": { "branch": "master", "commit": "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f" },
"onehalf": { "branch": "master", "commit": "75eb2e97acd74660779fed8380989ee7891eec56" },
"plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
"telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },

31
nvim/lua/plugins.lua
View file

@ -16,12 +16,11 @@ vim.opt.rtp:prepend(lazypath)
require("lazy").setup({ require("lazy").setup({
-- Color scheme -- Color scheme
{ {
"sonph/onehalf", "catppuccin/nvim",
name = "catppuccin",
priority = 1000, priority = 1000,
config = function(plugin) config = function(plugin)
vim.opt.rtp:append(plugin.dir .. "/vim") vim.cmd.colorscheme "catppuccin-macchiato"
vim.opt.termguicolors = true
vim.cmd([[colorscheme onehalfdark]])
end end
}, },
@ -158,17 +157,17 @@ require("lazy").setup({
-- Persistent terminal that can be toggled with a keybinding -- Persistent terminal that can be toggled with a keybinding
{ {
"akinsho/nvim-toggleterm.lua", "akinsho/nvim-toggleterm.lua",
tag = "2.3.0", tag = "2.4.0",
keys = "<C-j>", keys = "<C-j>",
opts = { opts = {
size = 20, size = 20,
hide_numbers = true, hide_numbers = true,
direction = 'horizontal', direction = 'float',
open_mapping = [[<C-j>]], open_mapping = [[<C-j>]],
shade_terminals = true, shade_terminals = false,
shading_factor = 2, shading_factor = -16,
shell = 'fish' shell = 'fish'
} },
}, },
-- Run code with a keybinding -- Run code with a keybinding
@ -221,19 +220,7 @@ require("lazy").setup({
-- VSCode-like scrollbar with Git and diagnostic markers -- VSCode-like scrollbar with Git and diagnostic markers
{ {
"petertriho/nvim-scrollbar", "petertriho/nvim-scrollbar",
opts = { config = true,
marks = {
Search = { color = "#ff9e64" },
Error = { color = "#db4b4b" },
Warn = { color = "#e0af68" },
Info = { color = "#0db9d7" },
Hint = { color = "#1abc9c" },
Misc = { color = "#9d7cd8" },
GitAdd = { color = "#9ece6a" },
GitChange = { color = "#e0af68" },
GitDelete = { color = "#914c54" },
}
}
}, },
-- Smooth scrolling -- Smooth scrolling