Merge main into zephyrus
This commit is contained in:
2
.bashrc
2
.bashrc
@@ -13,6 +13,6 @@ PS1='[\u@\h \W]\$ '
|
||||
eval "$(starship init bash)"
|
||||
|
||||
export PATH=~/.npm-global/bin:~/.local/bin:$PATH
|
||||
export SSH_AUTH_SOCK=~/.1password/agent.sock
|
||||
export SSH_AUTH_SOCK=/home/pmcc/.bitwarden-ssh-agent.sock
|
||||
|
||||
alias claude="/home/pmcc/.claude/local/claude"
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
[env]
|
||||
term = "xterm-256color"
|
||||
|
||||
[terminal.shell]
|
||||
program = "/usr/bin/tmux"
|
||||
args = ["new-session", "-A", "-D", "-s", "main"]
|
||||
|
||||
80
.config/nvim/init.lua
Normal file
80
.config/nvim/init.lua
Normal file
@@ -0,0 +1,80 @@
|
||||
-- Bootstrap lazy.nvim
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
vim.g.mapleader= " "
|
||||
vim.o.termguicolors = true
|
||||
vim.o.number = true
|
||||
vim.o.relativenumber = true
|
||||
vim.o.signcolumn = "yes"
|
||||
vim.o.expandtab = true
|
||||
vim.o.tabstop = 2
|
||||
vim.o.softtabstop = 2
|
||||
vim.o.shiftwidth = 2
|
||||
vim.o.termguicolors = true
|
||||
|
||||
-- Setup lazy.nvim
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
{
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
priority = 1000
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
tag = "0.1.8",
|
||||
dependencies = { "nvim-lua/plenary.nvim" }
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate"
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig"
|
||||
},
|
||||
},
|
||||
-- Configure any other settings here. See the documentation for more details.
|
||||
-- colorscheme that will be used when installing plugins.
|
||||
install = { colorscheme = { "catppuccin" } },
|
||||
-- automatically check for plugin updates
|
||||
checker = { enabled = true },
|
||||
})
|
||||
|
||||
require("catppuccin").setup({
|
||||
auto_integrations = true,
|
||||
flavour = "mocha",
|
||||
background = {
|
||||
light = "mocha",
|
||||
dark = "mocha",
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd("colorscheme catppuccin-mocha")
|
||||
|
||||
local builtin = require("telescope.builtin")
|
||||
vim.keymap.set("n", "<C-t>", builtin.find_files, {})
|
||||
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
|
||||
|
||||
local config = require("nvim-treesitter.configs")
|
||||
config.setup({
|
||||
ensure_installed = {"lua", "javascript", "c", "zig", "vim", "rasi", "cpp", "markdown", "markdown_inline"},
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
})
|
||||
|
||||
vim.lsp.enable("zls")
|
||||
vim.lsp.enable("clangd")
|
||||
@@ -24,7 +24,7 @@ $conda\
|
||||
[](fg:sapphire bg:lavender)\
|
||||
$time\
|
||||
[ ](fg:lavender)\
|
||||
$cmd_duration\
|
||||
$cmd_duration
|
||||
$line_break\
|
||||
$character"""
|
||||
|
||||
@@ -161,8 +161,8 @@ vimcmd_visual_symbol = '[❮](bold fg:yellow)'
|
||||
show_milliseconds = true
|
||||
format = " in $duration "
|
||||
style = "bg:lavender"
|
||||
disabled = false
|
||||
show_notifications = true
|
||||
disabled = false
|
||||
show_notifications = false
|
||||
min_time_to_notify = 45000
|
||||
|
||||
[palettes.catppuccin_mocha]
|
||||
|
||||
@@ -12,9 +12,10 @@ set -s escape-time 10
|
||||
# Increase scrollback buffer size
|
||||
set -g history-limit 50000
|
||||
|
||||
# Better colors and terminal support
|
||||
set -g default-terminal "tmux-256color"
|
||||
set -ga terminal-overrides ",*256col*:Tc"
|
||||
# True color settings
|
||||
set -g default-terminal "$TERM"
|
||||
set -ag terminal-overrides ",$TERM:Tc"
|
||||
|
||||
|
||||
# Status bar configuration
|
||||
set -g status-interval 60
|
||||
|
||||
Reference in New Issue
Block a user