diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml index a3e50ad..e008862 100644 --- a/config/alacritty/alacritty.toml +++ b/config/alacritty/alacritty.toml @@ -6,6 +6,7 @@ offset = { x = 0, y = 3 } normal = { family = "JetBrainsMono Nerd Font", style = "Regular" } [window] +# startup_mode = "Maximized" padding.x = 10 padding.y = 10 @@ -13,42 +14,39 @@ padding.y = 10 style.shape = "Beam" style.blinking = "Always" +# Kanagawa Wave Alacritty Colors [colors.primary] background = '#141415' -foreground = '#cdcdcd' +foreground = '#dcd7ba' [colors.normal] -black = '#252530' -red = '#d8647e' -green = '#7fa563' -yellow = '#f3be7c' -blue = '#6e94b2' -magenta = '#bb9dbd' -cyan = '#aeaed1' -white = '#cdcdcd' +black = '#090618' +red = '#c34043' +green = '#76946a' +yellow = '#c0a36e' +blue = '#7e9cd8' +magenta = '#957fb8' +cyan = '#6a9589' +white = '#c8c093' [colors.bright] -black = '#606079' -red = '#e08398' -green = '#99b782' -yellow = '#f5cb96' -blue = '#8ba9c1' -magenta = '#c9b1ca' -cyan = '#bebeda' -white = '#d7d7d7' +black = '#727169' +red = '#e82424' +green = '#98bb6c' +yellow = '#e6c384' +blue = '#7fb4ca' +magenta = '#938aa9' +cyan = '#7aa89f' +white = '#dcd7ba' -[colors.hints.start] -foreground = "CellBackground" -background = "CellForeground" +[colors.selection] +background = '#2d4f67' +foreground = '#c8c093' -[colors.hints.end] -foreground = "CellBackground" -background = "CellForeground" +[[colors.indexed_colors]] +index = 16 +color = '#ffa066' -[colors.search.matches] -foreground = "CellBackground" -background = "CellForeground" - -[colors.search.focused_match] -foreground = "CellBackground" -background = '#f3be7c' +[[colors.indexed_colors]] +index = 17 +color = '#ff5d62' diff --git a/config/fish/config.fish b/config/fish/config.fish index 99389fd..7704c02 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -3,11 +3,15 @@ # ============================================================================== # Disable fish greeting set -g fish_greeting +set -g fish_prompt_pwd_dir_length 999 set -gx XDG_CONFIG_HOME $HOME/.config set -gx XDG_DATA_HOME $HOME/.local/share set -gx XDG_CACHE_HOME $HOME/.cache set -gx XDG_STATE_HOME $HOME/.local/state +set -gx GOOGLE_API_KEY "no" +set -gx GOOGLE_DEFAULT_CLIENT_ID "no" +set -gx GOOGLE_DEFAULT_CLIENT_SECRET "no" # Core settings set -gx EDITOR "nvim" @@ -88,25 +92,18 @@ alias :q='exit' alias files='nemo .' alias lg='gitu' alias ldk='lazydocker' -alias fetch='fastfetch' +alias fetch='pfetch' # Custom shortcuts alias reload='source ~/.config/fish/config.fish' -alias p='exec ~/.local/bin/project-select' -alias prj='cd ~/Projects/ && ll' -alias dots='cd ~/.dotfiles' -alias dotman='bash ~/.dotfiles/install.sh' +alias dotf='cd ~/.dotfiles' +alias doti='bash ~/.dotfiles/install.sh -i' +alias dotl='bash ~/.dotfiles/install.sh -l' alias todo='cd ~/Todo/ && nvim index.md' alias myip='curl ipinfo.io/ip; echo ""' -alias lspmake='bear -- make -B' -alias sub='subl . && exit' -alias tc='tmux attach' -alias td='tmux detach' alias db='lazysql' +alias query='xbps-query -Rs' -# Docker shortcuts -alias services-up='docker compose -f /home/jason/Documents/Compose/local-services/docker-compose.yaml up -d' -alias services-down='docker compose -f /home/jason/Documents/Compose/local-services/docker-compose.yaml down' ## Basic project picker using mini sessions and neovim function pp diff --git a/config/nvim/init.lua b/config/nvim/init.lua index d3e9660..4705096 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -55,14 +55,25 @@ vim.pack.add({ { src = 'https://github.com/sheerun/vim-polyglot' }, { src = 'https://github.com/romus204/tree-sitter-manager.nvim' }, { src = 'https://github.com/xiyaowong/transparent.nvim' }, - { src = "https://github.com/vague-theme/vague.nvim" }, + { src = "https://github.com/rebelot/kanagawa.nvim" }, }) require("mini.completion").setup() require("tree-sitter-manager").setup() - -require('vague').setup({ transparent = true, }) -vim.cmd.colorscheme('vague') +require('kanagawa').setup({ + commentStyle = { italic = false }, + keywordStyle = { italic = false }, + transparent = true, + overrides = function(colors) + return { + SignColumn = { bg = "none" }, + LineNr = { bg = "none" }, + CursorLineNr = { bg = "none" }, + FoldColumn = { bg = "none" }, + } + end, +}) +vim.cmd.colorscheme('kanagawa') -- Lsp specific, uses nvim-lspconfigs with the below vim.lsp.enable({ "gopls", "ols" }) diff --git a/install.sh b/install.sh index c40b242..f45a508 100755 --- a/install.sh +++ b/install.sh @@ -147,11 +147,11 @@ if [ "$DO_INSTALL" = true ]; then # ----------------------------------------------------------------------------- REQUIRED_PACKAGES=( # system essentials - wget curl git unzip lf jq alacritty fzf + wget curl git unzip lf jq alacritty fzf pfetch fd ripgrep bat direnv base-devel make valgrind tree ca-certificates gnupg fuse rsync fish-shell noto-fonts-ttf noto-fonts-emoji go xdotool wmctrl - kanata tree-sitter-cli gitu + kanata tree-sitter-cli gitu polybar rofi ) MISSING_PACKAGES=() @@ -173,7 +173,7 @@ if [ "$DO_INSTALL" = true ]; then sudo xbps-install -S echo "📦 Installing missing packages: ${MISSING_PACKAGES[*]}" - sudo xbps-install -y "${MISSING_PACKAGES[@]}" + sudo xbps-install "${MISSING_PACKAGES[@]}" fi echo ""