Compare commits
7 Commits
master
..
7895820b33
| Author | SHA1 | Date | |
|---|---|---|---|
| 7895820b33 | |||
| 76607142b0 | |||
| 4fddcc97cc | |||
| 5c0d3f044e | |||
| cff9341d52 | |||
| 8f30c2f5cc | |||
| d0ba33425c |
@@ -0,0 +1 @@
|
|||||||
|
print("print from init.lua file")
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
# set -g default-terminal "tmux-255color" # TODO: messes up backspace render, fix
|
||||||
|
set -s escape-time 0
|
||||||
|
|
||||||
|
unbind C-b
|
||||||
|
set-option -g prefix C-a
|
||||||
|
bind-key C-a send-prefix
|
||||||
|
set -g status-style 'bg=#111111 fg=#22cc00'
|
||||||
|
set -g base-index 1
|
||||||
|
|
||||||
|
# vim-like movement stuff
|
||||||
|
set-window-option -g mode-keys vi
|
||||||
|
bind -T copy-mode-vi v send-keys -X begin-selection
|
||||||
|
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
|
||||||
|
bind -r ^ last-window
|
||||||
|
bind -r k select-pane -U
|
||||||
|
bind -r j select-pane -D
|
||||||
|
bind -r h select-pane -L
|
||||||
|
bind -r l select-pane -R
|
||||||
|
|
||||||
|
bind r source-file "~/.config/tmux/tmux.conf" \; display-message "tmux.conf reloaded"
|
||||||
|
|
||||||
|
# bind -r D neww -c "#{pane_current_path}" "[[ -e TODO.md ]] && nvim TODO.md || nvim ~/personal/dev/todo.md"
|
||||||
|
|
||||||
|
# bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer"
|
||||||
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# set env vars, path updates, etc
|
||||||
|
[[ -a $HOME/.rs-vars ]] \
|
||||||
|
&& source $HOME/.rs-vars \
|
||||||
|
&& export PATH=$PATH:$HOME/.rd/bin \
|
||||||
|
&& . /usr/local/opt/asdf/libexec/asdf.sh
|
||||||
|
|
||||||
|
# login shortcuts
|
||||||
|
alias assume="source assume"
|
||||||
|
alias login-bunk='aws sso login --profile'
|
||||||
|
alias login-bunk-id-list="grep sso_account_id $HOME/.aws/config"
|
||||||
|
alias login-pulumi-bunk='pulumi login '$PULUMI_LOGIN_TARGET'$(aws sts get-caller-identity --query Account --output text)'
|
||||||
|
|
||||||
|
# git stuff
|
||||||
|
alias git-push-to-develop='git branch -D develop; git checkout -b develop; git push origin develop -uf; git checkout -'
|
||||||
|
alias gpdev='git-push-to-develop'
|
||||||
|
|
||||||
|
# misc shortcuts
|
||||||
|
alias journal="cd $HOMEBOX; $EDITOR .current-journal"
|
||||||
|
alias kra="cd $HOMEBOX/process/kra; open .current_kra"
|
||||||
|
alias gll="cd $DEVDIR/git/lampo/gitlab"
|
||||||
|
alias bet='bundle exec rspec'
|
||||||
|
alias bel='bundle exec standardrb'
|
||||||
|
alias belr='bundle exec rubocop'
|
||||||
|
alias prt='poetry run pytest'
|
||||||
|
alias prl='poetry run black'
|
||||||
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# life system shortcuts
|
||||||
|
alias life-system='cd ~/dbox/life/system; clear; ls'
|
||||||
|
alias goals='clear; sed -n 2,7p ~/dbox/life/system/direction/goals/current-goals.txt'
|
||||||
|
alias note='cd ~/dbox/life/system/tasks/inbox; vim'
|
||||||
|
alias todo='cd ~/dbox/life/system/tasks; vim +5 todo.txt'
|
||||||
|
alias budget="open ~/dbox/life/finance/budget/.current"
|
||||||
|
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
# use vim-like control in shell
|
||||||
|
set -o vi
|
||||||
|
|
||||||
|
# env vars
|
||||||
|
export EDITOR='nvim'
|
||||||
|
export HOMEBOX=$HOME'/dbox'
|
||||||
|
export DEVDIR=$HOME'/dev'
|
||||||
|
|
||||||
|
# path updates
|
||||||
|
export PATH=$HOME/.local/bin:$HOME/.local/scripts:$PATH
|
||||||
|
export PATH=$PATH:/opt/homebrew/opt/ccache/libexec
|
||||||
|
|
||||||
|
# executable name overrides
|
||||||
|
alias vim='nvim'
|
||||||
|
|
||||||
|
# shortcuts for common commands
|
||||||
|
alias 3e='echo;echo;echo'
|
||||||
|
alias 12e='3e;3e;3e;3e'
|
||||||
|
alias ls='ls -F'
|
||||||
|
alias cl='clear; '
|
||||||
|
alias cls='clear;ls'
|
||||||
|
|
||||||
|
# git stuff
|
||||||
|
alias gfo='git fetch origin'
|
||||||
|
alias gpo='git pull origin'
|
||||||
|
alias gfpo='git fetch origin; git pull origin'
|
||||||
|
|
||||||
|
# executable renames/paths
|
||||||
|
alias youtube-dl='youtube-dl --write-info-json'
|
||||||
|
|
||||||
|
# misc commands
|
||||||
|
alias pdt='ping -c 4 drinkingtea.net'
|
||||||
|
alias weather='curl wttr.in'
|
||||||
|
alias shrug='echo "¯\\_(ツ)_/¯"'
|
||||||
|
|
||||||
|
[[ -e $HOME/.profile ]] && source $HOME/.profile
|
||||||
|
|
||||||
|
# add machine-specific configs as appropriate
|
||||||
|
[[ -a $HOME/.config/zsh/.zshrc-life-system ]] \
|
||||||
|
&& source $HOME/.config/zsh/.zshrc-life-system
|
||||||
|
|
||||||
|
# TODO: refactor the below so that general dev is separate from rs specific stuff
|
||||||
|
[[ -a $HOME/.config/zsh/.zshrc-job-rs ]] \
|
||||||
|
&& source $HOME/.config/zsh/.zshrc-job-rs
|
||||||
|
alias lintjs='npx prettier --write'
|
||||||
|
export DEVKITARM=/opt/devkitpro/devkitARM
|
||||||
|
. /opt/homebrew/opt/asdf/libexec/asdf.sh # TODO: ensure not duplicated asdf logic
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
# dotfiles, plus installation and related scripts
|
|
||||||
|
|
||||||
This repo contains a collection of scripts and files related to:
|
|
||||||
|
|
||||||
- configuration (i.e. this serves as my dotfiles repo)
|
|
||||||
- installation of programs
|
|
||||||
- scripts/executables for my local systems
|
|
||||||
- anything else related to getting my boxes (computers) set up as desired
|
|
||||||
|
|
||||||
This repo grew into more than I originally intended, and turned into a fun excursion into
|
|
||||||
the realm of shell scripting.
|
|
||||||
|
|
||||||
## prereqs
|
|
||||||
|
|
||||||
- programs installed: git, sed, zsh
|
|
||||||
- git clone this repo
|
|
||||||
|
|
||||||
### specific prereqs, linux distros
|
|
||||||
|
|
||||||
- sudo access is configured for current user
|
|
||||||
|
|
||||||
### specific prereqs, macos
|
|
||||||
|
|
||||||
- install the package manager, [homebrew](https://brew.sh/)
|
|
||||||
- for aerospace window manager, have only 1 workspace/desktop
|
|
||||||
- manual settings, refer to [docs/macos-system-settings](docs/macos-system-settings.md)
|
|
||||||
|
|
||||||
## script run
|
|
||||||
|
|
||||||
- to do the full setup, from the repo's root dir, run: `./box_setup.sh`
|
|
||||||
- to copy dotfiles only, from the repo's root dir, run: `./copy_dotfiles.sh`
|
|
||||||
|
|
||||||
## after script run
|
|
||||||
|
|
||||||
- complete manual actions specified in [docs/post-run](docs/post-run.md)
|
|
||||||
|
|
||||||
## todo items
|
|
||||||
|
|
||||||
see [docs/todo.md](docs/todo.md)
|
|
||||||
|
|
||||||
## attribution
|
|
||||||
|
|
||||||
see [docs/attribution.md](docs/attribution.md)
|
|
||||||
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
[[ $1 = "--help" ]] && {
|
|
||||||
echo "\nusage: ./box_setup.sh [system-type]"
|
|
||||||
echo "\nsystem-type options: music_studio, programming"
|
|
||||||
echo "\nexamples:\n ./box_setup.sh\n ./box_setup.sh music_studio\n"
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "---- settings vars for system type -----"
|
|
||||||
|
|
||||||
# determine OS and distro
|
|
||||||
case "$OSTYPE" in
|
|
||||||
(*linux*)
|
|
||||||
setup_os="linux"
|
|
||||||
[[ -f /etc/os-release ]] && . /etc/os-release
|
|
||||||
setup_distro=$(echo "${NAME%% *}" | tr '[:upper:]' '[:lower:]')
|
|
||||||
;;
|
|
||||||
(*darwin*)
|
|
||||||
setup_os="macos"
|
|
||||||
setup_distro="macos" # just repeat macos, but maybe there is some better value
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# ensure OS and distro are set before proceeding
|
|
||||||
[[ -z "$setup_os" ]] && echo "setup OS not detected" && exit 1
|
|
||||||
[[ -z "$setup_distro" ]] && echo "setup distro not detected" && exit 1
|
|
||||||
|
|
||||||
# set package manager commands for installs
|
|
||||||
case "$setup_os" in
|
|
||||||
(linux)
|
|
||||||
case $setup_distro in
|
|
||||||
(arch | artix)
|
|
||||||
install_cmd="sudo pacman -S --noconfirm"
|
|
||||||
update_pkg_manager_and_defs_cmd='' # don't; update system instead
|
|
||||||
update_pkgs_cmd='sudo pacman -Syu'
|
|
||||||
;;
|
|
||||||
(debian)
|
|
||||||
install_cmd="sudo apt install"
|
|
||||||
update_pkg_manager_and_defs_cmd='sudo apt update'
|
|
||||||
update_pkgs_cmd='sudo apt upgrade'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
(macos)
|
|
||||||
install_cmd="brew install"
|
|
||||||
update_pkg_manager_and_defs_cmd='brew update'
|
|
||||||
update_pkgs_cmd='brew upgrade'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# export vars for scripts
|
|
||||||
export BOX_SETUP_OS="$setup_os"
|
|
||||||
export BOX_SETUP_DISTRO="$setup_distro"
|
|
||||||
export BOX_SETUP_INSTALL_COMMAND="$install_cmd"
|
|
||||||
export BOX_SETUP_UPDATE_PKG_MANAGER_AND_DEFS_CMD="$update_pkg_manager_and_defs_cmd"
|
|
||||||
export BOX_SETUP_UPDATE_PKGS_CMD="$update_pkgs_cmd"
|
|
||||||
|
|
||||||
# make dirs and copy configs/dotfiles
|
|
||||||
. ./src_files/shell/profile
|
|
||||||
./make_dirs.sh
|
|
||||||
./copy_dotfiles.sh "--skip-theme-config"
|
|
||||||
|
|
||||||
# install programs
|
|
||||||
. $ZDOTDIR/.zshrc
|
|
||||||
./install_programs.sh $1
|
|
||||||
|
|
||||||
# configure themes
|
|
||||||
./theme_config.sh
|
|
||||||
Executable
+43
@@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
|
||||||
|
dry="0"
|
||||||
|
|
||||||
|
execute() {
|
||||||
|
log "execute $@"
|
||||||
|
[[ $dry != "1" ]] && "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
log() {
|
||||||
|
[[ $dry != "1" ]] && echo "$@" || echo "[DRY RUN]: $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
while [[ $# > 0 ]]; do
|
||||||
|
[[ $1 == "--dry" ]] && dry="1"
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
log "---------------- dotfiles ----------------"
|
||||||
|
|
||||||
|
copy_dir() {
|
||||||
|
from=$1
|
||||||
|
to=$2
|
||||||
|
pushd $from > /dev/null
|
||||||
|
dirs=(`find . -mindepth 1 -maxdepth 1 -type d`)
|
||||||
|
for dir in $dirs; do
|
||||||
|
[[ -d $to/$dir ]] && execute rm -rf $to/$dir
|
||||||
|
execute cp -rp $dir $to/$dir
|
||||||
|
done
|
||||||
|
popd > /dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_file() {
|
||||||
|
from=$1
|
||||||
|
to=$2
|
||||||
|
filename=$(basename $from)
|
||||||
|
[[ -e $to/$filename ]] && execute rm $to/$filename
|
||||||
|
execute cp -p $from $to/$filename
|
||||||
|
}
|
||||||
|
|
||||||
|
copy_dir .config $HOME/.config
|
||||||
|
copy_dir .local $HOME/.local
|
||||||
|
copy_file .zshrc $HOME
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo_and_execute() {
|
|
||||||
echo "executing: $@" && "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
copy_file() {
|
|
||||||
from=$1
|
|
||||||
to=$2
|
|
||||||
filename=$(basename "$from")
|
|
||||||
[ "$3" = "--sudo" ] &&
|
|
||||||
echo_and_execute sudo cp -RPp "$from" "$to/$filename" ||
|
|
||||||
{
|
|
||||||
[ -e "$to/$filename" ] && rm "$to/$filename"
|
|
||||||
echo_and_execute cp -RPp "$from" "$to/$filename"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
copy_dir() {
|
|
||||||
from=$1
|
|
||||||
to=$2
|
|
||||||
prev_dir=$(pwd)
|
|
||||||
cd "$from" || return 1
|
|
||||||
find . -mindepth 1 -maxdepth 1 -type d | while read -r dir; do
|
|
||||||
[ -d "$to/$dir" ] && rm -rf "$to/$dir"
|
|
||||||
echo_and_execute cp -RPp "$dir" "$to/$dir"
|
|
||||||
done
|
|
||||||
find . -mindepth 1 -maxdepth 1 -type f | while read -r file; do
|
|
||||||
copy_file "$file" "$to"
|
|
||||||
done
|
|
||||||
cd "$prev_dir" || return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
sym_link() {
|
|
||||||
! [ -e "$1" ] && echo "skipping link, target does not exist: $1" && return
|
|
||||||
[ -h "$2" ] && rm "$2"
|
|
||||||
test -f "$2" -o -d "$2" && rm -rf "$2"
|
|
||||||
echo_and_execute ln -s "$1" "$2"
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "---- copying dotfiles ------------------"
|
|
||||||
. ./src_files/shell/profile
|
|
||||||
|
|
||||||
# copy over env/profile files used by shell(s)
|
|
||||||
copy_file src_files/shell/.profile $HOME
|
|
||||||
copy_file src_files/shell/profile $XDG_CONFIG_HOME
|
|
||||||
copy_file src_files/shell/rc $XDG_CONFIG_HOME
|
|
||||||
copy_file src_files/.config/zsh/.zshenv $HOME
|
|
||||||
# TODO: move this into xdg type dir if possible
|
|
||||||
copy_file src_files/.config/X11/xinit/.xinitrc $HOME
|
|
||||||
|
|
||||||
# copy over configs, executables, and scripts
|
|
||||||
copy_dir src_files/.config $XDG_CONFIG_HOME
|
|
||||||
copy_dir src_files/.local/bin $DIR_BIN
|
|
||||||
copy_dir src_files/.local/scripts $DIR_SCRIPTS
|
|
||||||
|
|
||||||
# macOS overrides as needed
|
|
||||||
case "$OSTYPE" in *darwin*) copy_dir src_files/bin_overrides_macos $DIR_BIN;; esac
|
|
||||||
|
|
||||||
# obsidian uses a per-vault config model, so copy to all target vaults/dirs
|
|
||||||
IFS=","; for obs_dir in $OBSIDIAN_WORKSPACES_TO_CONFIGURE; do
|
|
||||||
! [ -d "$obs_dir/.obsidian" ] && mkdir "$obs_dir/.obsidian"
|
|
||||||
copy_dir "$XDG_CONFIG_HOME/obsidian" "$obs_dir/.obsidian"
|
|
||||||
done
|
|
||||||
|
|
||||||
# TODO: get reaper config set up
|
|
||||||
# case "$OSTYPE" in
|
|
||||||
# (*darwin*)
|
|
||||||
# sym_link "$XDG_CONFIG_HOME/REAPER" "$HOME/Library/Application Support/REAPER"
|
|
||||||
# ;;
|
|
||||||
# esac
|
|
||||||
|
|
||||||
# copy settings/configs to /etc locations
|
|
||||||
case "$OSTYPE" in
|
|
||||||
(*darwin*)
|
|
||||||
;;
|
|
||||||
(*)
|
|
||||||
copy_file src_files/etc/47-elogind.conf /etc/elogind/logind.conf.d --sudo
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# set up themes and theme-switcher
|
|
||||||
! [ "$1" = "--skip-theme-config" ] && ./theme_config.sh
|
|
||||||
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
# Attribution
|
|
||||||
|
|
||||||
## Original pattern/approach and some core config logic
|
|
||||||
|
|
||||||
The original idea and approach for this project, including the original versions of my
|
|
||||||
program-installation script, the copy-configs-and-files script, the "tmux sessionizer"
|
|
||||||
(tmux session init logic), my initial neovim and tmux configs, and (though not code)
|
|
||||||
my general workflow/workspace strategy, were derived from several of ThePrimeagen's
|
|
||||||
(aka Michael Paulson's) projects and videos, including a FrontEnd Masters course which
|
|
||||||
he taught (each are listed below). I could not locate any required licenses or copyrights
|
|
||||||
for the code contained within these sources, but I wanted to give attribution nonetheless.
|
|
||||||
|
|
||||||
- [dev/setup/config repo](https://github.com/ThePrimeagen/dev)
|
|
||||||
- [neovim config](https://github.com/ThePrimeagen/init.lua)
|
|
||||||
- [tmux sessionizer](https://github.com/ThePrimeagen/tmux-sessionizer)
|
|
||||||
- [YouTube video - neovim config video](https://www.youtube.com/watch?v=w7i4amO_zaE)
|
|
||||||
- [FrontEnd Masters course - dev productivity v2](https://frontendmasters.com/courses/developer-productivity-v2/)
|
|
||||||
|
|
||||||
## Theme-swtiching/setting logic and some themes
|
|
||||||
|
|
||||||
Much of the "theme-switching" or "theme-setting" logic and scripts are derived from
|
|
||||||
[Omarchy](https://github.com/basecamp/omarchy), and some theme configuration files
|
|
||||||
in this repository under
|
|
||||||
[src_files/imports/themes-omarchy-core](../src_files/imports/themes-omarchy-core)
|
|
||||||
are copied from [Omarchy](https://github.com/basecamp/omarchy), which is licensed
|
|
||||||
under the [MIT License](https://github.com/basecamp/omarchy/blob/master/LICENSE).
|
|
||||||
|
|
||||||
Copyright (c) David Heinemeier Hansson
|
|
||||||
|
|
||||||
## Additional/extra themes (Omarchy extra themes)
|
|
||||||
|
|
||||||
Additional theme configuration files in this repository under
|
|
||||||
[src_files/imports/themes-omarchy-extra](../src_files/imports/themes-omarchy-extra)
|
|
||||||
are copied or derived from projects of additional conrtibutors to the Omarchy community.
|
|
||||||
For information about authors/licenses/copyrights for each, refer to any LICENSE and/or
|
|
||||||
ATTRIBUTION.md files in each theme's respective directory under
|
|
||||||
[src_files/imports/themes-omarchy-extra](../src_files/imports/themes-omarchy-extra).
|
|
||||||
|
|
||||||
@@ -1,242 +0,0 @@
|
|||||||
# Artix Linux - Install and System Config
|
|
||||||
|
|
||||||
**Attribution:**
|
|
||||||
Most or much of this was generated by or derived from Grok, or else from Artix docs, Arch docs/wiki, or else the docs for the particular programs or packages used. I'm not claiming any of this is mine, just putting it here in one file for future convenience/reference.
|
|
||||||
|
|
||||||
I used this approach in December of 2025 to install Artix Linux on a Framework 13in laptop from 2023 q4.
|
|
||||||
|
|
||||||
- OS and distro: Artix Linux
|
|
||||||
- init system: dinit
|
|
||||||
- partitioning, GUID Partition Table:
|
|
||||||
- unencrypted boot partition (size: 512M), UEFI
|
|
||||||
- LUKS-encrypted LVM:
|
|
||||||
- swap partition (size: amount of memory + 4G)
|
|
||||||
- root/default partition (size: remaining space)
|
|
||||||
|
|
||||||
For reference, doc page from Artix for installation:
|
|
||||||
https://wiki.artixlinux.org/Main/Installation
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## install steps
|
|
||||||
|
|
||||||
- [ ] if not already done, download artix ISO (dinit version) and dd it onto a usb drive
|
|
||||||
|
|
||||||
- [ ] boot the live usb and select the install option (whatever it may look like)
|
|
||||||
|
|
||||||
- [ ] connect to the internet
|
|
||||||
|
|
||||||
```bash
|
|
||||||
connmanctl
|
|
||||||
//// within connmanctl
|
|
||||||
enable wifi
|
|
||||||
scan wifi
|
|
||||||
agent on
|
|
||||||
services
|
|
||||||
connect <wifi_XXXXXXXXXXXXXXXX_managed_psk>
|
|
||||||
quit
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] verify connection using `ping`
|
|
||||||
|
|
||||||
- [ ] update live system keys/mirrors
|
|
||||||
|
|
||||||
```bash
|
|
||||||
pacman -Sy artix-keyring
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] run lsblk and identify the storage drive on which to install
|
|
||||||
- note: when i ran this in 2025 dec on my framework laptop, it was `/dev/nvme0n1`
|
|
||||||
|
|
||||||
- [ ] partition the drive
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cfdisk <target storage drive>
|
|
||||||
# use GPT (guid partition table)
|
|
||||||
# new partition, size 512M, type 'EFI System'
|
|
||||||
# new partition, size (remaining), type 'Linux LVM'
|
|
||||||
# write changes
|
|
||||||
# quit cfdisk
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] set up LVM volumes
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cryptsetup luksFormat --type luks2 /dev/<LVM partition>
|
|
||||||
cryptsetup open /dev/<LVM partition> artixlvm
|
|
||||||
|
|
||||||
pvcreate /dev/mapper/artixlvm
|
|
||||||
vgcreate artixvg /dev/mapper/artixlvm
|
|
||||||
|
|
||||||
lvcreate -L <size of memory + 4G, e.g. 36G> artixvg -n swap
|
|
||||||
lvcreate -l 100%FREE artixvg -n root
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] set filesystems for partitions/volumes
|
|
||||||
|
|
||||||
```bash
|
|
||||||
mkfs.vfat -F32 /dev/<boot partition>
|
|
||||||
mkfs.ext4 /dev/artixvg/root
|
|
||||||
mkswap /dev/artixvg/swap
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] mount the partitions/volumes
|
|
||||||
|
|
||||||
```bash
|
|
||||||
mount /dev/artixvg/root /mnt
|
|
||||||
mkdir /mnt/boot
|
|
||||||
mount /dev/<boot partition> /mnt/boot
|
|
||||||
swapon /dev/artixvg/swap
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] install base system and needed packages
|
|
||||||
|
|
||||||
```bash
|
|
||||||
basestrap /mnt base base-devel linux \
|
|
||||||
linux-firmware \
|
|
||||||
dinit elogind-dinit \
|
|
||||||
lvm2 cryptsetup grub efibootmgr mkinitcpio \
|
|
||||||
connman connman-dinit wpa_supplicant \
|
|
||||||
git less neovim zsh
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] generate fstab
|
|
||||||
```bash
|
|
||||||
fstabgen -U /mnt >> /mnt/etc/fstab
|
|
||||||
|
|
||||||
# verify (add noatime to ext4 line if desired)
|
|
||||||
vi /mnt/etc/fstab
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] chroot into installed system
|
|
||||||
```bash
|
|
||||||
artix-chroot /mnt
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] set timezone, hardware clock, locale
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ln -sf /usr/share/zoneinfo/<path to target zone> /etc/localtime
|
|
||||||
hwclock --systohc
|
|
||||||
|
|
||||||
nvim /etc/locale.gen
|
|
||||||
# uncomment en_US.UTF-8 UTF-8; add others if desired
|
|
||||||
|
|
||||||
locale-gen
|
|
||||||
echo "LANG=en_US.UTF-8" > /etc/locale.conf
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] set hostname and /etc/hosts
|
|
||||||
|
|
||||||
```bash
|
|
||||||
echo "<computer name>" > /etc/hostname
|
|
||||||
|
|
||||||
nvim /etc/hosts
|
|
||||||
# ensure /etc/hosts includes the following:
|
|
||||||
127.0.0.1 localhost
|
|
||||||
::1 localhost
|
|
||||||
127.0.1.1 <computer name>.localdomain <computer name>"
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] mkinitcpio with hooks
|
|
||||||
|
|
||||||
```bash
|
|
||||||
nvim /etc/mkinitcpio.conf
|
|
||||||
# go to HOOKS and set it thus:
|
|
||||||
HOOKS=(base udev autodetect keyboard keymap consolefont modconf block encrypt lvm2 resume filesystems fsck)
|
|
||||||
|
|
||||||
mkinitcpio -P
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] grub config and install
|
|
||||||
|
|
||||||
```bash
|
|
||||||
blkid
|
|
||||||
# note the UUID of the LVM/LUKS partition
|
|
||||||
|
|
||||||
nvim /etc/default/grub
|
|
||||||
# ensure the following is set:
|
|
||||||
GRUB_CMDLINE_LINUX="cryptdevice=UUID=<UUID from blkid above>:artixlvm root=/dev/mapper/artixvg-root resume=/dev/mapper/artixvg-swap quiet rw"
|
|
||||||
|
|
||||||
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=Artix
|
|
||||||
grub-mkconfig -o /boot/grub/grub.cfg
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] set up connman for installed system
|
|
||||||
|
|
||||||
```bash
|
|
||||||
mkdir -p /etc/dinit.d/boot.d
|
|
||||||
ln -s ../connmand /etc/dinit.d/boot.d/connmand
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] set root password, set up user
|
|
||||||
|
|
||||||
```bash
|
|
||||||
passwd
|
|
||||||
|
|
||||||
useradd -m -G wheel,audio,video,optical,storage <username>
|
|
||||||
passwd <username>
|
|
||||||
pacman -S sudo
|
|
||||||
EDITOR=nvim visudo
|
|
||||||
# uncomment the line in /etc/sudoers which looks something like the below:
|
|
||||||
echo "%wheel ALL=(ALL) ALL"
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] close stuff out and reboot
|
|
||||||
|
|
||||||
```bash
|
|
||||||
exit
|
|
||||||
umount -R /mnt
|
|
||||||
swapoff -a
|
|
||||||
cryptsetup close cryptlvm # may not work, just ignore and reboot
|
|
||||||
reboot
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## system config (post install)
|
|
||||||
|
|
||||||
_NOTE: don't put anything here which should be in my dotfiles-and-setup scripts instead_
|
|
||||||
|
|
||||||
- [ ] set up chrony (for syncing system time with ntp servers)
|
|
||||||
- _NOTE: edit defaults in `/etc/chrony/chrony.conf` if desired_
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo pacman -S chrony chrony-dinit
|
|
||||||
|
|
||||||
# Fallback if dinitctl enable fails (symlink method)
|
|
||||||
sudo mkdir -p /etc/dinit.d/boot.d
|
|
||||||
sudo ln -s ../chronyd /etc/dinit.d/boot.d/chronyd
|
|
||||||
# alt: sudo dinitctl enable chronyd
|
|
||||||
|
|
||||||
/etc/dinit.d/chronyd start
|
|
||||||
# alt: sudo dinitctl start chronyd
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## troubleshooting
|
|
||||||
|
|
||||||
if i need to try something again and reopen the LVM, the below should work:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cryptsetup open /dev/<target device> artixlvm
|
|
||||||
# enter existing password
|
|
||||||
|
|
||||||
vgchange -ay artixvg
|
|
||||||
# or, if only one VG exists:
|
|
||||||
vgchange -ay
|
|
||||||
```
|
|
||||||
|
|
||||||
if date/time get messed up (such as due to battery running out), fix with:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# can manually adjust to local time; grok said "date is UTC if hardware is set that way"
|
|
||||||
sudo date -s "2025-12-17 12:47:00"
|
|
||||||
# or, if chrony, ntp, or similar is set up, can trigger sync
|
|
||||||
chronyd -q
|
|
||||||
# can check after with `date` or `chronyc tracking`
|
|
||||||
|
|
||||||
sudo hwclock -w --utc
|
|
||||||
```
|
|
||||||
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
# xlibre/x11 - adding xrandr modes
|
|
||||||
|
|
||||||
## 2026-01-16, artix linux, framework 13in laptop
|
|
||||||
|
|
||||||
### to add 1920x1280 resolution option:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
dispmanage_modeline=$(cvt 1920 1280 60 | sed -n '2p' | sed -E "s/^Modeline //g")
|
|
||||||
dispmanage_mode_id=$(printf "%s" "$dispmanage_modeline" | sed -E "s/^([^ ]+)\s.*$/\1/g")
|
|
||||||
printf "%s" "$modeline" | xargs xrandr --newmode
|
|
||||||
printf "%s" "$mode_id" | xargs xrandr --addmode eDP
|
|
||||||
# NOTE: the lines above have been added to .xinitrc, just leaving here for reference
|
|
||||||
|
|
||||||
# then, add the $mode_id value to my display-manage script as the target mode:
|
|
||||||
DISPMANAGE_LAPTOP_MODE='"1920x1280_60.00"'
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
# macOS system settings
|
|
||||||
|
|
||||||
settings for manual configuration in macOS system settings app
|
|
||||||
|
|
||||||
**NOTE:** some of these could be scripted, but for now i'm okay with this manual list
|
|
||||||
|
|
||||||
- desktop & dock
|
|
||||||
- `click wallpaper to reveal desktop`: set to "only in stage manager"
|
|
||||||
- all `drag windows to corner/edge/place` types of options: disabled
|
|
||||||
- `rearrange spaces based on recent use`: disabled
|
|
||||||
- `when switch to app... switch to space with open windows of app`: disabled
|
|
||||||
- `displays have separate spaces`: disabled
|
|
||||||
- `show files on desktop`: enabled
|
|
||||||
- `group windows by application`: enabled
|
|
||||||
- smallest possible dock size
|
|
||||||
- dock on right side of screen
|
|
||||||
- automatically hide and show the dock: enabled
|
|
||||||
- accessibility
|
|
||||||
- display
|
|
||||||
- reduce motion: enabled
|
|
||||||
- reduce transparency: enabled
|
|
||||||
- keyboard
|
|
||||||
- keyboard shortcuts
|
|
||||||
- screenshots
|
|
||||||
- save picture of selected area -> `cmd+shft+s`
|
|
||||||
- copy (clipboard) picture of selected area -> `ctrl+cmd+shft+s`
|
|
||||||
- modifier keys
|
|
||||||
- caps lock key -> `escape`
|
|
||||||
- command -> `control`
|
|
||||||
- alt/option -> `command`
|
|
||||||
- control -> `alt/option`
|
|
||||||
- spotlight
|
|
||||||
- show spotlight search -> `alt+r`
|
|
||||||
|
|
||||||
and in general, just go through most pages/options and set them as desired
|
|
||||||
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
# Manual steps needed after dotfile copy and/or installs
|
|
||||||
|
|
||||||
## all systems
|
|
||||||
|
|
||||||
- shell
|
|
||||||
- check user's shell using `echo $SHELL` or otherwise
|
|
||||||
- if not the desired shell:
|
|
||||||
- `cat /etc/shells` (or `chsh -l` if supported) to see options
|
|
||||||
- if target shell isn't listed, add it to `/etc/shells`
|
|
||||||
- then change the shell with `chsh -s <path to target shell>`
|
|
||||||
|
|
||||||
## macOS
|
|
||||||
|
|
||||||
- aerospace
|
|
||||||
- grant aerospace permission in accessibility settings
|
|
||||||
- likely need system reboot before aerospace works
|
|
||||||
- skhd
|
|
||||||
- run `skhd --start-service`
|
|
||||||
- grant skhd permission in accessibility settings
|
|
||||||
- run `skhd --restart-service`
|
|
||||||
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
# TODO items
|
|
||||||
|
|
||||||
## pending to call setup work initially done
|
|
||||||
|
|
||||||
- finished dwm config and installation on linux
|
|
||||||
- add dmenu (be able to launch generic programs, including my launch-name scripts)
|
|
||||||
- xresources working? use from/within theme-changing logic?
|
|
||||||
- finished artix/dinit setup
|
|
||||||
- remapped ctrl, alt, and super keys as needed
|
|
||||||
- adjusted keyrepeat speed, trackpad/mouse speed, etc
|
|
||||||
- did any normal/recommended stuff, refer to wiki
|
|
||||||
- include screen locking and sleep/hibernate
|
|
||||||
- figured out wiregaurd/vpn stuff
|
|
||||||
- finish xlibre setup, including installing any needed packages and doing config
|
|
||||||
- web browsers:
|
|
||||||
- primary, qutebrowser: config and install
|
|
||||||
- secondary, tor and either brave or librewolf: install only (no config)
|
|
||||||
|
|
||||||
## optional
|
|
||||||
|
|
||||||
- for macos: homebrew --> macports by 2026 sept (and audacity --> tenacity)
|
|
||||||
- configured neomutt
|
|
||||||
- config for mpd, and client(s), (mpd clients to consider: mpc, ncmpcpp, ncmpc, inori)
|
|
||||||
- get find, xargs, and awk (use nawk) as unified as i can across system types
|
|
||||||
- switch terminal from kitty to st
|
|
||||||
- seems mpv install (maybe others?) bring in wayland, see if i can remove it
|
|
||||||
- adjusted tmux so that n goes next/down and N goes prev/up in search results
|
|
||||||
- figured out nvim debug options for linux and macos, then update nvim's dap.lua
|
|
||||||
- picked and configured rss reader
|
|
||||||
- newsboat? others? option with inbox and separate queues?
|
|
||||||
- make all these scripts POSIX-compliant (or at least usable in ksh/oksh)
|
|
||||||
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
# notes regarding my workflow and system use
|
|
||||||
|
|
||||||
## workspaces layout
|
|
||||||
|
|
||||||
idea from the ThePrimeagen: designated workspace/tags/desktop per app/purpose
|
|
||||||
|
|
||||||
| key | app/focus
|
|
||||||
|-----|-----------
|
|
||||||
| 1. | reading/docs/reference
|
|
||||||
| 2. | music making - misc
|
|
||||||
| 3. | music making - daw
|
|
||||||
| 4. | listening/wathcing (any music, audio, or video)
|
|
||||||
| 5. | games
|
|
||||||
| 6. | comms (emails, chats, av/calls)
|
|
||||||
| 7. | web browser
|
|
||||||
| 8. | primary terminal (with tmux)
|
|
||||||
| 9. | general - misc (catch-all)
|
|
||||||
| 0. | system monitor (htop)
|
|
||||||
|
|
||||||
- the "key" column above lists the key to press (+ mod) to switch to a tag/workspace
|
|
||||||
- programs which i'm likely to use with peripherals (i.e. trackpad, mouse, stylus,
|
|
||||||
etc) should be where i can navigate those screens with one hand
|
|
||||||
- for me, my left hand would still be on the keyboard, so: workspaces 1 through 5
|
|
||||||
|
|
||||||
### usage notes
|
|
||||||
|
|
||||||
- my default approach is to run program/client windows in fullscreen
|
|
||||||
- note: on macOS, this is not mac's notion of fullscreen with windows essentially
|
|
||||||
moved to a new desktop; instead, i just want the windows taking up all of the
|
|
||||||
normal screen space (excluding any menu bar at the top of the screen)
|
|
||||||
- mental model for navigating windows:
|
|
||||||
- each window is in a stack
|
|
||||||
- keybinds: mod + j/k, to move down/up the stack
|
|
||||||
- each tab is in a circular list (imagine it is horizontal)
|
|
||||||
- keybinds: mod + h/l, to move left/right in this list
|
|
||||||
- note: in primary terminal, i'm running tmux, which has its own navigation approach,
|
|
||||||
refer to the tmux.conf and tmux-session-init scripts
|
|
||||||
- for the workspaces where i keep multiple apps, i try to maintain consistent order of
|
|
||||||
those apps within the stack of each respective workspace
|
|
||||||
|
|
||||||
## theme notes
|
|
||||||
|
|
||||||
| theme name | focus / use context
|
|
||||||
|-------------|--------------------
|
|
||||||
| gruvbox | admin/productivity work (default theme)
|
|
||||||
| pina | music
|
|
||||||
| tokyodark | programming/coding
|
|
||||||
| mars | night (within 2+ hours of sleep)
|
|
||||||
| lanterns | (tbd?)
|
|
||||||
| lighthouse | (tbd?)
|
|
||||||
| jade | (tbd?)
|
|
||||||
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
build_install() {
|
|
||||||
echo "-- installing $1"
|
|
||||||
|
|
||||||
target=$(echo "custom-$1-$BOX_SETUP_OS-$BOX_SETUP_DISTRO" | tr '-' '_')
|
|
||||||
[[ ! -e ./installs_and_builds/$target ]] &&
|
|
||||||
target=$(echo "custom-$1-$BOX_SETUP_OS-default" | tr '-' '_')
|
|
||||||
[[ ! -e ./installs_and_builds/$target ]] &&
|
|
||||||
target=$(echo "custom-$1-default" | tr '-' '_')
|
|
||||||
|
|
||||||
[[ ! -e ./installs_and_builds/$target ]] &&
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} "$1" &&
|
|
||||||
return
|
|
||||||
|
|
||||||
tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/$1.XXXXXXXX") || {
|
|
||||||
echo "could not create temp dir for $1 build" && return
|
|
||||||
}
|
|
||||||
|
|
||||||
custom_script_path=$(pwd)/installs_and_builds/$target
|
|
||||||
pushd $tmpdir > /dev/null
|
|
||||||
$custom_script_path
|
|
||||||
popd > /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "---- updating package manager / packages"
|
|
||||||
[[ -n "$BOX_SETUP_UPDATE_PKG_MANAGER_AND_DEFS_CMD" ]] &&
|
|
||||||
${=BOX_SETUP_UPDATE_PKG_MANAGER_AND_DEFS_CMD}
|
|
||||||
[[ -n "$BOX_SETUP_UPDATE_PKGS_CMD" ]] && ${=BOX_SETUP_UPDATE_PKGS_CMD}
|
|
||||||
|
|
||||||
echo "---- installing programs ---------------"
|
|
||||||
[[ -z $1 ]] && system_types_list="base" || system_types_list="base,$1"
|
|
||||||
|
|
||||||
echo "$system_types_list" |
|
|
||||||
sed -E "s/,/\n/g" |
|
|
||||||
while IFS= read -r system_type; do
|
|
||||||
echo "-------- install for system type: $system_type"
|
|
||||||
cat "installs_and_builds/programs_$system_type.txt" |
|
|
||||||
while IFS= read -r program_name; do
|
|
||||||
build_install "$program_name"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "program not applicable for this OS or distro, skipping build/installation"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# use normal package manager for macos install, since default is noop for other OSs
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} --cask nikitabobko/tap/aerospace
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "TODO: custom script for bitwig not yet implemented; may just want manual install"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "TODO: custom script for bitwig not yet implemented; may just want manual install"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "program not applicable for this OS or distro, skipping build/installation"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# use normal package manager for macos install, since default is noop for other OSs
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} coreutils
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# for now, use luke's build; i can make my own fork later if desired
|
|
||||||
git clone https://github.com/LukeSmithxyz/dmenu.git
|
|
||||||
|
|
||||||
pushd dmenu > /dev/null
|
|
||||||
sudo make clean install
|
|
||||||
popd > /dev/null
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
git clone https://git.drinkingtea.net/david/dwm.git
|
|
||||||
|
|
||||||
pushd dwm > /dev/null
|
|
||||||
sudo make clean install
|
|
||||||
popd > /dev/null
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "program not applicable for this OS or distro, skipping build/installation"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# use normal package manager for macos install, since default is noop for other OSs
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} findutils
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# adjust prefix for package manager before install
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} --cask gimp
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# adjust prefix for package manager before install
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} --cask kitty
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
git clone https://github.com/ibara/oksh.git
|
|
||||||
|
|
||||||
pushd oksh > /dev/null
|
|
||||||
./configure
|
|
||||||
make && sudo make install
|
|
||||||
popd > /dev/null
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo 'TODO: custom script for mise is not yet implemented'
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# for debian, use package name `openssh-server` instead of `openssh`
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} openssh-server
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# change package name; on arch it is 'pandoc-cli'
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} pandoc-cli
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# change package name; on artix it is 'pandoc-bin'
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} pandoc-bin
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "program not applicable for this OS or distro, skipping build/installation"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# use normal package manager for macos install, since default is noop for other OSs
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} koekeishiya/formulae/skhd
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# git clone https://git.drinkingtea.net/david/st.git
|
|
||||||
|
|
||||||
# pushd st > /dev/null
|
|
||||||
# sudo make clean install
|
|
||||||
# popd > /dev/null
|
|
||||||
|
|
||||||
echo "TODO: st build not yet done, skipping this install for now"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# tenacity is not readily available on macos, so just use audacity for now
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} --cask audacity
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
#!/bin/zsh
|
|
||||||
|
|
||||||
# change package name; on artix it is 'pandoc-bin'
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} \
|
|
||||||
xlibre-xserver \
|
|
||||||
xlibre-video-amdgpu \
|
|
||||||
xlibre-input-libinput \
|
|
||||||
libx11 \
|
|
||||||
libxft \
|
|
||||||
libxinerama
|
|
||||||
|
|
||||||
# `xlibre-video-amdgpu` depends on system gpu; ref lspci; maybe use `xlibre-drivers` instead
|
|
||||||
# if `xlibre-input-libinput` doesn't work, try `xlibre-input-evdev` (generic module) if libinput does not work
|
|
||||||
|
|
||||||
${=BOX_SETUP_INSTALL_COMMAND} \
|
|
||||||
xorg-xinit \
|
|
||||||
xorg-xrandr
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "intentionally skipping build/installation for macos"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
gcc
|
|
||||||
musl
|
|
||||||
coreutils
|
|
||||||
findutils
|
|
||||||
xlibre
|
|
||||||
make
|
|
||||||
mpv
|
|
||||||
kitty
|
|
||||||
st
|
|
||||||
dmenu
|
|
||||||
zsh
|
|
||||||
ksh
|
|
||||||
tmux
|
|
||||||
neovim
|
|
||||||
neomutt
|
|
||||||
curl
|
|
||||||
grep
|
|
||||||
ripgrep
|
|
||||||
sed
|
|
||||||
less
|
|
||||||
openssh
|
|
||||||
fzf
|
|
||||||
jq
|
|
||||||
parallel
|
|
||||||
gettext
|
|
||||||
htop
|
|
||||||
ffmpeg
|
|
||||||
mpd
|
|
||||||
ncmpcpp
|
|
||||||
git
|
|
||||||
xclip
|
|
||||||
mandoc
|
|
||||||
calcurse
|
|
||||||
zathura
|
|
||||||
gimp
|
|
||||||
dwm
|
|
||||||
qutebrowser
|
|
||||||
aerospace
|
|
||||||
skhd
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
tenacity
|
|
||||||
bitwig-studio
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
clang
|
|
||||||
cmake
|
|
||||||
mise
|
|
||||||
podman
|
|
||||||
pandoc
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. ./src_files/shell/profile # ensure env vars set for use below
|
|
||||||
echo "---- making system dirs ----------------"
|
|
||||||
|
|
||||||
# some standard/common directories, some overlap/use in XDG directories
|
|
||||||
! [ -d "$DIR_LOCAL" ] && mkdir -p "$DIR_LOCAL"
|
|
||||||
! [ -d "$DIR_BIN" ] && mkdir -p "$DIR_BIN"
|
|
||||||
! [ -d "$DIR_SCRIPTS" ] && mkdir -p "$DIR_SCRIPTS"
|
|
||||||
! [ -d "$DIR_USER_OPT" ] && mkdir -p "$DIR_USER_OPT"
|
|
||||||
! [ -d "$DIR_USER_LIB" ] && mkdir -p "$DIR_USER_LIB"
|
|
||||||
|
|
||||||
# directories related to XDG Base Directory specification
|
|
||||||
! [ -d "$XDG_CONFIG_HOME" ] && mkdir -p "$XDG_CONFIG_HOME"
|
|
||||||
! [ -d "$XDG_CACHE_HOME" ] && mkdir -p "$XDG_CACHE_HOME"
|
|
||||||
! [ -d "$XDG_DATA_HOME" ] && mkdir -p "$XDG_DATA_HOME"
|
|
||||||
! [ -d "$XDG_STATE_HOME" ] && mkdir -p "$XDG_STATE_HOME"
|
|
||||||
|
|
||||||
# additional directories for how i'm organizing my system
|
|
||||||
! [ -d "$DIR_HOME_BOX" ] && mkdir -p "$DIR_HOME_BOX"
|
|
||||||
! [ -d "$DIR_INBOX" ] && mkdir -p "$DIR_INBOX"
|
|
||||||
! [ -d "$DIR_NOTES" ] && mkdir -p "$DIR_NOTES"
|
|
||||||
! [ -d "$DIR_MUSIC_LISTEN" ] && mkdir -p "$DIR_MUSIC_LISTEN"
|
|
||||||
! [ -d "$DIR_DEV" ] && mkdir -p "$DIR_DEV"
|
|
||||||
! [ -d "$DIR_GIT_PROJECTS" ] && mkdir -p "$DIR_GIT_PROJECTS"
|
|
||||||
! [ -d "$DIR_GIT_PROJECTS/me" ] && mkdir -p "$DIR_GIT_PROJECTS/me"
|
|
||||||
! [ -d "$DIR_GIT_PROJECTS/forks" ] && mkdir -p "$DIR_GIT_PROJECTS/forks"
|
|
||||||
! [ -d "$DIR_GIT_PROJECTS/learning" ] && mkdir -p "$DIR_GIT_PROJECTS/learning"
|
|
||||||
! [ -d "$DIR_GIT_PROJECTS/other" ] && mkdir -p "$DIR_GIT_PROJECTS/other"
|
|
||||||
|
|
||||||
# directories for music/audio production
|
|
||||||
! [ -d "$DIR_REAPER_PORTABLE_SHARED" ] && mkdir -p "$DIR_REAPER_PORTABLE_SHARED"
|
|
||||||
! [ -d "$DIR_REAPER_PORTABLE_LINUX" ] && mkdir -p "$DIR_REAPER_PORTABLE_LINUX"
|
|
||||||
! [ -d "$DIR_REAPER_PORTABLE_MACOS" ] && mkdir -p "$DIR_REAPER_PORTABLE_MACOS"
|
|
||||||
|
|
||||||
# xdg spec and/or clean-up of home dir
|
|
||||||
echo "---- making xdg-spec/home-clean-up files"
|
|
||||||
! [ -d "$XDG_CONFIG_HOME/cups" ] && mkdir -p "$XDG_CONFIG_HOME/cups"
|
|
||||||
! [ -d "$XDG_DATA_HOME/irb" ] && mkdir -p "$XDG_DATA_HOME/irb"
|
|
||||||
! [ -d "$XDG_DATA_HOME/ncmpcpp" ] && mkdir -p "$XDG_DATA_HOME/ncmpcpp"
|
|
||||||
! [ -d "$XDG_CACHE_HOME/maven/repository" ] && mkdir -p "$XDG_CACHE_HOME/maven/repository"
|
|
||||||
Executable
+10
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
|
||||||
|
[[ ! -d $HOME/.config ]] && mkdir $HOME/.config
|
||||||
|
[[ ! -d $HOME/.local ]] && mkdir $HOME/.local
|
||||||
|
[[ ! -d $HOME/.local/bin ]] && mkdir $HOME/.local/bin
|
||||||
|
[[ ! -d $HOME/.local/build ]] && mkdir $HOME/.local/build
|
||||||
|
[[ ! -d $HOME/.local/tmp ]] && mkdir $HOME/.local/tmp
|
||||||
|
|
||||||
|
# [[ ! -d $HOME/dbox ]] && mkdir $HOME/dbox
|
||||||
|
[[ ! -d $HOME/dev ]] && mkdir $HOME/dev
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
|
||||||
|
single_script_filter=""
|
||||||
|
dry="0"
|
||||||
|
|
||||||
|
execute() {
|
||||||
|
log "execute $@"
|
||||||
|
[[ $dry != "1" ]] && "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
log() {
|
||||||
|
[[ $dry != "1" ]] && echo "$@" || echo "[DRY RUN]: $@"
|
||||||
|
}
|
||||||
|
|
||||||
|
while [[ $# > 0 ]]; do
|
||||||
|
[[ $1 == "--dry" ]] && dry="1" || single_script_filter="$1"
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
script_dir=$(cd $(dirname "${ZSH_SOURCE[0]}") &> /dev/null && pwd)
|
||||||
|
log "run // script_dir: $script_dir -- args: $single_script_filter"
|
||||||
|
cd $script_dir
|
||||||
|
scripts=(`find ./runs -maxdepth 1 -mindepth 1 -type f`)
|
||||||
|
for script in $scripts; do
|
||||||
|
if [[ -x $script ]]; then
|
||||||
|
if echo "$script" | grep -qv "$single_script_filter"; then
|
||||||
|
log "filter is $single_script_filter // ignoring: $script"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
execute ./$script
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
Executable
+32
@@ -0,0 +1,32 @@
|
|||||||
|
#!/bin/zsh
|
||||||
|
|
||||||
|
install_command="sudo apt install"
|
||||||
|
[[ -x $(which brew) ]] && install_command="brew install"
|
||||||
|
|
||||||
|
neovim_dir=$HOME/.local/build/neovim
|
||||||
|
neovim_version="v0.10.3"
|
||||||
|
[ ! -z $NVIM_VERSION ] && neovim_version="$NVIM_VERSION"
|
||||||
|
echo "neovim_version: \"$neovim_version\""
|
||||||
|
|
||||||
|
[ ! -d $neovim_dir ] && git clone https://github.com/neovim/neovim.git $neovim_dir
|
||||||
|
git -C $neovim_dir fetch --all
|
||||||
|
git -C $neovim_dir checkout $neovim_version
|
||||||
|
|
||||||
|
$install_command cmake gettext lua@5.1 liblua5.1-0-dev
|
||||||
|
|
||||||
|
make -C $neovim_dir clean
|
||||||
|
make -C $neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
|
||||||
|
sudo make -C $neovim_dir install
|
||||||
|
|
||||||
|
# lines below from primeagen's dev repo, uncomment/edit as needed
|
||||||
|
# git clone https://github.com/ThePrimeagen/harpoon.git $HOME/personal/harpoon
|
||||||
|
# cd $HOME/personal/harpoon
|
||||||
|
# git fetch
|
||||||
|
# git checkout harpoon2
|
||||||
|
|
||||||
|
# git clone https://github.com/ThePrimeagen/vim-apm.git $HOME/personal/vim-apm
|
||||||
|
# git clone https://github.com/ThePrimeagen/vim-with-me.git $HOME/personal/vim-with-me
|
||||||
|
# git clone https://github.com/ThePrimeagen/vim-arcade.git $HOME/personal/vim-arcade
|
||||||
|
# git clone https://github.com/ThePrimeagen/caleb.git $HOME/personal/caleb
|
||||||
|
# git clone https://github.com/nvim-lua/plenary.nvim.git $HOME/personal/plenary
|
||||||
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
prefix="/usr"
|
|
||||||
exec_prefix="${prefix}"
|
|
||||||
xrdb="xrdb"
|
|
||||||
xinitdir="/etc/X11/xinit"
|
|
||||||
xmodmap="xmodmap"
|
|
||||||
|
|
||||||
userresources="$HOME/.Xresources"
|
|
||||||
usermodmap="$HOME/.Xmodmap"
|
|
||||||
sysresources="$xinitdir/.Xresources"
|
|
||||||
sysmodmap="$xinitdir/.Xmodmap"
|
|
||||||
|
|
||||||
# merge in defaults and keymaps
|
|
||||||
|
|
||||||
[ -x /usr/bin/cpp ] && xinit_nocpp_opt="" || xinit_nocpp_opt="-nocpp"
|
|
||||||
[ -f "$sysresources" ] && "$xrdb" "$xinit_nocpp_opt" -merge "$sysresources"
|
|
||||||
[ -f "$sysmodmap" ] && "$xmodmap" "$sysmodmap"
|
|
||||||
[ -f "$userresources" ] && "$xrdb" -nocpp -merge "$userresources"
|
|
||||||
[ -f "$usermodmap" ] && "$xmodmap" "$usermodmap"
|
|
||||||
|
|
||||||
# source xinitdrc.d script files
|
|
||||||
[ -d "$xinitdir"/xinitrc.d ] && {
|
|
||||||
for f in "$xinitdir/xinitrc.d"/?*.sh ; do
|
|
||||||
[ -x "$f" ] && . "$f"
|
|
||||||
done
|
|
||||||
unset f
|
|
||||||
}
|
|
||||||
|
|
||||||
# xrandr mode for laptop display (framework 13in), target 1920x1280 resolution
|
|
||||||
dispmanage_modeline=$(cvt 1920 1280 60 | sed -n '2p' | sed -E "s/^Modeline //g")
|
|
||||||
dispmanage_mode_id=$(printf "%s" "$dispmanage_modeline" | sed -E "s/^([^ ]+)\s.*$/\1/g")
|
|
||||||
printf "%s" "$dispmanage_modeline" | xargs xrandr --newmode
|
|
||||||
printf "%s" "$dispmanage_mode_id" | xargs xrandr --addmode eDP
|
|
||||||
xrandr --output eDP --mode "1920x1280_60.00"
|
|
||||||
|
|
||||||
# start window manager
|
|
||||||
exec dwm
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
# ref: https://nikitabobko.github.io/AeroSpace/commands
|
|
||||||
# ref: https://nikitabobko.github.io/AeroSpace/guide
|
|
||||||
|
|
||||||
after-startup-command = []
|
|
||||||
start-at-login = true
|
|
||||||
|
|
||||||
enable-normalization-flatten-containers = true
|
|
||||||
enable-normalization-opposite-orientation-for-nested-containers = true
|
|
||||||
on-focused-monitor-changed = ['move-mouse monitor-lazy-center']
|
|
||||||
automatically-unhide-macos-hidden-apps = true
|
|
||||||
|
|
||||||
accordion-padding = 0
|
|
||||||
default-root-container-layout = 'accordion' # opts: tiles accordion
|
|
||||||
default-root-container-orientation = 'vertical' # opts: horizontal vertical auto
|
|
||||||
|
|
||||||
[key-mapping]
|
|
||||||
preset = 'qwerty' # opts: qwerty dvorak colemak
|
|
||||||
|
|
||||||
[gaps]
|
|
||||||
inner.horizontal = 0 # inner* - between windows and other windows
|
|
||||||
inner.vertical = 0
|
|
||||||
outer.left = 0 # outer* - between windows and monitor edges
|
|
||||||
outer.bottom = 0
|
|
||||||
outer.top = 0
|
|
||||||
outer.right = 0
|
|
||||||
|
|
||||||
[mode.main.binding]
|
|
||||||
# layouts
|
|
||||||
cmd-comma = 'layout v_accordion'
|
|
||||||
cmd-period = 'layout h_tiles'
|
|
||||||
cmd-slash = 'layout floating'
|
|
||||||
|
|
||||||
# window resizing
|
|
||||||
alt-minus = 'resize smart -50'
|
|
||||||
alt-equal = 'resize smart +50'
|
|
||||||
|
|
||||||
# window focus/view
|
|
||||||
cmd-j = 'focus up' # new windows are added "below" current, so swap up and down
|
|
||||||
cmd-k = 'focus down'
|
|
||||||
cmd-1 = 'workspace 1'
|
|
||||||
cmd-2 = 'workspace 2'
|
|
||||||
cmd-3 = 'workspace 3'
|
|
||||||
cmd-4 = 'workspace 4'
|
|
||||||
cmd-5 = 'workspace 5'
|
|
||||||
cmd-6 = 'workspace 6'
|
|
||||||
cmd-7 = 'workspace 7'
|
|
||||||
cmd-8 = 'workspace 8'
|
|
||||||
cmd-9 = 'workspace 9'
|
|
||||||
cmd-0 = 'workspace 10'
|
|
||||||
|
|
||||||
# window movement
|
|
||||||
cmd-shift-j = 'move up' # new windows are added "below" current, so swap up and down
|
|
||||||
cmd-shift-k = 'move down'
|
|
||||||
cmd-shift-1 = 'move-node-to-workspace 1'
|
|
||||||
cmd-shift-2 = 'move-node-to-workspace 2'
|
|
||||||
cmd-shift-3 = 'move-node-to-workspace 3'
|
|
||||||
cmd-shift-4 = 'move-node-to-workspace 4'
|
|
||||||
cmd-shift-5 = 'move-node-to-workspace 5'
|
|
||||||
cmd-shift-6 = 'move-node-to-workspace 6'
|
|
||||||
cmd-shift-7 = 'move-node-to-workspace 7'
|
|
||||||
cmd-shift-8 = 'move-node-to-workspace 8'
|
|
||||||
cmd-shift-9 = 'move-node-to-workspace 9'
|
|
||||||
cmd-shift-0 = 'move-node-to-workspace 10'
|
|
||||||
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
# font stuff
|
|
||||||
font-style = Regular
|
|
||||||
font-feature = -calt, -liga, -dlig
|
|
||||||
|
|
||||||
# window stuff
|
|
||||||
macos-titlebar-proxy-icon = hidden
|
|
||||||
title = " "
|
|
||||||
window-decoration = none
|
|
||||||
|
|
||||||
# cursor stuff
|
|
||||||
cursor-style = "block"
|
|
||||||
cursor-style-blink = false
|
|
||||||
shell-integration-features = no-cursor
|
|
||||||
|
|
||||||
# theme stuff
|
|
||||||
config-file = ?"~/.config/zz-this-box/themes/.current-theme/ghostty"
|
|
||||||
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
# primary
|
|
||||||
background = #1a1b26
|
|
||||||
foreground = #c0caf5
|
|
||||||
cursor-color = #c0caf5
|
|
||||||
cursor-text = #1a1b26
|
|
||||||
|
|
||||||
# normal colors
|
|
||||||
palette = 0=#15161e
|
|
||||||
palette = 1=#f7768e
|
|
||||||
palette = 2=#9ece6a
|
|
||||||
palette = 3=#e0af68
|
|
||||||
palette = 4=#7aa2f7
|
|
||||||
palette = 5=#bb9af7
|
|
||||||
palette = 6=#7dcfff
|
|
||||||
palette = 7=#a9b1d6
|
|
||||||
|
|
||||||
# bright colors
|
|
||||||
palette = 8=#414868
|
|
||||||
palette = 9=#f7768e
|
|
||||||
palette = 10=#9ece6a
|
|
||||||
palette = 11=#e0af68
|
|
||||||
palette = 12=#7aa2f7
|
|
||||||
palette = 13=#bb9af7
|
|
||||||
palette = 14=#7dcfff
|
|
||||||
palette = 15=#c0caf5
|
|
||||||
|
|
||||||
# selection-background
|
|
||||||
selection-background = #283457
|
|
||||||
selection-foreground = #c0caf5
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
# GIMP colorrc
|
|
||||||
#
|
|
||||||
# This file holds a list of recently used colors.
|
|
||||||
|
|
||||||
(color-history
|
|
||||||
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0)
|
|
||||||
(color "R'G'B'A float" 16 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\200\77" 0))
|
|
||||||
|
|
||||||
# end of colorrc
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
# GIMP user context
|
|
||||||
|
|
||||||
(tool "gimp-pencil-tool")
|
|
||||||
(paint-info "gimp-pencil")
|
|
||||||
(foreground
|
|
||||||
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
|
|
||||||
(background
|
|
||||||
(color "R'G'B'A float" 16 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\200\77" 0))
|
|
||||||
(brush "2. Hardness 050")
|
|
||||||
(dynamics "Pressure Opacity")
|
|
||||||
(mybrush "100% Opaque")
|
|
||||||
(pattern "Pine")
|
|
||||||
(gradient "FG to BG (RGB)")
|
|
||||||
(palette "Color History")
|
|
||||||
(font "Sans-serif")
|
|
||||||
(tool-preset "Core Pointer")
|
|
||||||
|
|
||||||
# end of user context
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
# GIMP gimprc
|
|
||||||
#
|
|
||||||
# personal gimprc file, takes precedence over values in system-wide gimprc
|
|
||||||
# if changing within gimp, make sure i copy those settings into my dotfiles src_files
|
|
||||||
|
|
||||||
(prev-language "en-US")
|
|
||||||
(config-version "3.0.6")
|
|
||||||
(default-image
|
|
||||||
(width 2480)
|
|
||||||
(height 1748)
|
|
||||||
(unit pixels)
|
|
||||||
(xresolution 300)
|
|
||||||
(yresolution 300)
|
|
||||||
(resolution-unit inches)
|
|
||||||
(image-type rgb)
|
|
||||||
(precision u8-non-linear)
|
|
||||||
(color-profile NULL)
|
|
||||||
(simulation-profile NULL)
|
|
||||||
(simulation-bpc no)
|
|
||||||
(simulation-intent relative-colorimetric)
|
|
||||||
(fill-type background)
|
|
||||||
(comment ""))
|
|
||||||
(import-raw-plug-in "${gimp_plug_in_dir}/plug-ins/file-raw-placeholder/file-raw-placeholder")
|
|
||||||
(check-updates no)
|
|
||||||
(check-update-timestamp 1759871981)
|
|
||||||
(monitor-xresolution 129)
|
|
||||||
(monitor-yresolution 129)
|
|
||||||
(show-welcome-dialog no)
|
|
||||||
(fill-options
|
|
||||||
(style fg-color)
|
|
||||||
(custom-style solid-color)
|
|
||||||
(antialias yes)
|
|
||||||
(feather no)
|
|
||||||
(feather-radius 10))
|
|
||||||
(stroke-options
|
|
||||||
(style fg-color)
|
|
||||||
(custom-style solid-color)
|
|
||||||
(antialias yes)
|
|
||||||
(feather no)
|
|
||||||
(feather-radius 10)
|
|
||||||
(method line)
|
|
||||||
(width 6)
|
|
||||||
(unit pixels)
|
|
||||||
(cap-style butt)
|
|
||||||
(join-style miter)
|
|
||||||
(miter-limit 10)
|
|
||||||
(dash-offset 0)
|
|
||||||
(dash-info 0)
|
|
||||||
(emulate-brush-dynamics no))
|
|
||||||
(default-view
|
|
||||||
(show-menubar yes)
|
|
||||||
(show-statusbar no)
|
|
||||||
(show-rulers yes)
|
|
||||||
(show-scrollbars yes)
|
|
||||||
(show-selection no)
|
|
||||||
(show-layer-boundary no)
|
|
||||||
(show-canvas-boundary yes)
|
|
||||||
(show-guides yes)
|
|
||||||
(show-grid no)
|
|
||||||
(show-sample-points yes)
|
|
||||||
(snap-to-guides yes)
|
|
||||||
(snap-to-grid no)
|
|
||||||
(snap-to-canvas no)
|
|
||||||
(snap-to-path no)
|
|
||||||
(snap-to-bbox no)
|
|
||||||
(snap-to-equidistance no)
|
|
||||||
(padding-mode default)
|
|
||||||
(padding-color
|
|
||||||
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
|
|
||||||
(padding-in-show-all no))
|
|
||||||
(default-fullscreen-view
|
|
||||||
(show-menubar yes)
|
|
||||||
(show-statusbar no)
|
|
||||||
(show-rulers yes)
|
|
||||||
(show-scrollbars yes)
|
|
||||||
(show-selection no)
|
|
||||||
(show-layer-boundary no)
|
|
||||||
(show-canvas-boundary yes)
|
|
||||||
(show-guides yes)
|
|
||||||
(show-grid no)
|
|
||||||
(show-sample-points yes)
|
|
||||||
(snap-to-guides yes)
|
|
||||||
(snap-to-grid no)
|
|
||||||
(snap-to-canvas no)
|
|
||||||
(snap-to-path no)
|
|
||||||
(snap-to-bbox no)
|
|
||||||
(snap-to-equidistance no)
|
|
||||||
(padding-mode default)
|
|
||||||
(padding-color
|
|
||||||
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
|
|
||||||
(padding-in-show-all no))
|
|
||||||
|
|
||||||
|
|
||||||
# end of gimprc
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
(file-version 1)
|
|
||||||
(action "view-show-rulers" "<Shift><Control>r")
|
|
||||||
(action "view-zoom-fit-in" "<Shift><Control>f")
|
|
||||||
(action "windows-hide-docks" "<Shift><Control>d")
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
# GIMP gimp-paintbrush-tool options
|
|
||||||
|
|
||||||
(background
|
|
||||||
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
|
|
||||||
(brush "2. Hardness 050")
|
|
||||||
(dynamics "Pressure Opacity")
|
|
||||||
(pattern "Pine")
|
|
||||||
(gradient "FG to BG (RGB)")
|
|
||||||
(palette "Color History")
|
|
||||||
(brush-size 2.0)
|
|
||||||
(brush-hardness 0.5)
|
|
||||||
|
|
||||||
# end of gimp-paintbrush-tool options
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
# GIMP gimp-pencil-tool options
|
|
||||||
|
|
||||||
(background
|
|
||||||
(color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
|
|
||||||
(brush "2. Hardness 050")
|
|
||||||
(dynamics "Pressure Opacity")
|
|
||||||
(pattern "Pine")
|
|
||||||
(gradient "FG to BG (RGB)")
|
|
||||||
(palette "Color History")
|
|
||||||
(brush-size 2.0)
|
|
||||||
(brush-hardness 0.5)
|
|
||||||
|
|
||||||
# end of gimp-pencil-tool options
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
[init]
|
|
||||||
defaultBranch = master
|
|
||||||
[user]
|
|
||||||
name = david
|
|
||||||
email = david@pinewoods.xyz
|
|
||||||
[push]
|
|
||||||
autoSetupRemote = true
|
|
||||||
[pull]
|
|
||||||
rebase = true
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
# my own stuff/conventions
|
|
||||||
.tmux-session-hydrate
|
|
||||||
zxcv*
|
|
||||||
|
|
||||||
# compilation/debug/cache/build/etc
|
|
||||||
**/build/
|
|
||||||
**/__pycache__/
|
|
||||||
*.o
|
|
||||||
*.pch
|
|
||||||
*.dSYM
|
|
||||||
|
|
||||||
# lang/package
|
|
||||||
mise*.toml
|
|
||||||
.npmrc
|
|
||||||
|
|
||||||
# opencode/agents/etc
|
|
||||||
.opencode/
|
|
||||||
opencode.json
|
|
||||||
AGENTS.md
|
|
||||||
|
|
||||||
# vim files
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
|
|
||||||
# miscellaneous
|
|
||||||
.DS_Store
|
|
||||||
.liccor*
|
|
||||||
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
# Beware! This file is rewritten by htop when settings are changed in the interface.
|
|
||||||
# The parser is also very primitive, and not human-friendly.
|
|
||||||
htop_version=3.4.1
|
|
||||||
config_reader_min_version=3
|
|
||||||
fields=0 48 17 18 38 39 2 46 47 49 1
|
|
||||||
hide_kernel_threads=1
|
|
||||||
hide_userland_threads=0
|
|
||||||
hide_running_in_container=0
|
|
||||||
shadow_other_users=0
|
|
||||||
show_thread_names=0
|
|
||||||
show_program_path=1
|
|
||||||
highlight_base_name=0
|
|
||||||
highlight_deleted_exe=1
|
|
||||||
shadow_distribution_path_prefix=0
|
|
||||||
highlight_megabytes=1
|
|
||||||
highlight_threads=1
|
|
||||||
highlight_changes=0
|
|
||||||
highlight_changes_delay_secs=5
|
|
||||||
find_comm_in_cmdline=1
|
|
||||||
strip_exe_from_cmdline=1
|
|
||||||
show_merged_command=0
|
|
||||||
header_margin=1
|
|
||||||
screen_tabs=1
|
|
||||||
detailed_cpu_time=0
|
|
||||||
cpu_count_from_one=0
|
|
||||||
show_cpu_usage=1
|
|
||||||
show_cpu_frequency=0
|
|
||||||
show_cached_memory=1
|
|
||||||
update_process_names=0
|
|
||||||
account_guest_in_cpu_meter=0
|
|
||||||
color_scheme=6
|
|
||||||
enable_mouse=1
|
|
||||||
delay=40
|
|
||||||
hide_function_bar=0
|
|
||||||
header_layout=two_50_50
|
|
||||||
column_meters_0=NetworkIO NetworkIO Blank MemorySwap MemorySwap Blank LeftCPUs8 LeftCPUs2
|
|
||||||
column_meter_modes_0=2 3 2 1 3 2 3 1
|
|
||||||
column_meters_1=DateTime Hostname Battery System Uptime Blank LoadAverage Tasks Blank DiskIO FileDescriptors Blank RightCPUs8 RightCPUs2
|
|
||||||
column_meter_modes_1=2 2 1 2 2 2 2 2 2 2 2 2 3 1
|
|
||||||
tree_view=0
|
|
||||||
sort_key=47
|
|
||||||
tree_sort_key=0
|
|
||||||
sort_direction=-1
|
|
||||||
tree_sort_direction=1
|
|
||||||
tree_view_always_by_pid=0
|
|
||||||
all_branches_collapsed=0
|
|
||||||
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
|
|
||||||
.sort_key=PERCENT_MEM
|
|
||||||
.tree_sort_key=PID
|
|
||||||
.tree_view_always_by_pid=0
|
|
||||||
.tree_view=0
|
|
||||||
.sort_direction=-1
|
|
||||||
.tree_sort_direction=1
|
|
||||||
.all_branches_collapsed=0
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
input {
|
|
||||||
kb_options = caps:escape, \
|
|
||||||
ctrl:swap_lalt_lctl, \
|
|
||||||
ctrl:swap_ralt_rctl, \
|
|
||||||
altwin:swap_ralt_rwin # this one seems to not work, but leaving here for now
|
|
||||||
|
|
||||||
repeat_rate = 70
|
|
||||||
repeat_delay = 250
|
|
||||||
|
|
||||||
touchpad {
|
|
||||||
clickfinger_behavior = true # 2-finger click is right-click
|
|
||||||
scroll_factor = 0.3
|
|
||||||
natural_scroll = false # natural is a bad name for this
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# custom window rules per app
|
|
||||||
windowrulev2 = float, class:REAPER, title:^(REAPER).*$
|
|
||||||
windowrulev2 = size 1120 744, class:REAPER, title:^(REAPER).*$
|
|
||||||
windowrulev2 = center, class:REAPER, title:^(REAPER).*$
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
IRB.conf[:HISTORY_FILE] ||= File.join(ENV["XDG_DATA_HOME"], "irb", "history")
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
# font stuff
|
|
||||||
# font_family Regular # Average Mono, maybe?
|
|
||||||
font_size 14
|
|
||||||
disable_ligatures always # no ligatures
|
|
||||||
symbol_map U+E000-U+F8FF none # no ligatures
|
|
||||||
|
|
||||||
# window stuff
|
|
||||||
hide_window_decorations yes
|
|
||||||
macos_hide_window_titlebar yes
|
|
||||||
window_title_format " "
|
|
||||||
window_margin_width 0
|
|
||||||
confirm_os_window_close 0
|
|
||||||
show_window_resize_notification no
|
|
||||||
|
|
||||||
# cursor stuff
|
|
||||||
cursor_shape block
|
|
||||||
cursor_blink_interval 0
|
|
||||||
macos_custom_beam_cursor yes
|
|
||||||
|
|
||||||
# theme stuff
|
|
||||||
# NOTE: on linux, may want background_opacity at 1.0 and let hyprland handle transparency
|
|
||||||
include ~/.config/kitty/theme.conf
|
|
||||||
background_opacity 0.94
|
|
||||||
|
|
||||||
# etc
|
|
||||||
enable_audio_bell no
|
|
||||||
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
[ -r "$XDG_CONFIG_HOME/profile" ] && . "$XDG_CONFIG_HOME/profile"
|
|
||||||
[ -r "$XDG_CONFIG_HOME/rc" ] && . "$XDG_CONFIG_HOME/rc"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
<localRepository>${env.XDG_CACHE_HOME}/maven/repository</localRepository>
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[tools]
|
|
||||||
go = "1"
|
|
||||||
python = "3"
|
|
||||||
ruby = "3"
|
|
||||||
|
|
||||||
[settings]
|
|
||||||
idiomatic_version_file_enable_tools = ["ruby"]
|
|
||||||
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
h seek -5
|
|
||||||
l seek 5
|
|
||||||
H seek -30
|
|
||||||
L seek 30
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
screenshot-format=png
|
|
||||||
screenshot-dir="~/dbox/inbox"
|
|
||||||
screenshot-template="%F-%p-%n"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
ncmcpp_directory = "$XDG_DATA_HOME/ncmpcpp"
|
|
||||||
lyrics_directory = "$DIR_MUSIC_LISTEN/.lyrics"
|
|
||||||
mpd_music_dir = "$DIR_MUSIC_LISTEN"
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
require("settings")
|
|
||||||
require("plugin_manager")
|
|
||||||
require("key_mappings")
|
|
||||||
require("util_functions")
|
|
||||||
require("auto_commands")
|
|
||||||
ThemeUpdate()
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
return {
|
|
||||||
cmd = { 'clangd' },
|
|
||||||
root_markers = { '.clangd', 'compile_commands.json' },
|
|
||||||
filetypes = { 'c', 'cpp' },
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
return {
|
|
||||||
cmd = { "ruby-lsp" },
|
|
||||||
filetypes = { "ruby", "eruby" },
|
|
||||||
root_markers = { "Gemfile", ".git" },
|
|
||||||
init_options = { formatter = "auto" },
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
local autoCmdGroup = vim.api.nvim_create_augroup("autoCmdGroup", { clear = true })
|
|
||||||
local autoCmd = vim.api.nvim_create_autocmd
|
|
||||||
|
|
||||||
-- trim trailing whitespace on save
|
|
||||||
autoCmd({"BufWritePre"}, {
|
|
||||||
group = autoCmdGroup,
|
|
||||||
pattern = "*",
|
|
||||||
command = [[%s/\s\+$//e]],
|
|
||||||
})
|
|
||||||
|
|
||||||
-- adjust indent spacing for html files
|
|
||||||
autoCmd({"FileType"}, {
|
|
||||||
group = autoCmdGroup,
|
|
||||||
pattern = "html",
|
|
||||||
callback = function()
|
|
||||||
vim.opt_local.shiftwidth = 2
|
|
||||||
vim.opt_local.tabstop = 2
|
|
||||||
vim.opt_local.softtabstop = 2
|
|
||||||
end
|
|
||||||
})
|
|
||||||
@@ -1,185 +0,0 @@
|
|||||||
local kmGroup = vim.api.nvim_create_augroup("KeymappingsGroup", { clear = true })
|
|
||||||
local kmgAutocmd = vim.api.nvim_create_autocmd
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------
|
|
||||||
-- core
|
|
||||||
|
|
||||||
-- explore the directory of the current file (using netrw)
|
|
||||||
vim.keymap.set("n", "<leader>n", vim.cmd.Ex)
|
|
||||||
|
|
||||||
-- move visually-selected lines up or down
|
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv")
|
|
||||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv")
|
|
||||||
|
|
||||||
-- add extra vertical padding for the cursor after half-page jumps
|
|
||||||
vim.keymap.set("n", "<C-d>", "<C-d>4<C-e>")
|
|
||||||
vim.keymap.set("n", "<C-u>", "<C-u>4<C-y>")
|
|
||||||
|
|
||||||
-- open folds when iterating search results
|
|
||||||
vim.keymap.set("n", "n", "nzv")
|
|
||||||
vim.keymap.set("n", "N", "Nzv")
|
|
||||||
|
|
||||||
-- maintain cursor position after paragraph formatting
|
|
||||||
vim.keymap.set("n", "=ap", "mF=ap'F")
|
|
||||||
|
|
||||||
-- replace selected text, keep main register
|
|
||||||
vim.keymap.set("x", "<leader>P", [["_dP]])
|
|
||||||
|
|
||||||
-- shortcuts for using + register (system clipboard)
|
|
||||||
vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
|
|
||||||
vim.keymap.set("n", "<leader>Y", [["+Y]])
|
|
||||||
vim.keymap.set({ "n", "v" }, "<leader>d", [["+d]])
|
|
||||||
vim.keymap.set("n", "<leader>D", [["+D]])
|
|
||||||
vim.keymap.set("n", "<leader>p", [["+p]])
|
|
||||||
|
|
||||||
-- search-and-replace shortcuts
|
|
||||||
vim.keymap.set("n", "<leader>rw", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
|
|
||||||
vim.keymap.set("n", "<leader>ra", [[:%s//gc<Left><Left><Left>]])
|
|
||||||
|
|
||||||
-- toggle expandtab and show message
|
|
||||||
vim.keymap.set("n", "<leader>tab", function() ToggleTabsSpaces() end)
|
|
||||||
|
|
||||||
-- open scratch/tmp buffers which won't prompt for file-save
|
|
||||||
vim.keymap.set("n", "<leader>ss", function() TmpBuff("enew") end)
|
|
||||||
vim.keymap.set("n", "<leader>sl", function() TmpBuff("vnew") end)
|
|
||||||
vim.keymap.set("n", "<leader>sj", function() TmpBuff("new") end)
|
|
||||||
|
|
||||||
-- quicker switching between panes/splits
|
|
||||||
vim.keymap.set("n", "<C-h>", [[<C-w>h]])
|
|
||||||
vim.keymap.set("n", "<C-j>", [[<C-w>j]])
|
|
||||||
vim.keymap.set("n", "<C-k>", [[<C-w>k]])
|
|
||||||
vim.keymap.set("n", "<C-l>", [[<C-w>l]])
|
|
||||||
kmgAutocmd('FileType', {
|
|
||||||
group = kmGroup,
|
|
||||||
pattern = "netrw",
|
|
||||||
callback = function()
|
|
||||||
vim.keymap.set("n", "<C-h>", [[<C-w>h]], { remap = true, buffer = true })
|
|
||||||
vim.keymap.set("n", "<C-j>", [[<C-w>j]], { remap = true, buffer = true })
|
|
||||||
vim.keymap.set("n", "<C-k>", [[<C-w>k]], { remap = true, buffer = true })
|
|
||||||
vim.keymap.set("n", "<C-l>", [[<C-w>l]], { remap = true, buffer = true })
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------
|
|
||||||
-- visual/ui-related toggles and shortcuts
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>vl", function() ToggleCursorLine() end)
|
|
||||||
vim.keymap.set("n", "<leader>vc", function() ToggleColorColumn('90') end)
|
|
||||||
vim.keymap.set("n", "<leader>vn", function() ToggleLineNumbers() end)
|
|
||||||
vim.keymap.set("n", "<leader>vw", function() ToggleWritingMode() end)
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------
|
|
||||||
-- quickfix and location lists
|
|
||||||
-- ref: :h quickfix or :h location-list
|
|
||||||
-- NOTE: look at :h setqflist and :h vim.diagnostic.setqflist()
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>qo", "<cmd>copen<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>qc", "<cmd>cclose<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>qn", "<cmd>cnext<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>qp", "<cmd>cprev<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>ln", "<cmd>lnext<CR>")
|
|
||||||
vim.keymap.set("n", "<leader>lp", "<cmd>lprev<CR>")
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------
|
|
||||||
-- debugger and debugging ui
|
|
||||||
|
|
||||||
local dap = require("dap")
|
|
||||||
vim.keymap.set("n", "<leader>bc", dap.continue, { desc = "debug: continue" })
|
|
||||||
vim.keymap.set("n", "<leader>bi", dap.step_into, { desc = "debug: step into" })
|
|
||||||
vim.keymap.set("n", "<leader>bo", dap.step_over, { desc = "debug: step over" })
|
|
||||||
vim.keymap.set("n", "<leader>bu", dap.step_out, { desc = "debug: step out" })
|
|
||||||
vim.keymap.set("n", "<leader>blb", dap.list_breakpoints, { desc = "debug: list breakpoints" })
|
|
||||||
vim.keymap.set("n", "<leader>bt", dap.toggle_breakpoint, { desc = "debug: toggle breakpoint" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>bB", function()
|
|
||||||
dap.set_breakpoint(vim.fn.input("breakpoint condition: "))
|
|
||||||
end, { desc = "debug: set conditional breakpoint" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>bv", function()
|
|
||||||
require("nvim-dap-virtual-text").toggle()
|
|
||||||
end, { desc = "debug: toggle virtual text" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>bq", function()
|
|
||||||
dap.terminate() require("dapui").close() require("nvim-dap-virtual-text").disable()
|
|
||||||
end, { desc = "debug: quit debugger" })
|
|
||||||
|
|
||||||
-- TODO: decide if i want these or others, add if so
|
|
||||||
-- vim.keymap.set("n", "<leader>zxcv", dap.repl.open, { desc = "open REPL" })
|
|
||||||
-- vim.keymap.set("n", "<leader>zxcv", dap.run_last, { desc = "run last" })
|
|
||||||
-- vim.keymap.set("n", "<leader>zxcv", dap.set_exception_breakpoints({ "all" }), { desc = "set exception breakpoints" })
|
|
||||||
-- local dapWidgets = require('dap.ui.widgets')
|
|
||||||
-- vim.keymap.set({'n', 'v'}, '<leader>zxcv', dapWidgets.hover)
|
|
||||||
-- vim.keymap.set({'n', 'v'}, '<leader>zxcv', dapWidgets.preview)
|
|
||||||
-- vim.keymap.set('n', '<leader>zxcv', function() dapWidgets.centered_float(dapWidgets.frames) end)
|
|
||||||
-- vim.keymap.set('n', '<leader>zxcv', function() dapWidgets.centered_float(dapWidgets.scopes) end)
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------
|
|
||||||
-- lsp
|
|
||||||
|
|
||||||
kmgAutocmd('LspAttach', {
|
|
||||||
group = kmGroup,
|
|
||||||
callback = function(e)
|
|
||||||
local opts = { buffer = e.buf }
|
|
||||||
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
|
|
||||||
vim.keymap.set("n", "<leader>lh", function() vim.lsp.buf.hover() end, opts)
|
|
||||||
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
|
||||||
vim.keymap.set("n", "<leader>lv", function() vim.diagnostic.open_float() end, opts)
|
|
||||||
vim.keymap.set("n", "<leader>lq", function() vim.diagnostic.setqflist() end, opts)
|
|
||||||
-- TODO: learn what the below commands are and if i want to set keymaps for them
|
|
||||||
-- vim.keymap.set("n", "<leader>lws", function() vim.lsp.buf.workspace_symbol() end, opts)
|
|
||||||
-- vim.keymap.set("n", "<leader>lca", function() vim.lsp.buf.code_action() end, opts)
|
|
||||||
-- vim.keymap.set("n", "<leader>lrl", function() vim.lsp.buf.references() end, opts)
|
|
||||||
-- vim.keymap.set("n", "<leader>lrn", function() vim.lsp.buf.rename() end, opts)
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------------------
|
|
||||||
-- plugins
|
|
||||||
|
|
||||||
-- telescope
|
|
||||||
local tscBuiltin = require('telescope.builtin')
|
|
||||||
local custom_grep_str_w_regex = function()
|
|
||||||
tscBuiltin.grep_string({ search = vim.fn.input("grep > "), use_regex = true, additional_args = "-i", })
|
|
||||||
end
|
|
||||||
vim.keymap.set('n', '<leader>ft', tscBuiltin.live_grep, { desc = 'tscope find text, live_grep' })
|
|
||||||
vim.keymap.set('n', '<leader>fT', custom_grep_str_w_regex, { desc = 'tscope find text, static grep w/regex' })
|
|
||||||
vim.keymap.set('n', '<leader>ff', tscBuiltin.find_files, { desc = 'tscope find files' })
|
|
||||||
vim.keymap.set('n', '<leader>fg', tscBuiltin.git_files, { desc = 'tscope find git-tracked files' })
|
|
||||||
vim.keymap.set('n', '<leader>fb', tscBuiltin.buffers, { desc = 'tscope buffers' })
|
|
||||||
vim.keymap.set('n', '<leader>fh', tscBuiltin.help_tags, { desc = 'tscope help tags' })
|
|
||||||
-- TODO: maybe add commands:
|
|
||||||
-- - find files including git-ignored (that is, have both a yes and no option)
|
|
||||||
-- - grep files including git-ignored (that is, have both a yes and no option)
|
|
||||||
-- - grep which supports fuzzy-find, unless performance is horrendous
|
|
||||||
|
|
||||||
-- harpoon
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
vim.keymap.set("n", "<leader>hl", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
|
|
||||||
vim.keymap.set("n", "<leader>ha", function() harpoon:list():add() end)
|
|
||||||
vim.keymap.set("n", "<leader>hA", function() harpoon:list():prepend() end)
|
|
||||||
vim.keymap.set("n", "<leader>hn", function() harpoon:list():next() end)
|
|
||||||
vim.keymap.set("n", "<leader>hp", function() harpoon:list():prev() end)
|
|
||||||
for i = 1, 10, 1 do
|
|
||||||
vim.keymap.set("n", "<leader>" .. (i % 10), function() harpoon:list():select(i) end)
|
|
||||||
vim.keymap.set("n", "<leader>h" .. (i % 10), function() harpoon:list():replace_at(i) end)
|
|
||||||
end
|
|
||||||
|
|
||||||
--- fugitive (git integration)
|
|
||||||
vim.keymap.set("n", "<leader>gg", ":Git ") -- shortcut, arbitrary git commands
|
|
||||||
vim.keymap.set("n", "<leader>ga", function() vim.cmd.Git({ "add %"}) end)
|
|
||||||
vim.keymap.set("n", "<leader>gl", function() vim.cmd.Git({ "log"}) end)
|
|
||||||
vim.keymap.set("n", "<leader>gs", function() vim.cmd.Git({ "-p status" }) end)
|
|
||||||
vim.keymap.set("n", "<leader>gc", function() vim.cmd.Git({ "commit -a" }) end)
|
|
||||||
|
|
||||||
-- undotree
|
|
||||||
vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
|
|
||||||
|
|
||||||
-- conform (formatter)
|
|
||||||
vim.keymap.set("n", "<leader>fmt", function()
|
|
||||||
require("conform").format({ bufnr = 0 })
|
|
||||||
end)
|
|
||||||
|
|
||||||
-- obisdian / notes
|
|
||||||
vim.keymap.set("n", "<leader>oo", function() vim.cmd("Obsidian open") end)
|
|
||||||
vim.keymap.set("n", "<leader>ot", "o- [ ] ")
|
|
||||||
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
local path_lazy_nvim = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
|
||||||
if not vim.loop.fs_stat(path_lazy_nvim) then
|
|
||||||
local git_output = vim.fn.system({
|
|
||||||
"git",
|
|
||||||
"clone",
|
|
||||||
"--filter=blob:none",
|
|
||||||
"https://github.com/folke/lazy.nvim.git",
|
|
||||||
"--branch=stable",
|
|
||||||
path_lazy_nvim,
|
|
||||||
})
|
|
||||||
if vim.v.shell_error ~= 0 then
|
|
||||||
vim.api.nvim_echo(
|
|
||||||
{ { "Failed to clone lazy.nvim:\n" }, { git_output }, },
|
|
||||||
true,
|
|
||||||
{}
|
|
||||||
)
|
|
||||||
vim.fn.getchar()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
vim.opt.rtp:prepend(path_lazy_nvim)
|
|
||||||
|
|
||||||
require("lazy").setup({
|
|
||||||
spec = {
|
|
||||||
{ import = "plugins_lazy" },
|
|
||||||
},
|
|
||||||
checker = { enabled = false },
|
|
||||||
change_detection = { notify = false },
|
|
||||||
})
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
return {
|
|
||||||
'stevearc/conform.nvim',
|
|
||||||
opts = {},
|
|
||||||
config = function()
|
|
||||||
require("conform").setup({
|
|
||||||
formatters_by_ft = {
|
|
||||||
-- c = { "fill-in" },
|
|
||||||
-- cpp = { "fill-in" },
|
|
||||||
go = { "gofmt" },
|
|
||||||
lua = { "stylua" },
|
|
||||||
ruby = { "standardrb" },
|
|
||||||
python = { "black" },
|
|
||||||
javascript = { "prettier" },
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,123 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"mfussenegger/nvim-dap",
|
|
||||||
config = function()
|
|
||||||
local dap = require("dap")
|
|
||||||
dap.set_log_level("DEBUG")
|
|
||||||
|
|
||||||
-- dap.adapters.codelldb = {
|
|
||||||
-- type = "executable",
|
|
||||||
-- command = "codelldb",
|
|
||||||
-- }
|
|
||||||
|
|
||||||
local dapConfigArgsInput = function()
|
|
||||||
return vim.split(vim.fn.input("args: "), " ")
|
|
||||||
end
|
|
||||||
|
|
||||||
local dapConfigProgramSelect = function()
|
|
||||||
local co = coroutine.running()
|
|
||||||
|
|
||||||
require('telescope.pickers').new({}, {
|
|
||||||
prompt_title = "debug executable",
|
|
||||||
finder = require('telescope.finders').new_oneshot_job({
|
|
||||||
"find", ".", "-type", "f", "-perm", "+100", "-exec", "realpath", "{}", "+"
|
|
||||||
}),
|
|
||||||
sorter = require('telescope.sorters').get_fuzzy_file(),
|
|
||||||
attach_mappings = function(prompt_bufnr, _map)
|
|
||||||
local tscopeActions = require('telescope.actions')
|
|
||||||
tscopeActions.select_default:replace(function()
|
|
||||||
tscopeActions.close(prompt_bufnr)
|
|
||||||
local chosenFile = require('telescope.actions.state').get_selected_entry().value
|
|
||||||
coroutine.resume(co, chosenFile)
|
|
||||||
end)
|
|
||||||
return true
|
|
||||||
end,
|
|
||||||
}):find()
|
|
||||||
|
|
||||||
return coroutine.yield()
|
|
||||||
end
|
|
||||||
|
|
||||||
dap.configurations.cpp = {
|
|
||||||
{
|
|
||||||
name = "default c/cpp: launch",
|
|
||||||
type = "codelldb",
|
|
||||||
request = "launch",
|
|
||||||
cwd = "${workspaceFolder}",
|
|
||||||
program = dapConfigProgramSelect,
|
|
||||||
stopOnEntry = false,
|
|
||||||
},
|
|
||||||
-- {
|
|
||||||
-- name = "default c/cpp: attach to lldbserver :1234",
|
|
||||||
-- type = "codelldb",
|
|
||||||
-- request = "attach",
|
|
||||||
-- cwd = "${workspaceFolder}",
|
|
||||||
-- program = dapConfigProgramSelect,
|
|
||||||
-- MIMode = "lldb",
|
|
||||||
-- miDebuggerServerAddress = "localhost:1234",
|
|
||||||
-- miDebuggerPath = "/usr/bin/lldb",
|
|
||||||
-- },
|
|
||||||
}
|
|
||||||
dap.configurations.c = dap.configurations.cpp
|
|
||||||
dap.configurations.go = {
|
|
||||||
{
|
|
||||||
name = "go: launch",
|
|
||||||
type = "delve",
|
|
||||||
request = "launch",
|
|
||||||
program = dapConfigProgramSelect,
|
|
||||||
args = dapConfigArgsInput,
|
|
||||||
outputMode = "remote",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name = "go: launch current file",
|
|
||||||
type = "delve",
|
|
||||||
request = "launch",
|
|
||||||
program = "${file}",
|
|
||||||
args = dapConfigArgsInput,
|
|
||||||
outputMode = "remote",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"rcarriga/nvim-dap-ui",
|
|
||||||
dependencies = {
|
|
||||||
"mfussenegger/nvim-dap",
|
|
||||||
"nvim-neotest/nvim-nio",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
local dap = require("dap")
|
|
||||||
local dap_ui = require("dapui")
|
|
||||||
dap_ui.setup()
|
|
||||||
dap.listeners.before.attach.dapui_config = function() dap_ui.open() end
|
|
||||||
dap.listeners.before.launch.dapui_config = function() dap_ui.open() end
|
|
||||||
dap.listeners.before.event_terminated.dapui_config = function() dap_ui.close() end
|
|
||||||
dap.listeners.before.event_exited.dapui_config = function() dap_ui.close() end
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"jay-babu/mason-nvim-dap.nvim", -- TODO: install here? manually outside of neovim?
|
|
||||||
dependencies = {
|
|
||||||
"williamboman/mason.nvim",
|
|
||||||
"mfussenegger/nvim-dap",
|
|
||||||
"neovim/nvim-lspconfig",
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
require("mason-nvim-dap").setup({
|
|
||||||
ensure_installed = {
|
|
||||||
-- "codelldb",
|
|
||||||
-- "delve",
|
|
||||||
},
|
|
||||||
automatic_installation = true,
|
|
||||||
handlers = {
|
|
||||||
function(config) require("mason-nvim-dap").default_setup(config) end,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"theHamsta/nvim-dap-virtual-text",
|
|
||||||
dependencies = {
|
|
||||||
"mfussenegger/nvim-dap",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
return {
|
|
||||||
{ "tpope/vim-fugitive" },
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"ThePrimeagen/harpoon",
|
|
||||||
branch = "harpoon2", -- https://github.com/ThePrimeagen/harpoon/tree/harpoon2
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
config = function()
|
|
||||||
require("harpoon"):setup({
|
|
||||||
settings = {
|
|
||||||
save_on_toggle = true,
|
|
||||||
sync_on_ui_close = true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"L3MON4D3/LuaSnip",
|
|
||||||
version = "v2.*",
|
|
||||||
-- build = "make install_jsregexp"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"neovim/nvim-lspconfig",
|
|
||||||
dependencies = {
|
|
||||||
"stevearc/conform.nvim",
|
|
||||||
"williamboman/mason.nvim",
|
|
||||||
"williamboman/mason-lspconfig.nvim",
|
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
|
||||||
"hrsh7th/cmp-buffer",
|
|
||||||
"hrsh7th/cmp-path",
|
|
||||||
"hrsh7th/cmp-cmdline",
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
"L3MON4D3/LuaSnip", -- snippets, using luasnip for now
|
|
||||||
"saadparwaiz1/cmp_luasnip", -- snippets, using luasnip for now
|
|
||||||
},
|
|
||||||
|
|
||||||
config = function()
|
|
||||||
require("conform").setup({ formatters_by_ft = {} })
|
|
||||||
local cmp = require('cmp')
|
|
||||||
local cmp_lsp = require("cmp_nvim_lsp")
|
|
||||||
local capabilities = vim.tbl_deep_extend(
|
|
||||||
"force",
|
|
||||||
{},
|
|
||||||
vim.lsp.protocol.make_client_capabilities(),
|
|
||||||
cmp_lsp.default_capabilities()
|
|
||||||
)
|
|
||||||
|
|
||||||
require("mason").setup()
|
|
||||||
require("mason-lspconfig").setup({
|
|
||||||
ensure_installed = {
|
|
||||||
"clangd",
|
|
||||||
"lua_ls",
|
|
||||||
-- "ruby_lsp",
|
|
||||||
-- "gopls",
|
|
||||||
-- "tailwindcss",
|
|
||||||
},
|
|
||||||
handlers = {
|
|
||||||
function(server_name) -- default
|
|
||||||
require("lspconfig")[server_name].setup {
|
|
||||||
capabilities = capabilities
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
|
|
||||||
["lua_ls"] = function()
|
|
||||||
local lspconfig = require("lspconfig")
|
|
||||||
lspconfig.lua_ls.setup {
|
|
||||||
capabilities = capabilities,
|
|
||||||
settings = {
|
|
||||||
Lua = {
|
|
||||||
format = {
|
|
||||||
enable = true,
|
|
||||||
defaultConfig = { -- NOTE: string values only
|
|
||||||
indent_style = "space",
|
|
||||||
indent_size = "2",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
|
||||||
cmp.setup({
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
|
||||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
|
||||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
|
||||||
['<C-u>'] = cmp.mapping.scroll_docs(4),
|
|
||||||
}),
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
-- vim.snippet.expand(args.body) -- TODO: native option, maybe try
|
|
||||||
require('luasnip').lsp_expand(args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
{ name = 'nvim_lsp' },
|
|
||||||
{ name = 'luasnip' },
|
|
||||||
}, {
|
|
||||||
{ name = 'buffer' },
|
|
||||||
}),
|
|
||||||
window = {
|
|
||||||
-- maybe `cmp.config.window.bordered()` for completion & documentation
|
|
||||||
completion = { border = 'single' },
|
|
||||||
documentation = { border = 'single' },
|
|
||||||
},
|
|
||||||
performance = {
|
|
||||||
max_view_entries = 14,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- `/` cmdline setup.
|
|
||||||
cmp.setup.cmdline(':', {
|
|
||||||
mapping = cmp.mapping.preset.cmdline(),
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
{ name = 'path' }
|
|
||||||
}, {
|
|
||||||
{ name = 'cmdline' }
|
|
||||||
}),
|
|
||||||
matching = { disallow_symbol_nonprefix_matching = false }
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.diagnostic.config({
|
|
||||||
-- update_in_insert = true,
|
|
||||||
float = {
|
|
||||||
focusable = false,
|
|
||||||
style = "minimal",
|
|
||||||
border = "rounded",
|
|
||||||
source = "always",
|
|
||||||
header = "",
|
|
||||||
prefix = "",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- TODO: needed? seems like neovim/nvim-lspconfig covers by default
|
|
||||||
-- vim.lsp.enable('clangd')
|
|
||||||
-- vim.lsp.enable('ruby_lsp')
|
|
||||||
-- vim.lsp.enable('standardrb')
|
|
||||||
-- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"obsidian-nvim/obsidian.nvim",
|
|
||||||
version = "*", -- '*' for latest release, not latest commit
|
|
||||||
ft = "markdown",
|
|
||||||
opts = {
|
|
||||||
footer = {
|
|
||||||
enabled = false,
|
|
||||||
},
|
|
||||||
frontmatter = {
|
|
||||||
enabled = false,
|
|
||||||
},
|
|
||||||
legacy_commands = false,
|
|
||||||
new_notes_location = os.getenv("DIR_NOTES") .. "/inbox",
|
|
||||||
ui = {
|
|
||||||
enable = false,
|
|
||||||
},
|
|
||||||
workspaces = {
|
|
||||||
{
|
|
||||||
name = "notes",
|
|
||||||
path = os.getenv("DIR_NOTES"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
return {
|
|
||||||
"nvim-telescope/telescope.nvim",
|
|
||||||
tag = "0.1.8",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
opts = {
|
|
||||||
defaults = {
|
|
||||||
layout_strategy = "vertical",
|
|
||||||
layout_config = {
|
|
||||||
horizontal = {
|
|
||||||
width = 0.98,
|
|
||||||
height = 0.98,
|
|
||||||
preview_width = 0.45,
|
|
||||||
},
|
|
||||||
vertical = {
|
|
||||||
width = 0.98,
|
|
||||||
height = 0.98,
|
|
||||||
preview_height = 0.55,
|
|
||||||
preview_cutoff = 14,
|
|
||||||
prompt_position = 'bottom',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
path_display = { "truncate", },
|
|
||||||
},
|
|
||||||
pickers = {
|
|
||||||
find_files = {
|
|
||||||
find_command = {
|
|
||||||
"rg", "--hidden", "--files", -- "--no-ignore",
|
|
||||||
"-g", "!**/.git/**",
|
|
||||||
"-g", "!**/build/**",
|
|
||||||
"-g", "!**/node_modules/**",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
live_grep = {
|
|
||||||
additional_args = {
|
|
||||||
"--hidden", "--no-binary", -- "--no-ignore",
|
|
||||||
"-g", "!**/.git/**",
|
|
||||||
"-g", "!**/build/**",
|
|
||||||
"-g", "!**/node_modules/**",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"tiagovla/tokyodark.nvim",
|
|
||||||
lazy = false,
|
|
||||||
priority = 1000,
|
|
||||||
opts = {
|
|
||||||
custom_highlights = function(highlights, palette)
|
|
||||||
highlights.Comment['fg'] = "#8a9097"
|
|
||||||
highlights.LineNr['fg'] = "#8088A8"
|
|
||||||
highlights.Visual['bg'] = palette.bg3
|
|
||||||
return highlights
|
|
||||||
end,
|
|
||||||
gamma = 0.92, -- brightness
|
|
||||||
styles = {
|
|
||||||
comments = { italic = true },
|
|
||||||
keywords = { italic = false },
|
|
||||||
identifiers = { italic = false },
|
|
||||||
functions = {},
|
|
||||||
variables = {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'ribru17/bamboo.nvim',
|
|
||||||
config = function()
|
|
||||||
require('bamboo').setup { }
|
|
||||||
require('bamboo').load()
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
dir = vim.fn.stdpath("config") .. "/themes/pina",
|
|
||||||
name = "pina",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'steve-lohmeyer/mars.nvim',
|
|
||||||
name = 'mars',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"ellisonleao/gruvbox.nvim",
|
|
||||||
name = "gruvbox",
|
|
||||||
opts = {
|
|
||||||
terminal_colors = true, -- add neovim terminal colors
|
|
||||||
undercurl = true,
|
|
||||||
underline = true,
|
|
||||||
bold = true,
|
|
||||||
italic = {
|
|
||||||
strings = true,
|
|
||||||
emphasis = true,
|
|
||||||
comments = true,
|
|
||||||
operators = false,
|
|
||||||
folds = true,
|
|
||||||
},
|
|
||||||
strikethrough = true,
|
|
||||||
invert_selection = false,
|
|
||||||
invert_signs = false,
|
|
||||||
invert_tabline = false,
|
|
||||||
inverse = true, -- invert background for search, diffs, statuslines and errors
|
|
||||||
contrast = "", -- "hard", "soft", or ""
|
|
||||||
palette_overrides = {},
|
|
||||||
overrides = {},
|
|
||||||
dim_inactive = false,
|
|
||||||
transparent_mode = false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
-- even if not connected to a zz-this-box theme, keep this for nvim diffthis
|
|
||||||
"rose-pine/neovim",
|
|
||||||
name = "rose-pine",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folke/tokyonight.nvim",
|
|
||||||
opts = {
|
|
||||||
style = "night", -- "night", "storm", "moon", "day"
|
|
||||||
styles = {
|
|
||||||
functions = {} -- disable italic for functions
|
|
||||||
},
|
|
||||||
on_colors = function(colors)
|
|
||||||
colors.hint = colors.orange
|
|
||||||
colors.error = "#ff0000"
|
|
||||||
colors.fg_gutter = "#9098B8"
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"nvim-treesitter/nvim-treesitter",
|
|
||||||
lazy = false,
|
|
||||||
build = ":TSUpdate",
|
|
||||||
config = function()
|
|
||||||
require("nvim-treesitter.configs").setup({
|
|
||||||
ensure_installed = {
|
|
||||||
"vimdoc", "bash", "lua", "c", "cpp", "go", "python", "ruby",
|
|
||||||
"html", "css", "javascript", "jsdoc", "sql", "json", "yaml",
|
|
||||||
"markdown", "markdown_inline",
|
|
||||||
-- "odin", "zig", "ocaml", "java", "typescript",
|
|
||||||
},
|
|
||||||
sync_install = false, -- install `ensure_installed` parsers synchronously
|
|
||||||
auto_install = true, -- install missing on BufEnter, requires tree-sitter CLI
|
|
||||||
ignore_install = {
|
|
||||||
"csv",
|
|
||||||
},
|
|
||||||
indent = { enable = true },
|
|
||||||
highlight = {
|
|
||||||
enable = true, -- `false` will disable the whole extension
|
|
||||||
disable = function(lang, buf)
|
|
||||||
for i, v in ipairs({ "html", "csv", }) do
|
|
||||||
if lang == v then
|
|
||||||
print("treesitter disabled for this language")
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
|
||||||
if ok and stats and stats.size > (100 * 1024) then -- 100 KB
|
|
||||||
vim.notify(
|
|
||||||
"larger file, treesitter disabled for performance",
|
|
||||||
vim.log.levels.WARN,
|
|
||||||
{title = "Treesitter"}
|
|
||||||
)
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
-- true, false, or list of langs; may cause slowness or duplicate highlights
|
|
||||||
additional_vim_regex_highlighting = { "markdown" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- TODO: decide if needed/wanted
|
|
||||||
-- local treesitter_parser_config = require("nvim-treesitter.parsers").get_parser_configs()
|
|
||||||
-- treesitter_parser_config.templ = {
|
|
||||||
-- install_info = {
|
|
||||||
-- url = "https://github.com/vrischmann/tree-sitter-templ.git",
|
|
||||||
-- files = {"src/parser.c", "src/scanner.c"},
|
|
||||||
-- branch = "master",
|
|
||||||
-- },
|
|
||||||
-- }
|
|
||||||
-- vim.treesitter.language.register("templ", "templ")
|
|
||||||
end
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
return {
|
|
||||||
"mbbill/undotree",
|
|
||||||
config = function()
|
|
||||||
vim.g.undotree_SplitWidth = 41
|
|
||||||
vim.g.undotree_DiffpanelHeight = 14
|
|
||||||
end,
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
vim.g.mapleader = " "
|
|
||||||
|
|
||||||
vim.opt.hlsearch = true
|
|
||||||
vim.opt.incsearch = true
|
|
||||||
|
|
||||||
vim.opt.termguicolors = true
|
|
||||||
vim.opt.scrolloff = 2
|
|
||||||
vim.opt.colorcolumn = '' -- default to off, see keymapping shortcut to toggle
|
|
||||||
vim.opt.signcolumn = "yes" -- "auto", "yes", "no", "number"
|
|
||||||
vim.opt.laststatus = 2
|
|
||||||
vim.opt.splitright = true
|
|
||||||
vim.opt.splitbelow = true
|
|
||||||
vim.opt.number = true
|
|
||||||
vim.opt.relativenumber = true
|
|
||||||
vim.opt.cursorline = true
|
|
||||||
vim.opt.cursorlineopt = "both"
|
|
||||||
vim.opt.smartindent = true
|
|
||||||
|
|
||||||
vim.opt.wrap = true
|
|
||||||
vim.opt.textwidth = 0
|
|
||||||
vim.opt.wrapmargin = 0
|
|
||||||
vim.opt.fillchars = { eob = ' ' }
|
|
||||||
|
|
||||||
vim.opt.conceallevel = 0
|
|
||||||
|
|
||||||
vim.opt.spell = false
|
|
||||||
vim.opt.spelllang = 'en_us'
|
|
||||||
|
|
||||||
vim.opt.errorbells = false
|
|
||||||
vim.opt.visualbell = false
|
|
||||||
|
|
||||||
vim.opt.updatetime = 1000
|
|
||||||
|
|
||||||
vim.opt.tabstop = 4
|
|
||||||
vim.opt.softtabstop = 4
|
|
||||||
vim.opt.shiftwidth = 4
|
|
||||||
vim.opt.expandtab = true
|
|
||||||
|
|
||||||
vim.opt.backup = false
|
|
||||||
vim.opt.swapfile = false
|
|
||||||
vim.opt.undodir = os.getenv("XDG_DATA_HOME") .. "/nvim/undodir"
|
|
||||||
vim.opt.undofile = true
|
|
||||||
|
|
||||||
-- netrw settings
|
|
||||||
vim.g.netrw_browse_split = 0
|
|
||||||
vim.g.netrw_preview = 1
|
|
||||||
vim.g.netrw_banner = 0
|
|
||||||
vim.g.netrw_winsize = 50
|
|
||||||
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
local hl_properties = {
|
|
||||||
"Normal", "NormalFloat", "FloatBorder", "Pmenu", "Terminal", "EndOfBuffer",
|
|
||||||
"FoldColumn", "Folded", "SignColumn", "NormalNC", "WhichKeyFloat", "TelescopeBorder",
|
|
||||||
"TelescopeNormal", "TelescopePromptBorder", "TelescopePromptTitle", "NotifyINFOBody",
|
|
||||||
"NotifyERRORBody", "NotifyWARNBody", "NotifyTRACEBody", "NotifyDEBUGBody",
|
|
||||||
"NotifyINFOTitle", "NotifyERRORTitle", "NotifyWARNTitle", "NotifyTRACETitle",
|
|
||||||
"NotifyDEBUGTitle", "NotifyINFOBorder", "NotifyERRORBorder", "NotifyWARNBorder",
|
|
||||||
"NotifyTRACEBorder", "NotifyDEBUGBorder",
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, v in ipairs(hl_properties) do
|
|
||||||
vim.api.nvim_set_hl(0, v, { bg = "none" })
|
|
||||||
end
|
|
||||||
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
function ThemeUpdate()
|
|
||||||
local scheme_name = "tokyodark" -- default if unable to parse from file
|
|
||||||
local current_theme_file = vim.fn.stdpath("config") .. "/current-theme"
|
|
||||||
local ok, theme = pcall(dofile, current_theme_file)
|
|
||||||
if ok then
|
|
||||||
scheme_name = theme.colorscheme_name
|
|
||||||
end
|
|
||||||
vim.cmd.colorscheme(scheme_name)
|
|
||||||
pcall(dofile, vim.fn.stdpath('config') .. '/lua/theme_transparency.lua')
|
|
||||||
end
|
|
||||||
|
|
||||||
function TmpBuff(split_opt)
|
|
||||||
local new_cmd = split_opt or "enew"
|
|
||||||
vim.cmd(new_cmd)
|
|
||||||
vim.opt_local.buftype = "nofile"
|
|
||||||
vim.opt_local.bufhidden = "hide"
|
|
||||||
vim.opt_local.swapfile = false
|
|
||||||
vim.cmd("file tmp_" .. os.date("%Y%m%d_%H%M%S") .. "_" .. math.random(471))
|
|
||||||
end
|
|
||||||
|
|
||||||
function ReadShellCmd(command)
|
|
||||||
vim.cmd("read !" .. command)
|
|
||||||
end
|
|
||||||
|
|
||||||
function ToggleTabsSpaces()
|
|
||||||
if vim.opt.expandtab:get() then
|
|
||||||
vim.opt.expandtab = false
|
|
||||||
print("using actual tabs")
|
|
||||||
else
|
|
||||||
vim.opt.expandtab = true
|
|
||||||
print("using spaces in place of tabs")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function ToggleLineNumbers()
|
|
||||||
if vim.opt.number:get() then
|
|
||||||
vim.opt.number = false
|
|
||||||
vim.opt.relativenumber = false
|
|
||||||
else
|
|
||||||
vim.opt.number = true
|
|
||||||
vim.opt.relativenumber = true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function ToggleColorColumn(column_string)
|
|
||||||
if #vim.opt.colorcolumn:get() == 0 then
|
|
||||||
vim.opt.colorcolumn = (column_string or '90')
|
|
||||||
else
|
|
||||||
vim.opt.colorcolumn = ''
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function ToggleCursorLine()
|
|
||||||
vim.opt.cursorline = (not vim.opt.cursorline:get())
|
|
||||||
end
|
|
||||||
|
|
||||||
local function EnableWritingModeUiForCurrentWindow()
|
|
||||||
vim.opt_local.number = false
|
|
||||||
vim.opt_local.relativenumber = false
|
|
||||||
vim.opt_local.colorcolumn = ''
|
|
||||||
vim.opt_local.signcolumn = "no"
|
|
||||||
vim.opt_local.cursorline = false
|
|
||||||
vim.opt_local.winfixwidth = true
|
|
||||||
-- vim.opt_local.wrap = true -- TODO: needed?
|
|
||||||
vim.opt_local.laststatus = 0
|
|
||||||
end
|
|
||||||
|
|
||||||
function ToggleWritingMode()
|
|
||||||
if vim.g.writing_mode then
|
|
||||||
vim.g.writing_mode = false
|
|
||||||
|
|
||||||
vim.api.nvim_set_hl(0, 'WinSeparator', vim.g.wrmode_prev_hl_winsep or {})
|
|
||||||
vim.opt_local.winfixwidth = false
|
|
||||||
vim.cmd("wincmd l")
|
|
||||||
vim.api.nvim_win_close(0, false)
|
|
||||||
vim.cmd("wincmd h")
|
|
||||||
vim.api.nvim_win_close(0, false)
|
|
||||||
|
|
||||||
vim.opt_local.number = true
|
|
||||||
vim.opt_local.relativenumber = true
|
|
||||||
vim.opt_local.signcolumn = "yes"
|
|
||||||
vim.opt_local.cursorline = true
|
|
||||||
vim.api.nvim_set_hl(0, 'SpellCap', vim.g.wrmode_prev_hl_spellcap or {})
|
|
||||||
vim.opt_local.spell = false
|
|
||||||
-- vim.opt_local.wrap = true -- TODO: needed?
|
|
||||||
vim.opt_local.textwidth = 0
|
|
||||||
vim.opt_local.scrolloff = 2
|
|
||||||
vim.opt_local.formatoptions:remove('t')
|
|
||||||
vim.opt_local.laststatus = 0
|
|
||||||
-- vim.cmd("vertical resize")
|
|
||||||
else
|
|
||||||
vim.g.writing_mode = true
|
|
||||||
|
|
||||||
vim.g.wrmode_prev_hl_winsep = vim.api.nvim_get_hl(0, { name = 'WinSeparator' })
|
|
||||||
vim.api.nvim_set_hl(0, 'WinSeparator', { bg = 'none', fg = '#000000' })
|
|
||||||
local window_width = 72
|
|
||||||
local window_padding = math.max(math.floor((vim.o.columns - window_width) / 2), 1)
|
|
||||||
vim.cmd("vsplit")
|
|
||||||
local writing_pane = vim.api.nvim_get_current_win()
|
|
||||||
EnableWritingModeUiForCurrentWindow()
|
|
||||||
vim.opt_local.spell = true
|
|
||||||
vim.g.wrmode_prev_hl_spellcap = vim.api.nvim_get_hl(0, { name = 'SpellCap' })
|
|
||||||
vim.api.nvim_set_hl(0, 'SpellCap', {})
|
|
||||||
vim.opt_local.textwidth = window_width
|
|
||||||
vim.opt_local.scrolloff = 14
|
|
||||||
vim.opt_local.formatoptions:append('t')
|
|
||||||
vim.cmd("wincmd h")
|
|
||||||
TmpBuff('enew')
|
|
||||||
local padding_pane_left = vim.api.nvim_get_current_win()
|
|
||||||
EnableWritingModeUiForCurrentWindow()
|
|
||||||
vim.cmd("wincmd l")
|
|
||||||
TmpBuff('vnew')
|
|
||||||
local padding_pane_right = vim.api.nvim_get_current_win()
|
|
||||||
EnableWritingModeUiForCurrentWindow()
|
|
||||||
vim.api.nvim_set_current_win(writing_pane)
|
|
||||||
|
|
||||||
vim.api.nvim_win_set_width(padding_pane_left, window_padding)
|
|
||||||
vim.api.nvim_win_set_width(padding_pane_right, window_padding)
|
|
||||||
vim.api.nvim_win_set_width(writing_pane, window_width)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# this file is just here to easily allow committing this directory to git
|
|
||||||
# the imported themes are copied here when ./copy_dotfiles.sh is run
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user