diff --git a/.config/ghostty/linux/config b/.config/ghostty/linux/config index 9d98d55..ca0440d 100644 --- a/.config/ghostty/linux/config +++ b/.config/ghostty/linux/config @@ -1,3 +1,3 @@ font-size = 10 window-decoration = none -theme = "rose-pine-moon" +theme = "tokyonight-moon" diff --git a/.config/ghostty/macos/config b/.config/ghostty/macos/config index 9783a5e..62821a9 100644 --- a/.config/ghostty/macos/config +++ b/.config/ghostty/macos/config @@ -1,3 +1,3 @@ font-size = 12 -theme = "rose pine moon" +theme = "tokyonight-moon" macos-titlebar-style = tabs diff --git a/.config/ghostty/themes/tokyonight-moon b/.config/ghostty/themes/tokyonight-moon new file mode 100644 index 0000000..4ec7617 --- /dev/null +++ b/.config/ghostty/themes/tokyonight-moon @@ -0,0 +1,23 @@ +background = #222436 +foreground = #c8d3f5 +selection-background = #2d3f76 +selection-foreground = #c8d3f5 +cursor-color = #c8d3f5 +cursor-text = #222436 +palette = 0=#1b1d2b +palette = 1=#ff757f +palette = 2=#c3e88d +palette = 3=#ffc777 +palette = 4=#82aaff +palette = 5=#c099ff +palette = 6=#86e1fc +palette = 7=#828bb8 +palette = 8=#444a73 +palette = 9=#ff757f +palette = 10=#c3e88d +palette = 11=#ffc777 +palette = 12=#82aaff +palette = 13=#c099ff +palette = 14=#86e1fc +palette = 15=#c8d3f5 + diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 9a80e96..e133721 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,3 +1,4 @@ +vim.opt.termguicolors = true local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", "https://github.com/folke/lazy.nvim.git", lazypath }) @@ -6,6 +7,11 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ spec = { { "rose-pine/neovim", name = "rose-pine" }, + { "folke/tokyonight.nvim", lazy = false, + priority = 1000, + opts = {}, + }, + { "norcalli/nvim-colorizer.lua" }, { "mbbill/undotree" }, { "echasnovski/mini.pairs", version = '*' }, { "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } }, @@ -26,6 +32,7 @@ require("lazy").setup({ } }) +require ('colorizer').setup() require('mini.pairs').setup() require("fzf-lua").setup({ "border-fused", @@ -59,7 +66,6 @@ require("fzf-lua").setup({ }) vim.g.mapleader = " " -vim.opt.termguicolors = true vim.opt.number = true vim.opt.relativenumber = true vim.opt.wrap = false @@ -72,13 +78,14 @@ vim.opt.completeopt = { "menuone", "noselect", "popup" } vim.g.netrw_browse_split = 0 vim.g.netrw_banner = 0 vim.g.netrw_winsize = 25 -vim.cmd.colorscheme("rose-pine-moon") +vim.cmd.colorscheme("tokyonight-moon") vim.lsp.enable({ "lua_ls", "clangd" }) vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" }) vim.api.nvim_set_hl(0, "StatusLineTerm", { bg = "none" }) vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "none" }) +vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 3abb6ba..de6dc75 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -7,11 +7,11 @@ set-option -g default-terminal "tmux-256color" set-option -as terminal-features ',xterm-ghostty:RGB' set-option -g default-shell $SHELL -set -g status-style 'fg=#ea9a97 bg=default' +set -g status-style 'fg=#ff757f bg=default' set -g status-left-length 100 set -g status-right-length 20 -set -g status-left "#[fg=#6e6a86, bold] #S #[fg=#6e6a86,nobold]- " -set -g status-right "#[fg=#ea9a97] %m-%d-%Y #[fg=#6e6a86] %H:%M" +set -g status-left "#[fg=#828bb8, bold] #S #[fg=#828bb8,nobold]- " +set -g status-right "#[fg=#ff757f] %m-%d-%Y #[fg=#828bb8] %H:%M" set -g base-index 1 set -g pane-base-index 1 diff --git a/.zshrc b/.zshrc index 3522ea4..8c3fe5a 100644 --- a/.zshrc +++ b/.zshrc @@ -29,28 +29,17 @@ autoload -Uz _zinit export PATH="$HOME/.local/bin:$PATH" -create-repo() { - printf "Repo name: " - read -r name || return - - [ -z "$name" ] && { echo "No name given"; return; } - - remote_path="hub/$name.git" - - ssh git " - mkdir -p '/home/git/$remote_path' && - git init --bare '/home/git/$remote_path' && - cp '/home/git/hub/dotfiles.git/hooks/post-receive' '/home/git/$remote_path/hooks/' - " && echo "Created git:$remote_path" - ssh git set-desc "$name.git" "$desc" -} - alias ls="ls -a --color" alias grep="rg" if [[ $(uname) != "Darwin" ]]; then alias update_world='doas emerge --ask --update --newuse --deep @world' alias env="sh /home/andrew/personal/dotfiles/env_linux.sh" myfetch.sh + export HOMEBREW_NO_AUTO_UPDATE=1 + export HOMEBREW_NO_ENV_HINTS=1 + export HOMEBREW_DISPLAY_INSTALL_TIMES=0 + export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=1 + export HOMEBREW_NO_EMOJI=1 else alias env='sh ~/personal/dotfiles/env_mac.sh' export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"