diff --git a/.DS_Store b/.DS_Store index 0f73bd7..87b13c7 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/brew/.Brewfile b/brew/.Brewfile index f12b711..27352d3 100644 --- a/brew/.Brewfile +++ b/brew/.Brewfile @@ -3,6 +3,7 @@ cask "logi-options+" cask "font-jetbrains-mono-nerd-font" cask "modrinth" cask "google-chrome" +cask "linearmouse" brew "ripgrep" brew "neovim" @@ -18,7 +19,7 @@ brew "fzf" brew "git" brew "zoxide" brew "stow" -# brew "jpeg-turbo" +brew "jpeg-turbo" brew "npm" brew "wget" brew "jq" diff --git a/nvim/.config/nvim/lua/DarthMooMancer/colors.lua b/nvim/.config/nvim/lua/DarthMooMancer/colors.lua index 9bb716e..da55acc 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/colors.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/colors.lua @@ -3,20 +3,20 @@ -- vim.cmd.colorscheme('melange') -- vim.cmd.colorscheme('rose-pine') -- vim.cmd.colorscheme('bamboo-multiplex') --- require('kanagawa').setup({ --- overrides = function(colors) --- local theme = colors.theme --- return { --- Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency --- PmenuSel = { fg = 'NONE', bg = theme.ui.bg_p2 }, --- PmenuSbar = { bg = theme.ui.bg_m1 }, --- PmenuThumb = { bg = theme.ui.bg_p2 }, --- } --- end, --- }) --- --- vim.cmd.colorscheme('kanagawa-dragon') -vim.cmd.colorscheme('rose-pine') +require('kanagawa').setup({ + overrides = function(colors) + local theme = colors.theme + return { + Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency + PmenuSel = { fg = 'NONE', bg = theme.ui.bg_p2 }, + PmenuSbar = { bg = theme.ui.bg_m1 }, + PmenuThumb = { bg = theme.ui.bg_p2 }, + } + end, +}) + +vim.cmd.colorscheme('kanagawa-dragon') +-- vim.cmd.colorscheme('rose-pine') vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) vim.api.nvim_set_hl(0, 'NormalFloat', { link = 'Normal' }) diff --git a/zshrc/.zshrc b/zshrc/.zshrc index 3255d1a..b55fe12 100644 --- a/zshrc/.zshrc +++ b/zshrc/.zshrc @@ -36,8 +36,7 @@ alias v="nvim" alias ls="eza -a" alias brew-update="brew update && brew upgrade && brew bundle --cleanup --zap --file=~/.Brewfile" alias cmake-update="sudo rm -rd build && cmake -S . -B build && cmake --build build" - - +alias oasis="ssh oasis" # alias grep="rg" #