From 29e68a21b3b85bb8475eaa1090a128c33f645f5a Mon Sep 17 00:00:00 2001 From: Pat Garrity Date: Tue, 29 Apr 2025 09:55:49 -0500 Subject: [PATCH] More overhauling action. --- .config/alacritty/alacritty.toml | 103 +++++------------------- .config/ghostty/.config.swp | Bin 0 -> 12288 bytes .config/ghostty/config | 8 ++ .config/i3/config | 3 +- .config/nvim/init.lua | 3 + .config/nvim/lua/colorscheme.lua | 6 +- .config/nvim/lua/plugin_management.lua | 43 ++-------- .config/nvim/lua/plugins/treesitter.lua | 5 +- .config/starship.toml | 2 +- .gitconfig | 1 + .zshrc | 28 ++++--- 11 files changed, 64 insertions(+), 138 deletions(-) create mode 100644 .config/ghostty/.config.swp create mode 100644 .config/ghostty/config diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index d487b28..2520d94 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,79 +1,10 @@ -[colors.bright] -#black = "0x32302f" -#blue = "0x7daea3" -#cyan = "0x89b482" -#green = "0xa9b665" -#magenta = "0xd3869b" -#red = "0xea6962" -#white = "0xd4be98" -#yellow = "0xd8a657" -black = "0x867462" -red = "0xD47766" -green = "0x85B695" -yellow = "0xEBC06D" -blue = "0xA3A9CE" -magenta ="0xCF9BC2" -cyan = "0x89B3B6" -white = "0xECE1D7" - -[colors.cursor] -cursor = "CellForeground" -text = "CellBackground" - -#colors: -# primary: -# foreground: '#ECE1D7' -# background: '#292522' -# normal: -# black: '#34302C' -# red: '#BD8183' -# green: '#78997A' -# yellow: '#E49B5D' -# blue: '#7F91B2' -# magenta: '#B380B0' -# cyan: '#7B9695' -# white: '#C1A78E' -# bright: -# black: '#867462' -# red: '#D47766' -# green: '#85B695' -# yellow: '#EBC06D' -# blue: '#A3A9CE' -# magenta: '#CF9BC2' -# cyan: '#89B3B6' -# white: '#ECE1D7' - -[colors.normal] -#black = "0x32302f" -#blue = "0x7daea3" -#cyan = "0x89b482" -#green = "0xa9b665" -#magenta = "0xd3869b" -#red = "0xea6962" -#white = "0xd4be98" -#yellow = "0xd8a657" -black = "0x34302C" -red = "0xBD8183" -green = "0x78997A" -yellow = "0xE49B5D" -blue = "0x7F91B2" -magenta ="0xB380B0" -cyan = "0x7B9695" -white = "0xC1A78E" - -[colors.primary] -#background = "0x1d2021" -#foreground = "0xd4be98" -foreground = '0xECE1D7' -background = '0x292522' - -[colors.selection] -background = "CellForeground" -text = "CellBackground" - -[colors.vi_mode_cursor] -cursor = "CellForeground" -text = "CellBackground" +general.import = [ + # uncomment the flavour you want below: + #"~/.config/alacritty/catppuccin-latte.toml" + # "~/.config/alacritty/catppuccin-frappe.toml" + # "~/.config/alacritty/catppuccin-macchiato.toml" + "~/.config/alacritty/catppuccin-mocha.toml" +] [cursor] unfocused_hollow = true @@ -86,23 +17,23 @@ shape = "Block" TERM = "xterm-256color" [font] -size = 13.0 +size = 14.0 + +[font.normal] +family = "Iosevka Nerd Font Mono" [font.bold] -family = "Iosevka Term" +family = "Iosevka Nerd Font Mono" style = "Bold" [font.bold_italic] -family = "Iosevka Term" +family = "Iosevka Nerd Font Mono" style = "Bold Italic" [font.italic] -family = "Iosevka Term" +family = "Iosevka Nerd Font Mono" style = "Italic" -[font.normal] -family = "Iosevka Term" - [scrolling] history = 10000 multiplier = 3 @@ -111,8 +42,12 @@ multiplier = 3 semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" [window] -decorations = "full" +decorations = "none" dynamic_title = false opacity = 1.0 startup_mode = "Windowed" title = "Alacritty" + +[window.padding] +x = 8 +y = 8 diff --git a/.config/ghostty/.config.swp b/.config/ghostty/.config.swp new file mode 100644 index 0000000000000000000000000000000000000000..9802e8c58bb75820f101ca728404dfeac8b4e664 GIT binary patch literal 12288 zcmeI%yGjE=6b9fEyHwscrOy(bvaAF#24jvkjuukMpN9 zuORE_!OSkA5f7|Zlui67s0N|UoEugr%RlT!3j`oAw?Nk+vA))t zdmJ`G00Izz00bZa0SG_<0*fc$(gNM_v6rStFHURWSDh|VAOHafKmY;|fB*y_009U< z00IzLKmpky@|KArPX7P@=llPi*KeFx&I{+6^Tc`N+;hhL3;4b`G6Wz10SG_<0uX=z z1Rwwb2teRJ1)K|Yti_Q~(xqu%sVMPct3pX-aXgTbk!_<7g^|wbZQ=K1nsSY$Qeh;W z<=b&H`8IK07TxBf>U-2B*Sopyn!G5xb<)(KxV)guOd5R|M`p;arH0M)pex0>?sdc| K4-rk9SVP~1D^+y> literal 0 HcmV?d00001 diff --git a/.config/ghostty/config b/.config/ghostty/config new file mode 100644 index 0000000..e3bebe8 --- /dev/null +++ b/.config/ghostty/config @@ -0,0 +1,8 @@ +font-family = "Iosevka Nerd Font Mono" +font-size = 14 + +# Available: latte, frappe, macchiato, mocha +theme = catppuccin-mocha + +shell-integration = zsh +gtk-titlebar = false diff --git a/.config/i3/config b/.config/i3/config index 2e8abba..18ba7a3 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -32,7 +32,8 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU floating_modifier $mod # start a terminal -bindsym $mod+Return exec ~/.cargo/bin/alacritty +#bindsym $mod+Return exec ~/.cargo/bin/alacritty +bindsym $mod+Return exec ~/.local/bin/ghostty # kill focused window bindsym $mod+Shift+q kill diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 2410b1c..554c846 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,3 +1,6 @@ +-- Disable any unused providers. +vim.g.loaded_perl_provider = 0 + -- Configure basic Neovim settings. require('general') diff --git a/.config/nvim/lua/colorscheme.lua b/.config/nvim/lua/colorscheme.lua index f442abc..4edb4a9 100644 --- a/.config/nvim/lua/colorscheme.lua +++ b/.config/nvim/lua/colorscheme.lua @@ -4,4 +4,8 @@ vim.opt.background = 'dark' -- Set the color scheme --vim.cmd 'colorscheme gruvbox-material' -vim.cmd 'colorscheme melange' +--vim.cmd 'colorscheme melange' + +-- options for catppuccin: +-- catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha +vim.cmd 'colorscheme catppuccin-mocha' diff --git a/.config/nvim/lua/plugin_management.lua b/.config/nvim/lua/plugin_management.lua index 65c03f2..8111911 100644 --- a/.config/nvim/lua/plugin_management.lua +++ b/.config/nvim/lua/plugin_management.lua @@ -14,6 +14,12 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ -- Color schemes. Lazy, only selected will be loaded. -- ------------------------------------------------------------------------- + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + lazy = true + }, { 'sainnhe/gruvbox-material', lazy = true, @@ -177,11 +183,8 @@ require("lazy").setup({ -- bash-language-server lsp.bashls.setup{} - -- texlab = latex language server - lsp.texlab.setup{} - -- tsserver = typescript language server, works for JS as well. - lsp.tsserver.setup{} + lsp.ts_ls.setup{} end }, @@ -344,39 +347,7 @@ require("lazy").setup({ end, }, - -- Racket support - -- ------------------------------------------------------------------------- - { - 'benknoble/vim-racket', - ft = { 'rkt' }, - lazy = true, - }, - - -- Janet support - -- ------------------------------------------------------------------------- - { - 'bakpakin/janet.vim', - ft = { 'janet' }, - lazy = true - }, - - -- PlantUML syntax - -- ------------------------------------------------------------------------- - { - 'aklt/plantuml-syntax', - ft = { 'puml' }, - lazy = true, - }, - -- i3 configuration syntax -- ------------------------------------------------------------------------- 'mboughaba/i3config.vim', - - -- Rust support - -- ------------------------------------------------------------------------- - { - 'mrcjkb/rustaceanvim', - version = '^4', - ft = { 'rust' }, - }, }) diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index bafea4a..5abc075 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -1,9 +1,8 @@ require'nvim-treesitter.configs'.setup { -- One of "all", "maintained", or a list of languages ensure_installed = { - "zig", "bash", "scala", "yaml", "css", "javascript", "clojure", "lua", - "hcl", "json", "toml", "rust", "sql", "python", "gitcommit", - "gitignore", "html", "go" + "bash", "scala", "yaml", "css", "javascript", "lua", "hcl", "json", + "toml", "sql", "python", "gitcommit", "gitignore", "html" }, -- This will be populated after load. diff --git a/.config/starship.toml b/.config/starship.toml index 0819a93..1488c30 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -5,7 +5,7 @@ add_newline = true [character] -success_symbol = "[➜](bold #b5bd68)" +success_symbol = "[➜](bold #b5bd68) " [time] disabled = false diff --git a/.gitconfig b/.gitconfig index 66c5e69..e31e4f6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -3,6 +3,7 @@ name = Pat Garrity signingkey = AB7F3A76 [alias] + co = checkout ll = log --oneline --decorate --graph ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative diff --git a/.zshrc b/.zshrc index ced7fc6..2f348a6 100644 --- a/.zshrc +++ b/.zshrc @@ -1,13 +1,21 @@ local_install_dir="$HOME/.local/install" +# ============================================================================= +# Wayland Configuration +# ============================================================================= + +# Ensure that my shell context works with xwayland-satellite +export DISPLAY=":0" + # ============================================================================= # History configuration. # ============================================================================= export HISTFILE="$HOME/.zsh_history" -export HISTSIZE=10000 -export SAVEHIST=10000 +export HISTSIZE=25000 +export SAVEHIST=$HISTSIZE export HISTORY_IGNORE="(ls|cd|pwd|exit)*" export HIST_STAMPS="yyyy-mm-dd" + setopt EXTENDED_HISTORY # Write the history file in the ':start:elapsed;command' format. setopt INC_APPEND_HISTORY # Write to the history file immediately, not when the shell exits. setopt SHARE_HISTORY # Share history between all sessions. @@ -19,6 +27,7 @@ setopt HIST_VERIFY # Do not execute immediately upon history expansion setopt APPEND_HISTORY # append to history file (Default) setopt HIST_NO_STORE # Don't store history commands setopt HIST_REDUCE_BLANKS # Remove superfluous blanks from each command line being added to the history. +setopt INTERACTIVE_COMMENTS # Allow comments in interactive shell. export FZF_CTRL_R_OPTS=" --preview 'echo {}' --preview-window up:3:hidden:wrap @@ -95,6 +104,11 @@ if [ -d "$N_PREFIX/bin" ]; then export PATH="$N_PREFIX/bin:$PATH" fi +# ============================================================================= +# MAN PATH -- Support locally installed manpages +# ============================================================================= +export MANPATH=$MANPATH:/home/pfm/.local/share/man + # ============================================================================= # SSH Agent Management # ============================================================================= @@ -173,16 +187,6 @@ fpath=(~/.zsh $fpath) autoload -Uz compinit && compinit -# ============================================================================= -# OPAM Completion -# ============================================================================= -[[ ! -r /home/pfm/.opam/opam-init/init.zsh ]] || source /home/pfm/.opam/opam-init/init.zsh > /dev/null 2> /dev/null - -# ============================================================================= -# Haskell Setup -# ============================================================================= -[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" - # ============================================================================= # Initialize Starship # =============================================================================