commit 4ff714bb07d8477adfc6f0e845eab05eec83bf83
parent 599178d617ed740243d9ff95c6aade1f1d3c1b34
Author: Jack Sangdahl <jack@pngu.org>
Date: Fri, 12 Sep 2025 14:02:43 -0600
Migrate to wezterm, remove alacritty, some zsh updates
Diffstat:
9 files changed, 61 insertions(+), 96 deletions(-)
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
@@ -1,24 +0,0 @@
-[general]
-import = [
- "colours.toml",
- "fonts.toml"
-]
-
-[terminal.shell]
-program = "/usr/bin/zsh"
-
-[selection]
-save_to_clipboard = true
-
-[window]
-decorations = "none"
-dynamic_padding = true
-
-[window.padding]
-x = 8
-y = 8
-
-[keyboard]
-bindings = [
- { key = "T", mods = "Control", action = "CreateNewWindow" },
-]
diff --git a/.config/alacritty/colours.toml b/.config/alacritty/colours.toml
@@ -1,50 +0,0 @@
-[colors.normal]
-black = "#3b4252"
-blue = "#81a1c1"
-cyan = "#88c0d0"
-green = "#a3be8c"
-magenta = "#b48ead"
-red = "#bf616a"
-white = "#e5e9f0"
-yellow = "#ebcb8b"
-
-[colors.bright]
-black = "#4c566a"
-blue = "#81a1c1"
-cyan = "#8fbcbb"
-green = "#a3be8c"
-magenta = "#b48ead"
-red = "#bf616a"
-white = "#eceff4"
-yellow = "#ebcb8b"
-
-[colors.dim]
-black = "#373e4d"
-blue = "#68809a"
-cyan = "#6d96a5"
-green = "#809575"
-magenta = "#8c738c"
-red = "#94545d"
-white = "#aeb3bb"
-yellow = "#b29e75"
-
-[colors.cursor]
-cursor = "#d8dee9"
-text = "#2e3440"
-
-[colors.primary]
-background = "#2a303c"
-dim_foreground = "#a5abb6"
-foreground = "#d8dee9"
-
-[colors.search.matches]
-background = "#88c0d0"
-foreground = "CellBackground"
-
-[colors.selection]
-background = "#4c566a"
-text = "CellForeground"
-
-[colors.vi_mode_cursor]
-cursor = "#d8dee9"
-text = "#2e3440"
diff --git a/.config/alacritty/fonts.toml b/.config/alacritty/fonts.toml
@@ -1,7 +0,0 @@
-[font]
-size = 11
-
-normal = { family = "JetBrainsMono NF", style = "SemiBold" }
-bold = { family = "JetBrainsMono NF", style = "Bold" }
-italic = { family = "JetBrainsMono NF", style = "Italic" }
-bold_italic = { family = "JetBrainsMono NF", style = "Bold Italic" }
diff --git a/.config/nvim/lua/autocmds.lua b/.config/nvim/lua/autocmds.lua
@@ -1 +1,27 @@
-require "nvchad.autocmds"
+require("nvchad.autocmds")
+
+local autocmd = vim.api.nvim_create_autocmd
+
+autocmd("BufReadPost", {
+ pattern = "*",
+ callback = function()
+ local line = vim.fn.line("'\"")
+ if
+ line > 1
+ and line <= vim.fn.line("$")
+ and vim.bo.filetype ~= "commit"
+ and vim.fn.index({ "xxd", "gitrebase" }, vim.bo.filetype) == -1
+ then
+ vim.cmd('normal! g`"')
+ end
+ end,
+})
+
+autocmd("BufDelete", {
+ callback = function()
+ local bufs = vim.t.bufs
+ if #bufs == 1 and vim.api.nvim_buf_get_name(bufs[1]) == "" then
+ vim.cmd("Nvdash")
+ end
+ end,
+})
diff --git a/.config/nvim/lua/configs/lspconfig.lua b/.config/nvim/lua/configs/lspconfig.lua
@@ -1,13 +1,11 @@
require("nvchad.configs.lspconfig").defaults()
-local lspconfig = require("lspconfig")
-local servers = { "html", "cssls", "clangd", "pylsp", "lua_ls" }
-local nvlsp = require("nvchad.configs.lspconfig")
+local servers = {
+ "html",
+ "cssls",
+ "clangd",
+ "pylsp",
+ "lua_ls",
+}
-for _, lsp in ipairs(servers) do
- lspconfig[lsp].setup({
- on_attach = nvlsp.on_attach,
- on_init = nvlsp.on_init,
- capabilities = nvlsp.capabilities,
- })
-end
+vim.lsp.enable(servers)
diff --git a/.config/sway/config b/.config/sway/config
@@ -38,7 +38,7 @@ exec_always {
# applications
bindsym $mod+q kill
-bindsym $mod+t exec alacritty
+bindsym $mod+t exec wezterm
bindsym $mod+f exec firefox
bindsym $mod+r exec fuzzel
bindsym $mod+p exec grim -g "$(slurp)" - | wl-copy
diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua
@@ -0,0 +1,14 @@
+local wezterm = require("wezterm")
+local config = wezterm.config_builder()
+
+config.color_scheme = "nord"
+config.font = wezterm.font("JetBrains Mono")
+config.enable_tab_bar = false
+config.hide_mouse_cursor_when_typing = false
+config.font_size = 10
+
+config.colors = {
+ background = "#2a303c",
+}
+
+return config
diff --git a/.pkglist.txt b/.pkglist.txt
@@ -1,4 +1,3 @@
-alacritty # Terminal
artix-archlinux-support # Required for installing any Arch packages
base # Provides all base utilities. Pretty much all needed
bat # /bin/cat alternative
@@ -67,6 +66,7 @@ unzip # Unpack zip archives
uv # Python manager
waybar # Window manager bar
weechat # Messaging platform
+wezterm # Terminal
wl-clipboard # Wayland clipboard manager
xdg-utils # Desktop integrations
xorg-xwayland # Compatibility layer for X programs (Discord, Flatpak packages)
diff --git a/.zshrc b/.zshrc
@@ -17,10 +17,19 @@ export SAVEHIST=20000
export LANG=en_GB.UTF-8
export GPG_TTY=$(tty)
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#4C566A"
-export BAT_THEME="Nord"
export LESSHISTFILE="$HOME/.local/share/less-history"
export PYTHON_HISTORY="$HOME/.local/share/python-history"
+if [ -n "$SSH_CLIENT"] || [ -n "$SSH_TTY" ]; then
+ export BAT_THEME="Nord"
+ alias vi="nvim"
+
+else
+ export BAT_THEME="base16"
+ alias vi="nvim --clean"
+fi
+
+
path+=(
"$HOME/.local/bin"
"$HOME/.local/qmk_toolchains_linuxX64/bin"
@@ -45,7 +54,6 @@ alias l="lsd -la"
alias ls="lsd"
alias tree="lsd --tree"
alias cat="bat --paging=never"
-alias vi="nvim"
alias cd="z"
alias sudo="doas"
alias cloc="tokei"
