Compare commits
2 Commits
18783e902b
...
237637c653
Author | SHA1 | Date |
---|---|---|
hedy | 237637c653 | |
hedy | e21f710258 |
|
@ -7,8 +7,8 @@ include font.conf
|
|||
|
||||
# TAB BAR
|
||||
# Minimalist:
|
||||
# No bg colors, no styling, no fancy unicode. Just the tab index, the title,
|
||||
# and the active tab indication.
|
||||
# No bg colors, no styling, no fancy unicode. Just the title and the active
|
||||
# tab indication.
|
||||
tab_bar_style separator
|
||||
tab_separator ""
|
||||
tab_bar_edge top
|
||||
|
@ -23,8 +23,8 @@ active_tab_title_template "{fmt.fg._f8f8f2}{fmt.bg.default}{bell_symbol}{a
|
|||
active_tab_font_style bold
|
||||
inactive_tab_font_style normal
|
||||
|
||||
# I rarely need this to navigate tabs from within kitty so I'd rather
|
||||
# make use of these mappings in the specific TUIs instead.
|
||||
# I rarely need this to navigate tabs from within kitty so I'd rather make use
|
||||
# of these mappings in the specific TUIs instead.
|
||||
map ctrl+tab no_op
|
||||
map ctrl+shift+tab no_op
|
||||
map ctrl+shift+r no_op
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
font_size 16.5
|
||||
font_family Fira Code Retina
|
||||
|
||||
# Use Symbols Only from Nerd Font releases page
|
||||
# https://github.com/ryanoasis/nerd-fonts/releases
|
||||
# Kitty recommends against patched fonts
|
||||
# (I agree since I prefer the original Fira Code Retina.)
|
||||
# Kitty picks up the symbols automatically and nvim-web-devicons should work.
|
||||
# If not, good luck
|
||||
|
||||
#
|
||||
#
|
||||
symbol_map U+ed00 Dotslash-Extras
|
||||
symbol_map U+ed01 Dotslash-Extras-Test
|
||||
# Nerd Fonts v2.3.3
|
||||
symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono
|
|
@ -0,0 +1,11 @@
|
|||
# FIXME: DOESN"T WORK
|
||||
set document.browse.links.active_link.enable_color = 0
|
||||
set document.browse.links.active_link.invert = 0
|
||||
set document.browse.links.active_link.underline = 1
|
||||
set document.browse.links.active_link.bold = 1
|
||||
set document.colors.link = "#83c1fc"
|
||||
set document.colors.image = "gray"
|
||||
# set document.browse.links.active_link.colors.background = "#83c1fc"
|
||||
# set document.browse.links.active_link.colors.background = "#444444"
|
||||
# set document.browse.links.active_link.colors.text = "white"
|
||||
set protocol.http.prefers_color_scheme = "dark"
|
|
@ -0,0 +1,11 @@
|
|||
import dracula.draw
|
||||
|
||||
# Load existing settings made via :set
|
||||
config.load_autoconfig()
|
||||
|
||||
dracula.draw.blood(c, {
|
||||
'spacing': {
|
||||
'vertical': 6,
|
||||
'horizontal': 8
|
||||
}
|
||||
})
|
91
README.md
91
README.md
|
@ -1,13 +1,13 @@
|
|||
# dotfiles
|
||||
|
||||
[Source (SourceHut)](https://git.sr.ht/~hedy/dotfiles) |
|
||||
[Patches](https://lists.sr.ht/~hedy/inbox) |
|
||||
[Questions/Feedback](https://lists.sr.ht/~hedy/inbox) |
|
||||
Chat ([Libera](https://web.libera.chat/#hedy)/[Tilde](https://tilde.chat/kiwi/##hedy))
|
||||
|
||||
Welcome to my personal collection of weirdish—sometimes
|
||||
unmaintained—configuration and lose organization of cool scripts!
|
||||
|
||||
- [Source (SourceHut)](https://git.sr.ht/~hedy/dotfiles)
|
||||
- [Patches](https://lists.sr.ht/~hedy/inbox)
|
||||
- [Questions/Feedback](https://lists.sr.ht/~hedy/inbox)
|
||||
- Chat ([Libera](https://web.libera.chat/#hedy) / [Tilde](https://tilde.chat/kiwi/##hedy))
|
||||
|
||||
These are the setup I have on almost all machines I work in, and because I work
|
||||
on many [tildes](https://tildeverse.org), I make this set of configuration as
|
||||
cross-platform as possible.
|
||||
|
@ -32,7 +32,7 @@ that handles clipboard operations with windows.
|
|||
## CHANGELOG
|
||||
|
||||
- 2023-10: Heavily refactored my neovim config (I've also changed my neovim
|
||||
theme from dracula to tundra)
|
||||
theme from dracula to tundra)
|
||||
- 2023-09: I've switched from neovim to Doom, and to my own Emacs!
|
||||
- 2023-06: (nvim) Switched from vim to full-lua set up
|
||||
|
||||
|
@ -45,54 +45,70 @@ Mirrors: [tildegit (gitea)](https://tildegit.org/hedy/dotfiles) |
|
|||
|
||||
**Table of Contents**
|
||||
|
||||
<!-- vim-markdown-toc GFM -->
|
||||
<!-- mtoc-start -->
|
||||
|
||||
* [Overview](#overview)
|
||||
* [Features](#features)
|
||||
* [Installation](#installation)
|
||||
* [Shell](#shell)
|
||||
* [Oh My Fish](#oh-my-fish)
|
||||
* [Fish functions](#fish-functions)
|
||||
* [Local](#local)
|
||||
* [Oh My Fish](#oh-my-fish)
|
||||
* [Fish functions](#fish-functions)
|
||||
* [Local](#local)
|
||||
* [Editor](#editor)
|
||||
* [Vim and nvim](#vim-and-nvim)
|
||||
* [New neovim setup (lua)](#new-neovim-setup-lua)
|
||||
* [TODO for neovim](#todo-for-neovim)
|
||||
* [Vanilla Emacs](#vanilla-emacs)
|
||||
* [Doom emacs](#doom-emacs)
|
||||
* [Vim and nvim](#vim-and-nvim)
|
||||
* [New neovim setup (lua)](#new-neovim-setup-lua)
|
||||
* [TODO for neovim](#todo-for-neovim)
|
||||
* [Vanilla Emacs](#vanilla-emacs)
|
||||
* [Doom emacs](#doom-emacs)
|
||||
* [Terminal](#terminal)
|
||||
* [Gemini and Spartan client](#gemini-and-spartan-client)
|
||||
* [TODO](#todo)
|
||||
|
||||
<!-- vim-markdown-toc -->
|
||||
<!-- mtoc-end -->
|
||||
|
||||
Configs in order of frequency of update / stability:
|
||||
1. Neovim
|
||||
1. Emacs
|
||||
1. Kitty
|
||||
1. Shell (fish)
|
||||
|
||||
Configs that are not well maintained
|
||||
1. irbrc
|
||||
1. vimrc
|
||||
|
||||
Configs that involve open source tools/packages I maintain:
|
||||
1. gelim (itself)
|
||||
1. Neovim (plugins)
|
||||
|
||||
## Overview
|
||||
|
||||
- Manager: [yadm](https://yadm.io) ([`.config/yadm`](.config/yadm))
|
||||
- Shell: [fish](https://fishshell.com) ([`.config/fish`](.config/fish))
|
||||
- Theme: Dracula ((neo)vim and terminal)
|
||||
- Shell & tools:
|
||||
- [fish](https://fishshell.com) ([`.config/fish`](.config/fish))
|
||||
- Git ([`.gitconfig`](.gitconfig), [`.gitignore_global`](.gitignore_global))
|
||||
- Tmux ([`.tmux.conf`](.tmux.conf))
|
||||
- Theme: Dracula (terminal), Tundra (neovim), spacegrey/ef-themes (emacs)
|
||||
- Email: [aerc](https://aerc-mail.org) ([`.config/aerc`](.config/aerc))
|
||||
- Browser:
|
||||
- Qutebrowser
|
||||
- Firefox (has nothing to do with this repo though)
|
||||
- Terminal: [Kitty]() ([`.config/kitty`](.config/kitty))
|
||||
- Terminal: [Kitty](https://sw.kovidgoyal.net/kitty/) ([`.config/kitty`](.config/kitty))
|
||||
- Editor:
|
||||
- Vim ([`.vimrc`](.vimrc))
|
||||
- Neovim ([`.config/nvim`](.config/nvim))
|
||||
- Emacs ([`.config/emacs`](.config/emacs)) (with chemacs: [.emacs-profiles.el](.emacs-profiles.el))
|
||||
- Doom ([`.config/doom`](.config/doom))
|
||||
- Vim ([`.vimrc`](.vimrc))
|
||||
- Neovim ([`.config/nvim`](.config/nvim))
|
||||
- Emacs ([`.config/emacs`](.config/emacs)) (with chemacs: [.emacs-profiles.el](.emacs-profiles.el))
|
||||
- Doom ([`.config/doom`](.config/doom))
|
||||
- Web client (browser):
|
||||
- [Elinks fork](https://github.com/rkd77/elinks) ([`.elinks/elinks.conf`](.elinks/elinks.conf))
|
||||
- [Qutebrowser](https://qutebrowser.org) ([`.qutebrowser/config.py`](.qutebrowser/config.py))
|
||||
- And others irrelevant to dotfiles
|
||||
- Gemini client:
|
||||
- [amfora](https://github.com/makeworld-the-better-one/amfora) ([`.config/amfora`](.config/amfora))
|
||||
- [gelim (also spartan)](https://sr.ht/~hedy/gelim) ([`.config/gelim`](.config/gelim))
|
||||
- [gelim (also spartan)](https://sr.ht/~hedy/gelim) ([`.config/gelim`](.config/gelim))
|
||||
- [amfora](https://github.com/makeworld-the-better-one/amfora) ([`.config/amfora`](.config/amfora))
|
||||
|
||||
## Features
|
||||
|
||||
These are more like "what I tend to do":
|
||||
|
||||
- Mostly bash shebangs
|
||||
- Shared aliases and environment variables between shells (fish, bash, sh)
|
||||
- Setup and install scripts
|
||||
- Modular and documented
|
||||
|
||||
## Installation
|
||||
|
||||
|
@ -222,6 +238,8 @@ Other local files recognized:
|
|||
|
||||
### Vim and nvim
|
||||
|
||||
**README**: `.config/nvim/README.norg`
|
||||
|
||||
Minimum supported version: NVIM 0.5.0
|
||||
|
||||
Recommended version: NVIM 0.9.0+
|
||||
|
@ -267,7 +285,7 @@ Since 2023-06-30, I've switched to `init.lua` 🎉
|
|||
- Completion: nvim-cmp
|
||||
- File explorer: nvim-tree and mini.files
|
||||
- Icons: nvim-web-devicons
|
||||
- Status line: lualine
|
||||
- Status line: Disabled (using rulerfmt + incline.nvim)
|
||||
|
||||
Ever since then, my startup time has improved significantly and this switch came
|
||||
with many other advantages including opening up a world of many modern, speedy
|
||||
|
@ -295,11 +313,17 @@ parsers.
|
|||
|
||||
Telescope plugin is enabled conditionally if neovim version >= 0.9.
|
||||
|
||||
While I love what telescope is doing for the neovim community, I personally
|
||||
think it is no where near as good as consult.el from emacs, however there are
|
||||
no better alternatives to telescope at the moment.
|
||||
|
||||
**Setup**:
|
||||
- `dotscripts/setup/nvim` (no longer needed as I no longer use vim-plug)
|
||||
- `dotscripts/install/misc` - Includes Vundle setup together with other
|
||||
software.
|
||||
|
||||
**Additional information**: `.config/nvim/README.norg` including brief notes about neovim vs emacs.
|
||||
|
||||
#### TODO for neovim
|
||||
|
||||
(I might never complete these since I recently switched to emacs)
|
||||
|
@ -312,7 +336,7 @@ software.
|
|||
- [x] Make use of Lazy loading
|
||||
- [x] Fix ftplugin + lazy ft handle
|
||||
- [x] Use Tree sitter
|
||||
- [ ] Ensure conditionally loaded plugins (from nvim version) work as expected
|
||||
- [x] Ensure conditionally loaded plugins (from nvim version) work as expected
|
||||
|
||||
|
||||
### Vanilla Emacs
|
||||
|
@ -365,9 +389,8 @@ configuration in there yet.
|
|||
## TODO
|
||||
|
||||
- [x] add LSP and completion to emacs
|
||||
- [x] (n)vim mapping for gg=<backtick><backtick> (not needed anymore since we had `g@` mapping for LSP format)
|
||||
- [x] `.addpath` file
|
||||
- [x] Wait for nvim 0.5 to because more widely adopted in system packages, then
|
||||
do the things in [nvim TODO](#todo-for-neovim)
|
||||
use full lua config + lsp
|
||||
- [ ] Flesh out emacs config to support *most* of my needs for programming and writing
|
||||
- [ ] (planning) Drop Doom support
|
||||
|
|
|
@ -71,4 +71,12 @@ if ! command -v tig &> /dev/null; then
|
|||
cd $prevpwd
|
||||
fi
|
||||
# TODO: Also upgrade tig
|
||||
|
||||
cat <<END
|
||||
|
||||
Kitty (optional)
|
||||
- Set up fonts.conf, see mac-fonts.conf for an example
|
||||
|
||||
END
|
||||
|
||||
echo "done!"
|
||||
|
|
|
@ -5,9 +5,13 @@ if command -v yadm &> /dev/null; then
|
|||
echo "Attempted to upgrade yadm, but it was not installed (as a git clone) at ~/local/src/yadm/."
|
||||
exit
|
||||
fi
|
||||
echo "> yadm --version"
|
||||
yadm --version
|
||||
echo
|
||||
cd ~/local/src/yadm
|
||||
git pull
|
||||
cd - > /dev/null
|
||||
echo
|
||||
echo "Upgraded yadm!"
|
||||
echo "> yadm --version"
|
||||
yadm --version
|
||||
|
|
|
@ -30,7 +30,6 @@ fi
|
|||
if [ ! -d ~/.local/share/omf ]; then
|
||||
echo "Installing oh my fish"
|
||||
curl -L https://get.oh-my.fish | fish
|
||||
# TODO: check for omf packages too
|
||||
echo "Installing oh my fish packages"
|
||||
omf install
|
||||
echo done
|
||||
|
|
|
@ -5,7 +5,24 @@ if ! command -v nvim &> /dev/null; then
|
|||
exit
|
||||
fi
|
||||
|
||||
echo "I no longer use vim-plug. Lazy.nvim is bootstrapped at startup!"
|
||||
cat <<END
|
||||
I no longer use vim-plug. Lazy.nvim is bootstrapped at startup!
|
||||
|
||||
Reminders:
|
||||
|
||||
Treesitter:
|
||||
- If there are errors for build, might wanna check C/C++ toolchain version
|
||||
|
||||
LSP
|
||||
- Might need nvm
|
||||
- Install clients listed in plugins/lsp.lua
|
||||
|
||||
Lint (optional)
|
||||
- See plugins/lint.lua
|
||||
|
||||
DAP (optional)
|
||||
- Set up virtualenv named debugpy that installs debugpy, see plugins/dap.lua
|
||||
END
|
||||
|
||||
# DEST=${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim"
|
||||
|
||||
|
|
Loading…
Reference in New Issue