anthonycicc/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Wiki Activity

Compare commits

base: anthonycicc:master
Branches Tags
anthonycicc:master
anthonycicc:push-uumomoqkvuvl
anthonycicc:doom-emacs
anthonycicc:zsh
..
compare: anthonycicc:zsh
Branches Tags
anthonycicc:master
anthonycicc:push-uumomoqkvuvl
anthonycicc:doom-emacs
anthonycicc:zsh

1 commit
master ... zsh

Author SHA1 Message Date
Anthony Cicchetti
6ea9a32d11 Initialisms 2023-07-15 15:24:50 -04:00
48 changed files with 1480 additions and 4701 deletions
Show stats Expand all files Collapse all files

11
.envrc
View file

@ -1,10 +1,11 @@
if ! has nix_direnv_version || ! nix_direnv_version 3.0.5; then if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=" source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
fi fi
watch_file flake.nix nix_direnv_watch_file devenv.nix
watch_file flake.lock nix_direnv_watch_file devenv.lock
nix_direnv_watch_file devenv.yaml
if ! use flake . --impure if ! use flake . --impure
then then
echo "devenv could not be build. The devenv environment was not loaded. Make the necessary changes to flake.nix and hit enter to try again." >&2 echo "devenv could not be build. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
fi fi

4
TODO.md
View file

@ -1 +1,3 @@
Lay down ssh_config with list of my_domains pointing to 1password agent socket 🗹 Use [Delta](https://github.com/dandavison/delta)
❎ Convert to [Home-Manager](https://github.com/rycee/home-manager)

283
alacritty/alacritty.yml
View file

@ -4,13 +4,13 @@
# environment variables. Some entries may override variables # environment variables. Some entries may override variables
# set by alacritty itself. # set by alacritty itself.
#env: #env:
# TERM variable # TERM variable
# #
# This value is used to set the `$TERM` environment variable for # This value is used to set the `$TERM` environment variable for
# each instance of Alacritty. If it is not present, alacritty will # each instance of Alacritty. If it is not present, alacritty will
# check the local terminfo database and use 'alacritty' if it is # check the local terminfo database and use 'alacritty' if it is
# available, otherwise 'xterm-256color' is used. # available, otherwise 'xterm-256color' is used.
#TERM: xterm-256color #TERM: xterm-256color
window: window:
# Window dimensions (changes require restart) # Window dimensions (changes require restart)
@ -120,43 +120,43 @@ debug:
colors: colors:
# Default colors # Default colors
primary: primary:
background: "0x1b2b34" background: '0x1b2b34'
foreground: "0xc0c5ce" foreground: '0xc0c5ce'
# Colors the cursor will use if `custom_cursor_colors` is true # Colors the cursor will use if `custom_cursor_colors` is true
cursor: cursor:
text: "0x1b2b34" text: '0x1b2b34'
cursor: "0xc0c5ce" cursor: '0xc0c5ce'
# Normal colors # Normal colors
normal: normal:
black: "0x1b2b34" black: '0x1b2b34'
red: "0xec5f67" red: '0xec5f67'
green: "0x99c794" green: '0x99c794'
yellow: "0xfac863" yellow: '0xfac863'
blue: "0x6699cc" blue: '0x6699cc'
magenta: "0xc594c5" magenta: '0xc594c5'
cyan: "0x5fb3b3" cyan: '0x5fb3b3'
white: "0xc0c5ce" white: '0xc0c5ce'
# Bright colors # Bright colors
bright: bright:
black: "0x65737e" black: '0x65737e'
red: "0xec5f67" red: '0xec5f67'
green: "0x99c794" green: '0x99c794'
yellow: "0xfac863" yellow: '0xfac863'
blue: "0x6699cc" blue: '0x6699cc'
magenta: "0xc594c5" magenta: '0xc594c5'
cyan: "0x5fb3b3" cyan: '0x5fb3b3'
white: "0xd8dee9" white: '0xd8dee9'
indexed_colors: indexed_colors:
- { index: 16, color: "0xf99157" } - { index: 16, color: '0xf99157' }
- { index: 17, color: "0xab7967" } - { index: 17, color: '0xab7967' }
- { index: 18, color: "0x343d46" } - { index: 18, color: '0x343d46' }
- { index: 19, color: "0x4f5b66" } - { index: 19, color: '0x4f5b66' }
- { index: 20, color: "0xa7adba" } - { index: 20, color: '0xa7adba' }
- { index: 21, color: "0xcdd3de" } - { index: 21, color: '0xcdd3de' }
# Visual Bell # Visual Bell
# #
@ -233,13 +233,14 @@ mouse:
#modifiers: Control|Shift #modifiers: Control|Shift
selection: selection:
semantic_escape_chars: ',│`|:"'' ()[]{}<>' semantic_escape_chars: ",│`|:\"' ()[]{}<>"
# When set to `true`, selected text will be copied to both the primary and # When set to `true`, selected text will be copied to both the primary and
# the selection clipboard. Otherwise, it will only be copied to the selection # the selection clipboard. Otherwise, it will only be copied to the selection
# clipboard. # clipboard.
save_to_clipboard: false save_to_clipboard: false
cursor: cursor:
# Cursor style # Cursor style
# #
@ -345,110 +346,110 @@ shell:
# - ~AppKeypad # - ~AppKeypad
# - AppKeypad # - AppKeypad
key_bindings: key_bindings:
- { key: V, mods: Command|Shift, action: Paste } - { key: V, mods: Command|Shift, action: Paste }
- { key: C, mods: Command|Shift, action: Copy } - { key: C, mods: Command|Shift, action: Copy }
- { key: Paste, action: Paste } - { key: Paste, action: Paste }
- { key: Copy, action: Copy } - { key: Copy, action: Copy }
- { key: Q, mods: Command, action: Quit } - { key: Q, mods: Command, action: Quit }
- { key: W, mods: Command, action: Quit } - { key: W, mods: Command, action: Quit }
- { key: Insert, mods: Shift, action: PasteSelection } - { key: Insert, mods: Shift, action: PasteSelection }
- { key: Key0, mods: Control, action: ResetFontSize } - { key: Key0, mods: Control, action: ResetFontSize }
- { key: Equals, mods: Control, action: IncreaseFontSize } - { key: Equals, mods: Control, action: IncreaseFontSize }
- { key: Subtract, mods: Control, action: DecreaseFontSize } - { key: Subtract, mods: Control, action: DecreaseFontSize }
- { key: L, mods: Control, action: ClearLogNotice } - { key: L, mods: Control, action: ClearLogNotice }
- { key: L, mods: Control, chars: "\x0c" } - { key: L, mods: Control, chars: "\x0c" }
- { key: Home, chars: "\x1bOH", mode: AppCursor } - { key: Home, chars: "\x1bOH", mode: AppCursor }
- { key: Home, chars: "\x1b[H", mode: ~AppCursor } - { key: Home, chars: "\x1b[H", mode: ~AppCursor }
- { key: End, chars: "\x1bOF", mode: AppCursor } - { key: End, chars: "\x1bOF", mode: AppCursor }
- { key: End, chars: "\x1b[F", mode: ~AppCursor } - { key: End, chars: "\x1b[F", mode: ~AppCursor }
- { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" }
- { key: PageUp, mods: Control, chars: "\x1b[5;5~" } - { key: PageUp, mods: Control, chars: "\x1b[5;5~" }
- { key: PageUp, chars: "\x1b[5~" } - { key: PageUp, chars: "\x1b[5~" }
- { key: PageDown, mods: Shift, chars: "\x1b[6;2~" } - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" }
- { key: PageDown, mods: Control, chars: "\x1b[6;5~" } - { key: PageDown, mods: Control, chars: "\x1b[6;5~" }
- { key: PageDown, chars: "\x1b[6~" } - { key: PageDown, chars: "\x1b[6~" }
- { key: Tab, mods: Shift, chars: "\x1b[Z" } - { key: Tab, mods: Shift, chars: "\x1b[Z" }
- { key: Back, chars: "\x7f" } - { key: Back, chars: "\x7f" }
- { key: Back, mods: Alt, chars: "\x1b\x7f" } - { key: Back, mods: Alt, chars: "\x1b\x7f" }
- { key: Insert, chars: "\x1b[2~" } - { key: Insert, chars: "\x1b[2~" }
- { key: Delete, chars: "\x1b[3~" } - { key: Delete, chars: "\x1b[3~" }
- { key: Left, mods: Shift, chars: "\x1b[1;2D" } - { key: Left, mods: Shift, chars: "\x1b[1;2D" }
- { key: Left, mods: Control, chars: "\x1b[1;5D" } - { key: Left, mods: Control, chars: "\x1b[1;5D" }
- { key: Left, mods: Alt, chars: "\x1b[1;3D" } - { key: Left, mods: Alt, chars: "\x1b[1;3D" }
- { key: Left, chars: "\x1b[D", mode: ~AppCursor } - { key: Left, chars: "\x1b[D", mode: ~AppCursor }
- { key: Left, chars: "\x1bOD", mode: AppCursor } - { key: Left, chars: "\x1bOD", mode: AppCursor }
- { key: Right, mods: Shift, chars: "\x1b[1;2C" } - { key: Right, mods: Shift, chars: "\x1b[1;2C" }
- { key: Right, mods: Control, chars: "\x1b[1;5C" } - { key: Right, mods: Control, chars: "\x1b[1;5C" }
- { key: Right, mods: Alt, chars: "\x1b[1;3C" } - { key: Right, mods: Alt, chars: "\x1b[1;3C" }
- { key: Right, chars: "\x1b[C", mode: ~AppCursor } - { key: Right, chars: "\x1b[C", mode: ~AppCursor }
- { key: Right, chars: "\x1bOC", mode: AppCursor } - { key: Right, chars: "\x1bOC", mode: AppCursor }
- { key: Up, mods: Shift, chars: "\x1b[1;2A" } - { key: Up, mods: Shift, chars: "\x1b[1;2A" }
- { key: Up, mods: Control, chars: "\x1b[1;5A" } - { key: Up, mods: Control, chars: "\x1b[1;5A" }
- { key: Up, mods: Alt, chars: "\x1b[1;3A" } - { key: Up, mods: Alt, chars: "\x1b[1;3A" }
- { key: Up, chars: "\x1b[A", mode: ~AppCursor } - { key: Up, chars: "\x1b[A", mode: ~AppCursor }
- { key: Up, chars: "\x1bOA", mode: AppCursor } - { key: Up, chars: "\x1bOA", mode: AppCursor }
- { key: Down, mods: Shift, chars: "\x1b[1;2B" } - { key: Down, mods: Shift, chars: "\x1b[1;2B" }
- { key: Down, mods: Control, chars: "\x1b[1;5B" } - { key: Down, mods: Control, chars: "\x1b[1;5B" }
- { key: Down, mods: Alt, chars: "\x1b[1;3B" } - { key: Down, mods: Alt, chars: "\x1b[1;3B" }
- { key: Down, chars: "\x1b[B", mode: ~AppCursor } - { key: Down, chars: "\x1b[B", mode: ~AppCursor }
- { key: Down, chars: "\x1bOB", mode: AppCursor } - { key: Down, chars: "\x1bOB", mode: AppCursor }
- { key: F1, chars: "\x1bOP" } - { key: F1, chars: "\x1bOP" }
- { key: F2, chars: "\x1bOQ" } - { key: F2, chars: "\x1bOQ" }
- { key: F3, chars: "\x1bOR" } - { key: F3, chars: "\x1bOR" }
- { key: F4, chars: "\x1bOS" } - { key: F4, chars: "\x1bOS" }
- { key: F5, chars: "\x1b[15~" } - { key: F5, chars: "\x1b[15~" }
- { key: F6, chars: "\x1b[17~" } - { key: F6, chars: "\x1b[17~" }
- { key: F7, chars: "\x1b[18~" } - { key: F7, chars: "\x1b[18~" }
- { key: F8, chars: "\x1b[19~" } - { key: F8, chars: "\x1b[19~" }
- { key: F9, chars: "\x1b[20~" } - { key: F9, chars: "\x1b[20~" }
- { key: F10, chars: "\x1b[21~" } - { key: F10, chars: "\x1b[21~" }
- { key: F11, chars: "\x1b[23~" } - { key: F11, chars: "\x1b[23~" }
- { key: F12, chars: "\x1b[24~" } - { key: F12, chars: "\x1b[24~" }
- { key: F1, mods: Shift, chars: "\x1b[1;2P" } - { key: F1, mods: Shift, chars: "\x1b[1;2P" }
- { key: F2, mods: Shift, chars: "\x1b[1;2Q" } - { key: F2, mods: Shift, chars: "\x1b[1;2Q" }
- { key: F3, mods: Shift, chars: "\x1b[1;2R" } - { key: F3, mods: Shift, chars: "\x1b[1;2R" }
- { key: F4, mods: Shift, chars: "\x1b[1;2S" } - { key: F4, mods: Shift, chars: "\x1b[1;2S" }
- { key: F5, mods: Shift, chars: "\x1b[15;2~" } - { key: F5, mods: Shift, chars: "\x1b[15;2~" }
- { key: F6, mods: Shift, chars: "\x1b[17;2~" } - { key: F6, mods: Shift, chars: "\x1b[17;2~" }
- { key: F7, mods: Shift, chars: "\x1b[18;2~" } - { key: F7, mods: Shift, chars: "\x1b[18;2~" }
- { key: F8, mods: Shift, chars: "\x1b[19;2~" } - { key: F8, mods: Shift, chars: "\x1b[19;2~" }
- { key: F9, mods: Shift, chars: "\x1b[20;2~" } - { key: F9, mods: Shift, chars: "\x1b[20;2~" }
- { key: F10, mods: Shift, chars: "\x1b[21;2~" } - { key: F10, mods: Shift, chars: "\x1b[21;2~" }
- { key: F11, mods: Shift, chars: "\x1b[23;2~" } - { key: F11, mods: Shift, chars: "\x1b[23;2~" }
- { key: F12, mods: Shift, chars: "\x1b[24;2~" } - { key: F12, mods: Shift, chars: "\x1b[24;2~" }
- { key: F1, mods: Control, chars: "\x1b[1;5P" } - { key: F1, mods: Control, chars: "\x1b[1;5P" }
- { key: F2, mods: Control, chars: "\x1b[1;5Q" } - { key: F2, mods: Control, chars: "\x1b[1;5Q" }
- { key: F3, mods: Control, chars: "\x1b[1;5R" } - { key: F3, mods: Control, chars: "\x1b[1;5R" }
- { key: F4, mods: Control, chars: "\x1b[1;5S" } - { key: F4, mods: Control, chars: "\x1b[1;5S" }
- { key: F5, mods: Control, chars: "\x1b[15;5~" } - { key: F5, mods: Control, chars: "\x1b[15;5~" }
- { key: F6, mods: Control, chars: "\x1b[17;5~" } - { key: F6, mods: Control, chars: "\x1b[17;5~" }
- { key: F7, mods: Control, chars: "\x1b[18;5~" } - { key: F7, mods: Control, chars: "\x1b[18;5~" }
- { key: F8, mods: Control, chars: "\x1b[19;5~" } - { key: F8, mods: Control, chars: "\x1b[19;5~" }
- { key: F9, mods: Control, chars: "\x1b[20;5~" } - { key: F9, mods: Control, chars: "\x1b[20;5~" }
- { key: F10, mods: Control, chars: "\x1b[21;5~" } - { key: F10, mods: Control, chars: "\x1b[21;5~" }
- { key: F11, mods: Control, chars: "\x1b[23;5~" } - { key: F11, mods: Control, chars: "\x1b[23;5~" }
- { key: F12, mods: Control, chars: "\x1b[24;5~" } - { key: F12, mods: Control, chars: "\x1b[24;5~" }
- { key: F1, mods: Alt, chars: "\x1b[1;6P" } - { key: F1, mods: Alt, chars: "\x1b[1;6P" }
- { key: F2, mods: Alt, chars: "\x1b[1;6Q" } - { key: F2, mods: Alt, chars: "\x1b[1;6Q" }
- { key: F3, mods: Alt, chars: "\x1b[1;6R" } - { key: F3, mods: Alt, chars: "\x1b[1;6R" }
- { key: F4, mods: Alt, chars: "\x1b[1;6S" } - { key: F4, mods: Alt, chars: "\x1b[1;6S" }
- { key: F5, mods: Alt, chars: "\x1b[15;6~" } - { key: F5, mods: Alt, chars: "\x1b[15;6~" }
- { key: F6, mods: Alt, chars: "\x1b[17;6~" } - { key: F6, mods: Alt, chars: "\x1b[17;6~" }
- { key: F7, mods: Alt, chars: "\x1b[18;6~" } - { key: F7, mods: Alt, chars: "\x1b[18;6~" }
- { key: F8, mods: Alt, chars: "\x1b[19;6~" } - { key: F8, mods: Alt, chars: "\x1b[19;6~" }
- { key: F9, mods: Alt, chars: "\x1b[20;6~" } - { key: F9, mods: Alt, chars: "\x1b[20;6~" }
- { key: F10, mods: Alt, chars: "\x1b[21;6~" } - { key: F10, mods: Alt, chars: "\x1b[21;6~" }
- { key: F11, mods: Alt, chars: "\x1b[23;6~" } - { key: F11, mods: Alt, chars: "\x1b[23;6~" }
- { key: F12, mods: Alt, chars: "\x1b[24;6~" } - { key: F12, mods: Alt, chars: "\x1b[24;6~" }
- { key: F1, mods: Super, chars: "\x1b[1;3P" } - { key: F1, mods: Super, chars: "\x1b[1;3P" }
- { key: F2, mods: Super, chars: "\x1b[1;3Q" } - { key: F2, mods: Super, chars: "\x1b[1;3Q" }
- { key: F3, mods: Super, chars: "\x1b[1;3R" } - { key: F3, mods: Super, chars: "\x1b[1;3R" }
- { key: F4, mods: Super, chars: "\x1b[1;3S" } - { key: F4, mods: Super, chars: "\x1b[1;3S" }
- { key: F5, mods: Super, chars: "\x1b[15;3~" } - { key: F5, mods: Super, chars: "\x1b[15;3~" }
- { key: F6, mods: Super, chars: "\x1b[17;3~" } - { key: F6, mods: Super, chars: "\x1b[17;3~" }
- { key: F7, mods: Super, chars: "\x1b[18;3~" } - { key: F7, mods: Super, chars: "\x1b[18;3~" }
- { key: F8, mods: Super, chars: "\x1b[19;3~" } - { key: F8, mods: Super, chars: "\x1b[19;3~" }
- { key: F9, mods: Super, chars: "\x1b[20;3~" } - { key: F9, mods: Super, chars: "\x1b[20;3~" }
- { key: F10, mods: Super, chars: "\x1b[21;3~" } - { key: F10, mods: Super, chars: "\x1b[21;3~" }
- { key: F11, mods: Super, chars: "\x1b[23;3~" } - { key: F11, mods: Super, chars: "\x1b[23;3~" }
- { key: F12, mods: Super, chars: "\x1b[24;3~" } - { key: F12, mods: Super, chars: "\x1b[24;3~" }

221
bin/age-op
View file

@ -1,221 +0,0 @@
#!/usr/bin/env bash
# Age encryption using secrets in 1password vault
# Date: 2024-06-04
# Version: 0.3
# License: MIT or APACHE-2.0
# Author: @stevelr
# Author: @anthonycicc
#
# Run `age-op -h` for help and examples
#
# For information about age, see https://github.com/FiloSottile/age
# Tested on mac and linux. Tested with age and rage (rust-rage)
# check dependencies
# Change to 'rage' if you prefer
AGE=${AGE:-$(which age)}
OP=${OP:-op}
# Select private folder for temporary secrets. can be overridden with `-t` flag
# The defaults for linux and macos are readable by owner only
# Returns: temp folder path with no trailing '/'
private_tmp() {
if [ -d /run/user/$(id -u) ]; then
echo /run/user/$(id -u) # linux. folder owned by user with mode 700
elif [ -d "$TMPDIR" ]; then
echo "$(echo $TMPDIR | sed 's./$..')" # macos. owned by user with mode 700. remove trailing slash
else
echo "$PWD"
fi
}
tmppath=$(private_tmp)
# Display help message and quit
# param: ERROR_MESSAGE
# If ERROR_MESSAGE is not empty, exits 1, otherwise exits 0
_help() {
[ -n "$1" ] && echo "Error: $1\n"
local ds="\$"
local prog=$(basename $0)
cat <<_HELP
age encryption with secret keys in 1password vault
Examples:
Encrypt file:
$prog -e -k KEY_PATH [ -o OUTPUT ] [ -t TMPDIR ] [ FILE ]
encrypt a single input file FILE.
If FILE is '-' or not specified, stdin is encrypted
If OUTPUT is '-' or not specified, the output is sent to stdout
To encrypt one or more files or folders to a tar file, use
tar czf - FILE_OR_DIR FILE_OR_DIR ... | $prog -e -k KEY_PATH -o foo.tar.gz.age
Decrypt file:
$prog -d -k KEY_PATH [ -o OUTPUT ] [-t TMPDIR ] [ FILE ]
decrypt a file, or stdin
If FILE is '-' or not specified, stdin is decrypted
If OUTPUT is '-' or not specified, the output is sent to stdout
To decrypt a tar file,
$prog -d -k KEY_PATH foo.tar.gz.age | tar xzf -
Generate an age ed25519 key and store it in the 1password vault. The type of the new item will be "Password"
$prog -n -k KEY_PATH
KEY_PATH should have one of the following formats:
- 'op://vault/title', 'op://vault/title/field', or 'op://vault/title/section/field'
In the first case, the field name defaults to 'password'
TMPDIR is the temporary folder where key will be briefly written and quickly removed
Default is '$tmppath'
1Password configuration:
For the 1Password cli ('op') to authenticate with a vault, you can do one of the following:
- For use with a service account, set the environment variable OP_SERVICE_ACCOUNT_TOKEN
- For use with a 1Password Connect Server, set OP_CONNECT_HOST and OP_CONNECT_TOKEN
- sign into a local app with "eval ${ds}(op signin)"
Dependencies: Installation instructions and documentation:
age: https://age-encryption.org
op (1Password cli): https://developer.1password.com/docs/cli/get-started
_HELP
[ -n "$1" ] && exit 1 || exit 0
}
# Store key in unique temp file, with access limited to current user
# params: TMPDIR KEY
# returns: path to temp file
store_secret() {
secret=$(mktemp "$1/age-secret.XXXXXX")
chmod 600 "$secret"
cat >"$secret" <<_EKEY
$2
_EKEY
echo "$secret"
}
# Create a new key
# params: KEYPATH
new_key() {
local keypath="$1"
local key field out pw title vault field
##
## Create new key
##
vault=$(echo $keypath | sed -E 's|op://([^/]+)\/([^/]+)\/(.*)|\1|')
title=$(echo $keypath | sed -E 's|op://([^/]+)\/([^/]+)\/(.*)|\2|')
field=$(echo $keypath | sed -E 's|op://([^/]+)\/([^/]+)\/(.*)|\3|')
# check if the key path exists so we don't overwrite it.
# The successs case (key is unique) generates an error, so temporarily disable '+e'
set +e
key=$($OP item get "$title" "--vault=$vault" 2>/dev/null)
[ $? -eq 0 ] && _help "Key vault:$vault title:$title already exists - will not overwrite"
set -e
pw="$($AGE-keygen)"
out=$($OP item create --category=password --title="$title" --vault="$vault" "$field=$pw")
echo "Created vault:$vault title:$title"
}
cmd=""
input=""
output=""
keypath=""
stdin=0
_err=""
# putting this in a variable makes it work with zsh
help_regex="^\-h|^--help|^help$"
[ ! $($AGE --help 2>&1 | grep Usage) ] && _help "Missing 'age' or 'rage' dependency. Please see installation url below."
# 1password cli
[ ! $($OP --version) ] && _help "Missing 'op' dependency. Please see installation url below."
[[ $1 =~ $help_regex ]] && _help
while getopts ':hnedo:k:t:' OPTION; do
case $OPTION in
h) _help
;;
n) [ -n "$cmd" ] && _help "Only one of -e, -d, or -n may be used"
cmd="new"
;;
e) [ -n "$cmd" ] && _help "Only one of -e, -d, or -n may be used"
cmd="encrypt"
;;
d) [ -n "$cmd" ] && _help "Only one of -e, -d, or -n may be used"
cmd="decrypt"
;;
o) output=$OPTARG
;;
k) keypath=$OPTARG
if [[ -v AGE_KEYPATH ]]; then
keypath=$AGE_KEYPATH
fi
if [[ ! $keypath =~ ^op://[^/]+/[^/]+/.+$ ]]; then
# if path has only two segments (vault & title), append field "password"
# since the 'new' function creates items of type Password
if [[ $keypath =~ ^op://[^/]+/[^/]+$ ]]; then
keypath="$keypath/password"
else
_help "Invalid key path '$keypath'"
fi
fi
;;
t) tmppath=$OPTARG
[ ! -d "$tmppath" ] && _help "Invalid tmp folder: '$tmppath' does not exist"
;;
?) _help "" ;;
esac
done
shift "$(($OPTIND -1))"
[ -z "$cmd" ] && _help "One of -e, -d, or -n must be used"
[ -z "$keypath" ] && _help "keypath is required. Should be of the form op://vault/title[/field]"
if [ "$cmd" = "new" ]; then
new_key $keypath
else
##
## Encrypt or Decrypt
##
if [ -z "$1" ] || [ "$1" = "-" ]; then
stdin=1
else
input="$1"
[ ! -r "$input" ] && _help "Missing or unreadable input file '$input'"
# don't re-encrypt file ending in .age
[ "$cmd" = "encrypt" ] && [[ $input =~ \.age$ ]] && _help "Input file may not end in '.age'"
fi
if [ -z "$output" ] || [ "$output" = "-" ]; then
output=/dev/stdout
fi
key=$($OP read "$keypath")
if [ $? -ne 0 ] || [ -z "$key" ]; then
_help "Invalid keypath '$keypath'"
fi
secret=$(store_secret "$tmppath" "$key")
## try
{(
set +e # don't quit on error here - we want to make sure secret is deleted
if [ $stdin -eq 1 ]; then
$AGE --${cmd} -i "$secret" >"$output"
else
$AGE --${cmd} -i "$secret" <"$input" >"$output"
fi
)}
## catch
{
rm -f "$secret"
}
fi
unset _err cmd input key keypath output secret stdin tmppath

1
cy/cy.janet
View file

@ -1 +0,0 @@
(key/bind :root ["ctrl+a" "p"] action/command-palette)

5
emacs/emacs.doom/config.el
View file

@ -21,8 +21,8 @@
;; font string. You generally only need these two: ;; font string. You generally only need these two:
;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) ;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light)
;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) ;; doom-variable-pitch-font (font-spec :family "sans" :size 13))
(setq doom-font (font-spec :family "TX-02-BerkeleyAC" :size 14 :weight 'medium) (setq doom-font (font-spec :family "Iosevka Custom" :size 14 :weight 'medium)
doom-unicode-font (font-spec :family "TX-02-BerkeleyAC" :size 14 :weight 'medium)) doom-unicode-font (font-spec :family "Iosevka Custom" :size 14 :weight 'medium))
;; There are two ways to load a theme. Both assume the theme is installed and ;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the ;; available. You can either set `doom-theme' or manually load a theme with the
@ -48,7 +48,6 @@
;; numbers are disabled. For relative line numbers, set this to `relative'. ;; numbers are disabled. For relative line numbers, set this to `relative'.
(setq display-line-numbers-type 'relative) (setq display-line-numbers-type 'relative)
(auth-source-1password-enable)
;; Here are some additional functions/macros that could help you configure Doom: ;; Here are some additional functions/macros that could help you configure Doom:
;; ;;

10
emacs/emacs.doom/init.el
View file

@ -25,14 +25,14 @@
;;helm ; the *other* search engine for love and life ;;helm ; the *other* search engine for love and life
;;ido ; the other *other* search engine... ;;ido ; the other *other* search engine...
;; (ivy +childframe +fuzzy +icons +prescient) ; a search engine for love and life ;; (ivy +childframe +fuzzy +icons +prescient) ; a search engine for love and life
(vertico) ; the search engine of the future (vertico +icons) ; the search engine of the future
:ui :ui
;;deft ; notational velocity for Emacs ;;deft ; notational velocity for Emacs
doom ; what makes DOOM look the way it does doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs doom-dashboard ; a nifty splash screen for Emacs
doom-quit ; DOOM quit-message prompts when you quit Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs
(emoji +github) ; 🙂 (emoji +unicode +github) ; 🙂
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
hydra hydra
indent-guides ; highlighted indent columns indent-guides ; highlighted indent columns
@ -45,7 +45,7 @@
(popup +defaults) ; tame sudden yet inevitable temporary windows (popup +defaults) ; tame sudden yet inevitable temporary windows
;;tabs ; a tab bar for Emacs ;;tabs ; a tab bar for Emacs
(treemacs +lsp) ; a project drawer, like neotree but cooler (treemacs +lsp) ; a project drawer, like neotree but cooler
; unicode ; extended unicode support for various languages unicode ; extended unicode support for various languages
vc-gutter ; vcs diff in the fringe vc-gutter ; vcs diff in the fringe
vi-tilde-fringe ; fringe tildes to mark beyond EOB vi-tilde-fringe ; fringe tildes to mark beyond EOB
window-select ; visually switch windows window-select ; visually switch windows
@ -67,7 +67,7 @@
word-wrap ; soft wrapping with language-aware indent word-wrap ; soft wrapping with language-aware indent
:emacs :emacs
(dired) ; making dired pretty [functional] (dired +icons) ; making dired pretty [functional]
electric ; smarter, keyword-based electric-indent electric ; smarter, keyword-based electric-indent
;;ibuffer ; interactive buffer management ;;ibuffer ; interactive buffer management
(undo +tree) ; persistent, smarter undo for your inevitable mistakes (undo +tree) ; persistent, smarter undo for your inevitable mistakes
@ -153,7 +153,7 @@
nim ; python + lisp at the speed of c nim ; python + lisp at the speed of c
nix ; I hereby declare "nix geht mehr!" nix ; I hereby declare "nix geht mehr!"
;;(ocaml +lsp) ; an objective camel ;;(ocaml +lsp) ; an objective camel
(org +pandoc +pretty +dragndrop) ; organize your plain life in plain text (org +pandoc +pretty +roam2 +brain +dragndrop) ; organize your plain life in plain text
;;php ; perl's insecure younger brother ;;php ; perl's insecure younger brother
;;plantuml ; diagrams for confusing people more ;;plantuml ; diagrams for confusing people more
;;purescript ; javascript, but functional ;;purescript ; javascript, but functional

1
emacs/emacs.doom/packages.el
View file

@ -52,4 +52,3 @@
(package! org-transclusion) (package! org-transclusion)
(package! jsonnet-mode) (package! jsonnet-mode)
(package! org-modern) (package! org-modern)
(package! auth-source-1password)

249
flake.lock generated
View file

@ -1,49 +1,18 @@
{ {
"nodes": { "nodes": {
"cachix": {
"inputs": {
"devenv": [
"devenv"
],
"flake-compat": [
"devenv"
],
"git-hooks": [
"devenv"
],
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1737621947,
"narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=",
"owner": "cachix",
"repo": "cachix",
"rev": "f65a3cd5e339c223471e64c051434616e18cc4f5",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "latest",
"repo": "cachix",
"type": "github"
}
},
"devenv": { "devenv": {
"inputs": { "inputs": {
"cachix": "cachix",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"git-hooks": "git-hooks",
"nix": "nix", "nix": "nix",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs" "pre-commit-hooks": "pre-commit-hooks"
]
}, },
"locked": { "locked": {
"lastModified": 1743025451, "lastModified": 1689433662,
"narHash": "sha256-5gqfQwTpOIHWSltdm5tKbyOvnTll81lGSiuC2EsVZt0=", "narHash": "sha256-JZT7AJC4/SRV7K6RABjKQ9mXFRhH0ebIFzbVU0soMdM=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "686aaf88c9c095fc49dadc620d1a814830c78206", "rev": "b409e6a6bb6c4734e11357945f9888771c5a7bc5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +24,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1673956053,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,50 +37,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": { "flake-utils": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "systems": "systems"
"devenv",
"nix",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1685518550,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "hercules-ci", "owner": "numtide",
"repo": "flake-parts", "repo": "flake-utils",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hercules-ci", "owner": "numtide",
"repo": "flake-parts", "repo": "flake-utils",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
"devenv"
],
"gitignore": "gitignore",
"nixpkgs": [
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1740849354,
"narHash": "sha256-oy33+t09FraucSZ2rZ6qnD1Y1c8azKKmQuCvF2ytUko=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "4a709a8ce9f8c08fa7ddb86761fe488ff7858a07",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github" "type": "github"
} }
}, },
@ -119,16 +59,16 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"devenv", "devenv",
"git-hooks", "pre-commit-hooks",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1660459072,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,106 +77,143 @@
"type": "github" "type": "github"
} }
}, },
"libgit2": { "lowdown-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697646580, "lastModified": 1633514407,
"narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
"owner": "libgit2", "owner": "kristapsdz",
"repo": "libgit2", "repo": "lowdown",
"rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "libgit2", "owner": "kristapsdz",
"repo": "libgit2", "repo": "lowdown",
"type": "github" "type": "github"
} }
}, },
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": [ "lowdown-src": "lowdown-src",
"devenv" "nixpkgs": [
"devenv",
"nixpkgs"
], ],
"flake-parts": "flake-parts", "nixpkgs-regression": "nixpkgs-regression"
"libgit2": "libgit2",
"nixpkgs": "nixpkgs_2",
"nixpkgs-23-11": [
"devenv"
],
"nixpkgs-regression": [
"devenv"
],
"pre-commit-hooks": [
"devenv"
]
}, },
"locked": { "locked": {
"lastModified": 1741798497, "lastModified": 1676545802,
"narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=", "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
"owner": "domenkozar", "owner": "domenkozar",
"repo": "nix", "repo": "nix",
"rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd", "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "domenkozar", "owner": "domenkozar",
"ref": "devenv-2.24", "ref": "relaxed-flakes",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733212471, "lastModified": 1678875422,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1717432640, "lastModified": 1688392541,
"narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-24.05", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "pre-commit-hooks": {
"inputs": {
"flake-compat": [
"devenv",
"flake-compat"
],
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": [
"devenv",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": { "locked": {
"lastModified": 1742422364, "lastModified": 1688056373,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=",
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "owner": "cachix",
"revCount": 770807, "repo": "pre-commit-hooks.nix",
"type": "tarball", "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.770807%2Brev-a84ebe20c6bc2ecbcfb000a50776219f48d134cc/0195b626-8c1d-7fb9-9282-563af3d37ab9/source.tar.gz" "type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "cachix",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz" "repo": "pre-commit-hooks.nix",
"type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"devenv": "devenv", "devenv": "devenv",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"systems": "systems" "systems": "systems_2"
} }
}, },
"systems": { "systems": {
@ -249,8 +226,24 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "systems", "owner": "nix-systems",
"type": "indirect" "repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
} }
} }
}, },

96
flake.nix
View file

@ -1,64 +1,44 @@
{ {
inputs = { inputs = {
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
devenv = { systems.url = "github:nix-systems/default";
url = "github:cachix/devenv"; devenv.url = "github:cachix/devenv";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};
}; };
nixConfig = { outputs = {
extra-trusted-public-keys = "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="; self,
extra-substituters = "https://devenv.cachix.org"; nixpkgs,
devenv,
systems,
...
} @ inputs: let
forEachSystem = nixpkgs.lib.genAttrs (import systems);
in {
devShells =
forEachSystem
(system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
default = devenv.lib.mkShell {
inherit inputs pkgs;
modules = [
{
# https://devenv.sh/reference/options/
packages = [pkgs.hello pkgs.delta pkgs.difftastic pkgs.alejandra pkgs.nodePackages.bash-language-server];
enterShell = ''
hello
'';
pre-commit.hooks = {
shellcheck.enable = true;
black.enable = true;
alejandra.enable = true;
taplo.enable = true;
};
}
];
};
});
}; };
outputs =
{
nixpkgs,
devenv,
systems,
...
}@inputs:
let
forEachSystem = nixpkgs.lib.genAttrs (import systems);
in
{
formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
devShells = forEachSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
default = devenv.lib.mkShell {
inherit inputs pkgs;
modules = [
{
# https://devenv.sh/reference/options/
packages = [
pkgs.hello
pkgs.delta
pkgs.difftastic
pkgs.nodePackages.bash-language-server
pkgs.shellcheck
pkgs.shfmt
];
pre-commit.hooks = {
nixfmt-rfc-style.enable = true;
black.enable = true;
deadnix.enable = true;
stylua.enable = true;
shellcheck.enable = true;
shfmt.enable = true;
taplo.enable = true;
};
}
];
};
}
);
};
} }

2
ghostty/config
View file

@ -1,2 +0,0 @@
font-family = "Berkeley Mono"
font-style = "Retina"

46
hammerspoon/init.lua
View file

@ -5,8 +5,7 @@ spoon.SpoonInstall:andUse("WindowHalfsAndThirds")
spoon.SpoonInstall:andUse("Commander") spoon.SpoonInstall:andUse("Commander")
spoon.SpoonInstall:andUse("ReloadConfiguration") spoon.SpoonInstall:andUse("ReloadConfiguration")
-- Keep a running, and preferred terminal as the _last_ value here TERMINAL_NAME = "WezTerm"
TERMINAL_NAMES = { "Ghostty", "wezterm-gui", "WezTerm" }
spoon.WindowScreenLeftAndRight:bindHotkeys(spoon.WindowScreenLeftAndRight.defaultHotkeys) spoon.WindowScreenLeftAndRight:bindHotkeys(spoon.WindowScreenLeftAndRight.defaultHotkeys)
@ -16,36 +15,27 @@ spoon.ReloadConfiguration:start()
pcall(require, "initlocal") pcall(require, "initlocal")
hs.hotkey.bind({ "cmd", "alt", "ctrl" }, "SPACE", function() hs.hotkey.bind({"cmd", "alt", "ctrl"}, "SPACE", function ()
spoon.Commander.show() spoon.Commander.show()
end) end)
hs.hotkey.bind({ "ctrl" }, "t", function() hs.hotkey.bind({"ctrl"}, "t", function ()
local terminal = nil local currentApp = hs.window.focusedWindow():application()
for i = 1, #TERMINAL_NAMES do if (currentApp:name() == TERMINAL_NAME) then
-- Can't use .get here, as there's an open bug where it just… returns a window instead sometimes hs.eventtap.keyStroke({"ctrl"}, "t", 1000, currentApp)
if hs.application.find(TERMINAL_NAMES[i], true) then else
terminal = hs.application.find(TERMINAL_NAMES[i], true) hs.application.launchOrFocus(TERMINAL_NAME)
break end
end
end
local currentApp = hs.window.focusedWindow():application()
print(currentApp)
if terminal then
if currentApp:name() == terminal:name() then
hs.eventtap.keyStroke({ "ctrl" }, "t", 1000, currentApp)
else
terminal:activate()
end
else
hs.application.launchOrFocus(TERMINAL_NAMES[1])
end
end) end)
hs.hotkey.bind({ "cmd", "alt" }, ",", function() hs.hotkey.bind({"ctrl", "alt"}, "t", function ()
hs.application.launchOrFocus("System Preferences") hs.application.launchOrFocus("/Users/acicchetti/bin/Terminal (Rosetta).app")
end) end)
hs.hotkey.bind({ "cmd", "shift" }, "l", function() hs.hotkey.bind({"cmd", "alt"}, ",", function ()
hs.application.launchOrFocus("Launchpad") hs.application.launchOrFocus("System Preferences")
end)
hs.hotkey.bind({"cmd", "shift"}, "l", function ()
hs.application.launchOrFocus("Launchpad")
end) end)

538
nix/home-manager/flake.lock generated
View file

@ -1,34 +1,35 @@
{ {
"nodes": { "nodes": {
"fenix": { "devenv": {
"inputs": { "inputs": {
"nixpkgs": [ "flake-compat": "flake-compat",
"nixpkgs" "nix": "nix",
], "nixpkgs": "nixpkgs",
"rust-analyzer-src": "rust-analyzer-src" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1742452566, "lastModified": 1688058187,
"narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "narHash": "sha256-ipDcc7qrucpJ0+0eYNlwnE+ISTcq4m03qW+CWUshRXI=",
"owner": "nix-community", "owner": "cachix",
"repo": "fenix", "repo": "devenv",
"rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "rev": "c8778e3dc30eb9043e218aaa3861d42d4992de77",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "cachix",
"repo": "fenix", "ref": "latest",
"repo": "devenv",
"type": "github" "type": "github"
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1673956053,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +41,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1650374568,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,37 +54,13 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1667395993,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,14 +71,14 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1689068808,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,46 +87,25 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "gitignore": {
"inputs": { "inputs": {
"systems": "systems_3" "nixpkgs": [
}, "devenv",
"locked": { "pre-commit-hooks",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghostty": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": [
"nixpkgs" "nixpkgs"
], ]
"zig": "zig",
"zon2nix": "zon2nix"
}, },
"locked": { "locked": {
"lastModified": 1743191728, "lastModified": 1660459072,
"narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=", "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"owner": "ghostty-org", "owner": "hercules-ci",
"repo": "ghostty", "repo": "gitignore.nix",
"rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941", "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ghostty-org", "owner": "hercules-ci",
"repo": "ghostty", "repo": "gitignore.nix",
"type": "github" "type": "github"
} }
}, },
@ -160,11 +116,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743360001, "lastModified": 1689447223,
"narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", "narHash": "sha256-A5vQBtWYamvGf3c2IEhAmwIkXBzuzrkpnMYbLvc+lEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", "rev": "f5b03feb33629cb2b6dd513935637e8cc718a5ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,31 +129,79 @@
"type": "github" "type": "github"
} }
}, },
"ixx": { "home-manager_2": {
"inputs": { "inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixneovim",
"nuschtosSearch",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1729958008, "lastModified": 1689134369,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=",
"owner": "NuschtOS", "owner": "nix-community",
"repo": "ixx", "repo": "home-manager",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "nix-community",
"ref": "v0.0.6", "repo": "home-manager",
"repo": "ixx", "type": "github"
}
},
"lowdown-src": {
"flake": false,
"locked": {
"lastModified": 1633514407,
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"repo": "lowdown",
"type": "github"
}
},
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": [
"devenv",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1676545802,
"narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
"owner": "domenkozar",
"repo": "nix",
"rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
"type": "github"
},
"original": {
"owner": "domenkozar",
"ref": "relaxed-flakes",
"repo": "nix",
"type": "github"
}
},
"nix-flake-tests": {
"locked": {
"lastModified": 1677844186,
"narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=",
"owner": "antifuchs",
"repo": "nix-flake-tests",
"rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb",
"type": "github"
},
"original": {
"owner": "antifuchs",
"repo": "nix-flake-tests",
"type": "github" "type": "github"
} }
}, },
@ -208,11 +212,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743306489, "lastModified": 1688874465,
"narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=", "narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d", "rev": "757114749d4613cf71f3748e780a1be8a67a5d3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,134 +225,203 @@
"type": "github" "type": "github"
} }
}, },
"nixneovim": {
"inputs": {
"flake-utils": "flake-utils_2",
"home-manager": "home-manager_2",
"nix-flake-tests": "nix-flake-tests",
"nixneovimplugins": "nixneovimplugins",
"nixpkgs": "nixpkgs_2",
"nmd": "nmd",
"nmt": "nmt"
},
"locked": {
"lastModified": 1689258189,
"narHash": "sha256-Ufy02ZXCAzINoD3ued142vQu0BPw3t5wqZNFjkL73Ms=",
"owner": "nixneovim",
"repo": "nixneovim",
"rev": "96ebaeb3e4caae77c227be0f4bac3826a01eeefa",
"type": "github"
},
"original": {
"owner": "nixneovim",
"repo": "nixneovim",
"type": "github"
}
},
"nixneovimplugins": { "nixneovimplugins": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": [ "flake-utils": [
"nixneovim",
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"nixneovim",
"nixpkgs" "nixpkgs"
], ]
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1743355494, "lastModified": 1688942172,
"narHash": "sha256-NlHg4uJ0aneeoh2q6ZMGElDStnSNxF4YdxNGgZitjQw=", "narHash": "sha256-LaLr4YrAQNVdgKy/QBSNkb0e/7jWpgrXje/r7gCQy6c=",
"owner": "m15a", "owner": "nixneovim",
"repo": "flake-awesome-neovim-plugins", "repo": "nixneovimplugins",
"rev": "aa8458831dc4e07c159616091216f56e488fc952", "rev": "2120522c517c205dcf1eee9226f86c984c566a7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "m15a", "owner": "nixneovim",
"repo": "flake-awesome-neovim-plugins", "repo": "nixneovimplugins",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743423905, "lastModified": 1678875422,
"narHash": "sha256-KMl3R0n1H4Vo9OyFFwAUI6d799r8zbxV+Q5WSsVNajw=", "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e68b342423c69aa8113894d9e89ae50e4fd9c456", "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1741992157, "lastModified": 1678872516,
"narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da4b122f63095ca1199bd4d526f9e26426697689", "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "release-24.11", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixvim": { "nixpkgs_2": {
"locked": {
"lastModified": 1689192006,
"narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1689282004,
"narHash": "sha256-VNhuyb10c9SV+3hZOlxwJwzEGytZ31gN9w4nPCnNvdI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e74e68449c385db82de3170288a28cd0f608544f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
"lastModified": 1687627428,
"narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=",
"owner": "~rycee",
"repo": "nmd",
"rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff",
"type": "sourcehut"
},
"original": {
"owner": "~rycee",
"repo": "nmd",
"type": "sourcehut"
}
},
"nmt": {
"flake": false,
"locked": {
"lastModified": 1683843030,
"narHash": "sha256-2K9tFpypgSORyUTRAL7MFRKCXU4GykmhIDrrIydtPdI=",
"owner": "jooooscha",
"repo": "nmt",
"rev": "f30b96093eb056f1bcc60199545344b4e4a72c5a",
"type": "github"
},
"original": {
"owner": "jooooscha",
"repo": "nmt",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-compat": [
"devenv",
"flake-compat"
],
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"devenv",
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1743362786, "lastModified": 1686050334,
"narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "narHash": "sha256-R0mczWjDzBpIvM3XXhO908X5e2CQqjyh/gFbwZk/7/Q=",
"owner": "nix-community", "owner": "cachix",
"repo": "nixvim", "repo": "pre-commit-hooks.nix",
"rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "rev": "6881eb2ae5d8a3516e34714e7a90d9d95914c4dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "cachix",
"repo": "nixvim", "repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_3",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1742659553,
"narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=",
"owner": "NuschtOS",
"repo": "search",
"rev": "508752835128a3977985a4d5225ff241f7756181",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"fenix": "fenix", "devenv": "devenv",
"flake-utils": "flake-utils",
"ghostty": "ghostty",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixneovimplugins": "nixneovimplugins", "nixneovim": "nixneovim",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_3"
"nixvim": "nixvim"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1742296961,
"narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
} }
}, },
"systems": { "systems": {
@ -365,111 +438,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixneovimplugins",
"nixpkgs"
]
},
"locked": {
"lastModified": 1743081648,
"narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"zig": {
"inputs": {
"flake-compat": [
"ghostty"
],
"flake-utils": [
"ghostty",
"flake-utils"
],
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1741825901,
"narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "0b14285e283f5a747f372fb2931835dd937c4383",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zon2nix": {
"inputs": {
"flake-utils": [
"ghostty",
"flake-utils"
],
"nixpkgs": [
"ghostty",
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1742104771,
"narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
"owner": "jcollie",
"repo": "zon2nix",
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"type": "github"
},
"original": {
"owner": "jcollie",
"ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
"repo": "zon2nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

129
nix/home-manager/flake.nix
View file

@ -1,116 +1,71 @@
{ {
description = "Home Manager configuration of acicchetti"; description = "Home Manager configuration of acicchetti";
nixConfig = {
extra-substituters = [
"https://devenv.cachix.org"
"https://nixpkgs.cachix.org"
"https://nix-community.cachix.org"
];
extra-trusted-public-keys = [
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
"nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
inputs = { inputs = {
# Specify the source of Home Manager and Nixpkgs. # Specify the source of Home Manager and Nixpkgs.
nixpkgs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
url = "github:nixos/nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
devenv = {
url = "github:cachix/devenv/latest";
};
nix-index-database = { nix-index-database = {
url = "github:Mic92/nix-index-database"; url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ghostty = { nixneovim = {
url = "github:ghostty-org/ghostty"; url = "github:nixneovim/nixneovim";
inputs.nixpkgs-unstable.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs = {
nixpkgs.follows = "nixpkgs";
# home-manager.follows = "home-manager";
};
};
nixneovimplugins = {
url = "github:m15a/flake-awesome-neovim-plugins";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
fenix = {
url = "github:nix-community/fenix";
inputs = {
nixpkgs.follows = "nixpkgs";
};
}; };
}; };
outputs = outputs = {
{ self,
self, nixpkgs,
nixpkgs, home-manager,
home-manager, devenv,
nix-index-database, nix-index-database,
nixvim, nixneovim,
fenix, ...
nixneovimplugins, }: let
ghostty, inherit (nixpkgs.lib) optionalAttrs singleton optionals;
... supportedSystems = ["aarch64-darwin" "x86_64-linux"];
}: forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
let
supportedSystems = [
"aarch64-darwin"
"x86_64-linux"
];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
pkgs = forAllSystems ( pkgs = forAllSystems (
system: system:
import nixpkgs { import nixpkgs {
inherit system; inherit system;
config = { # overlays = overlays;
allowUnfree = true; config = {allowUnfree = true;};
}; overlays = [nixneovim.overlays.default];
overlays = [
ghostty.overlays.default
nixneovimplugins.overlays.default
fenix.overlays.default
];
} }
); );
homeManagerConfigs = forAllSystems (system: { homeManagerConfigs = forAllSystems (
pkgs = pkgs.${system}; system: {
pkgs = pkgs."${system}";
modules = [ modules = [
{ {
imports = [ imports = [nixneovim.nixosModules.default];
nixvim.homeManagerModules.nixvim home.packages = [devenv.packages."${system}".devenv];
];
} }
nix-index-database.hmModules.nix-index nix-index-database.hmModules.nix-index
./home.nix ./home.nix
]; ];
});
in
{
formatter = forAllSystems (system: pkgs.${system}.nixfmt-rfc-style);
homeConfigurations.aarch64-darwin-acicchetti =
home-manager.lib.homeManagerConfiguration
homeManagerConfigs."aarch64-darwin";
homeConfigurations.x86_64-linux-acicchetti =
home-manager.lib.homeManagerConfiguration
homeManagerConfigs."x86_64-linux";
defaultPackage.aarch64-darwin = self.homeConfigurations.aarch64-darwin-acicchetti.activationPackage; extraSpecialArgs = {
defaultPackage.x86_64-linux = self.homeConfigurations.x86_64-linux-acicchetti.activationPackage; system = system;
}; };
}
);
in {
# formatter."${system}" = pkgs.alejandra;
homeConfigurations.aarch64-darwin-acicchetti = home-manager.lib.homeManagerConfiguration homeManagerConfigs."aarch64-darwin";
homeConfigurations.x86_64-linux-acicchetti = home-manager.lib.homeManagerConfiguration homeManagerConfigs."x86_64-linux";
defaultPackage.aarch64-darwin = self.homeConfigurations.aarch64-darwin-acicchetti.activationPackage;
defaultPackage.x86_64-linux = self.homeConfigurations.x86_64-linux-acicchetti.activationPackage;
};
} }

262
nix/home-manager/home.nix
View file

@ -1,164 +1,142 @@
{ pkgs, ... }:
let
inherit (pkgs.stdenv.hostPlatform) isDarwin;
in
{ {
home = { config,
username = "acicchetti"; pkgs,
system,
...
}: {
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = "acicchetti";
homeDirectory = if isDarwin then "/Users/acicchetti" else "/home/acicchetti"; home.homeDirectory =
if "${system}" == "aarch64-darwin"
then "/Users/acicchetti"
else "/home/acicchetti";
stateVersion = "24.11"; # This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
home.stateVersion = "22.11"; # Please read the comment before changing.
sessionVariables = { # The home.packages option allows you to install Nix packages into your
EDITOR = "nvim"; # environment.
home.packages = [
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
# # fonts?
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
home.file = {
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
};
# You can also manage environment variables but you will have to manually
# source
#
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# /etc/profiles/per-user/acicchetti/etc/profile.d/hm-session-vars.sh
#
# if you don't want to manage your shell through Home Manager.
home.sessionVariables = {
EDITOR = "nvim";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
programs.aria2 = {
enable = true;
};
programs.atuin = {
enable = true;
enableZshIntegration = true;
};
programs.direnv = {
enable = true;
nix-direnv.enable = true;
};
programs.exa = {
enable = true;
git = true;
icons = true;
enableAliases = false;
};
programs.gh = {
enable = true;
settings = {
editor = "nvim";
git_protocol = "ssh";
}; };
}; };
fonts.fontconfig.enable = true; programs.htop = {
enable = true;
};
programs = { programs.mcfly = {
home-manager.enable = true; enable = false;
keyScheme = "vim";
};
aria2 = { programs.nix-index-database = {
enable = true; comma.enable = true;
}; };
atuin = { programs.nnn = {
enable = true; enable = true;
enableZshIntegration = true; };
settings = {
enter_accept = true;
style = "compact";
keymap_mode = "vim-insert";
keymap_cursor = {
vim_insert = "steady-bar";
vim_normal = "steady-block";
};
sync_address = "https://atuin.acicchetti.dev";
};
};
direnv = { programs.skim = {
enable = true; enable = true;
nix-direnv.enable = true; enableZshIntegration = false;
enableZshIntegration = true; };
};
eza = { programs.tealdeer = {
enable = true; enable = true;
git = true; };
icons = "auto";
enableZshIntegration = true;
};
gh = { programs.topgrade = {
enable = true; enable = true;
settings = { };
editor = "nvim";
git_protocol = "ssh";
};
};
ghostty = { programs.zoxide = {
enable = true; enable = true;
package = null;
# installVimSyntax = true;
# installBatSyntax = true;
enableZshIntegration = true;
settings = {
font-family = "Maple Mono NF";
font-style = "Medium";
};
};
htop = {
enable = true;
};
jujutsu = {
enable = true;
settings = {
user = {
name = "Anthony Cicchetti";
email = "anthony@anthonycicchetti.com";
};
"default-command" = "log";
};
};
nix-index = {
enable = true;
};
nix-index-database = {
comma.enable = true;
};
nnn = {
enable = true;
};
pay-respects = {
enable = true;
};
skim = {
enable = true;
enableZshIntegration = false;
};
tealdeer = {
enable = true;
};
topgrade = {
enable = true;
settings = {
misc = {
disable = [
"node"
"nix"
"home_manager"
"gem"
"ruby_gems"
"cargo"
"vim"
"pipx"
"pip3"
"containers"
];
run_in_tmux = true;
display_time = true;
skip_notify = true;
};
git = {
max_concurrency = 5;
pull_predefined = false;
};
linux.arch_package_manager = "paru";
};
};
wezterm = {
enable = true;
enableZshIntegration = true;
extraConfig = builtins.readFile ../../wezterm/wezterm.lua;
# package = wezterm.packages.${pkgs.system}.default;
};
yazi = {
enable = true;
enableZshIntegration = true;
};
zoxide = {
enable = true;
};
}; };
imports = [ imports = [
./modules/packages ./modules/packages
./modules/files.nix ./modules/files.nix
./modules/environment.nix ./modules/environment.nix
./modules/services
]; ];
} }

7
nix/home-manager/modules/environment.nix
View file

@ -1,7 +1,10 @@
{ ... }:
{ {
pkgs,
lib,
config,
...
}: {
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
PAGE = "page -q 90000 -z 90000";
}; };
} }

98
nix/home-manager/modules/files.nix
View file

@ -1,93 +1,17 @@
{ {
pkgs, pkgs,
lib,
config, config,
... ...
}: }: {
let home.file.".ideavimrc".source = ../../../ideavim/ideavimrc;
inherit (pkgs.stdenv.hostPlatform) isLinux; xdg.configFile."erdtree/.erdtreerc".source = ../../../erdtree/erdtreerc;
repo_root = "../../.."; xdg.configFile."ov/config.yaml".source = ../../../ov/ov-less.yaml;
nv_fonts_basic = [ home.file."bin/git-sync".source = ../../../git-sync;
"Maple Mono NF" xdg.configFile."kitty/kitty.conf".source = ../../../kitty/kitty.conf;
"Berkeley Mono" xdg.configFile."lsd/config.yaml".source = ../../../lsd/config.yaml;
"Departure Mono" home.file.".cargo/config.toml".source = pkgs.substituteAll {
"Fantasque Sans Mono" src = ../../../cargo/config.toml.nixtemplate;
]; profileDir = config.home.profileDirectory;
nv_fonts_normal =
nv_fonts_basic ++ (if isLinux then [ "Noto Color Emoji" ] else [ "Apple Color Emoji" ]);
nv_fonts_italic = nv_fonts_basic;
in
{
home.file = {
"/.zsh.d/" = {
source = ./${repo_root}/zsh/funcs;
};
"/.cache/zsh/completions/.keep" = {
text = "";
recursive = true;
};
".cargo/config.toml".source = (pkgs.formats.toml { }).generate "cargo-config" {
net = {
git-fetch-with-cli = true;
};
"profile.release" = {
lto = true;
opt-level = 3;
};
# Could avoid setting this at all with another `isLinux` but whatever, doesn't truly matter
"target.x86_64-unknown-linux-gnu" = {
linker = "clang";
rustflags = [
"-C"
"link-arg=-fuse-ld=${config.home.profileDirectory}/bin/mold"
];
};
"registries.crates-io" = {
protocol = "sparse";
};
};
".ideavimrc".source = ./${repo_root}/ideavim/ideavimrc;
"/bin/run_ollama" = {
source = ./${repo_root}/zsh/bin/run_ollama;
executable = true;
};
"/bin/age-op" = {
source = ./${repo_root}/bin/age-op;
executable = true;
};
};
xdg.configFile = {
"1Password/ssh/agent.toml".text = ''
[[ssh-keys]]
item = "l24kumgnx3h3gyvon6k5we54qi"
[[ssh-keys]]
item = "mpf42t6kn2hxijw5jsqti4hxfm"
'';
"cy/cyrc.janet".source = ./${repo_root}/cy/cy.janet;
"doom/init.el" = {
source = ./${repo_root}/emacs/emacs.doom/init.el;
onChange = "~/.emacs.d/bin/doom sync";
};
"doom/config.el" = {
source = ./${repo_root}/emacs/emacs.doom/config.el;
onChange = "~/.emacs.d/bin/doom sync";
};
"doom/packages.el" = {
source = ./${repo_root}/emacs/emacs.doom/packages.el;
onChange = "~/.emacs.d/bin/doom sync";
};
"erdtree/.erdtreerc".source = ./${repo_root}/erdtree/erdtreerc;
# "ghostty/config".source = ./${repo_root}/ghostty/config;
"kitty/kitty.conf".source = ./${repo_root}/kitty/kitty.conf;
"lsd/config.yaml".source = ./${repo_root}/lsd/config.yaml;
"neovide/config.toml".source = (pkgs.formats.toml { }).generate "neovide-config" {
font = {
normal = nv_fonts_normal;
italic = nv_fonts_italic;
size = 14;
};
};
"zed/settings.json".source = ./${repo_root}/zed/settings.json;
"zed/keymap.json".source = ./${repo_root}/zed/keymap.json;
}; };
} }

135
nix/home-manager/modules/packages/default.nix
View file

@ -1,107 +1,41 @@
{ pkgs, ... }:
let
inherit (pkgs.stdenv.hostPlatform) isLinux;
systemSpecificPackages =
with pkgs;
if
isLinux
# ncdu (well, all zig packages) don't work on macOS nix right now
then
[
zsh
racket
mold
ncdu
ghostty
xorg.libX11
]
else
[
keka
colima
neovide
aerospace
maccy
];
cy =
{
pkgs,
fetchFromGitHub,
}:
let
ver = "1.3.1";
in
pkgs.buildGoModule {
pname = "cy";
version = "${ver}";
src = fetchFromGitHub {
owner = "cfoust";
repo = "cy";
rev = "refs/tags/v${ver}";
hash = "sha256-i5suNLh1Dy8sWKBasO1rnVRzDetEF77XXRonRk1RzB4=";
};
vendorHash = null;
buildPhase = ''
runHook preBuild
export GOCACHE=$PWD/.cache/go-build
go install ./cmd/cy/
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin $GOPATH/bin/cy
runHook postInstall
'';
};
in
{ {
pkgs,
lib,
config,
system,
...
}: let
systemSpecificPackages =
if "${system}" != "aarch64-darwin"
# include gping because of open bug
then [pkgs.zsh pkgs.racket pkgs.gping pkgs.mold]
else [];
in {
imports = [ imports = [
./emacs.nix
./git.nix ./git.nix
./mise.nix
./neovim.nix ./neovim.nix
./ssh.nix
./starship.nix ./starship.nix
./zellij.nix ./zellij.nix
./zsh.nix ./zsh.nix
# ./cy.nix
]; ];
home.packages = home.packages = with pkgs;
with pkgs;
[ [
_1password-cli bandwhich
nerd-fonts._0xproto
bat bat
bottom bottom
cargo-workspaces cargo-workspaces
colima
clipboard-jh clipboard-jh
curl dogdns
departure-mono
docker-client
dogedns
erdtree erdtree
erg
emacs
fantasque-sans-mono
fd fd
(fenix.latest.withComponents [
"cargo"
"clippy"
"rustfmt"
"rust-src"
"rustc"
])
ffmpeg_6 ffmpeg_6
gawkInteractive gawk
git-credential-1password
gnugrep gnugrep
gnused gnused
gnutar gnutar
gping
gql
httpstat
imagemagick imagemagick
internetarchive internetarchive
jless jless
@ -110,34 +44,15 @@ in
kondo kondo
litecli litecli
magic-wormhole-rs magic-wormhole-rs
maple-mono.NF ncdu
martian-mono ov
page pdm
pandoc poetry
parallel
picocrypt
picocrypt-cli
python312Packages.pipx
rage
ripgrep ripgrep
rsync rsync
rust-analyzer-nightly # part of the fenix distribution/overlay
scriptisto
see-cat
sqlite sqlite
tmux yt-dlp
vale
python312Packages.yt-dlp
zenith
zstd zstd
] ]
++ systemSpecificPackages ++ systemSpecificPackages;
++ (
if isLinux then
[ ]
else
[
(callPackage cy { })
]
);
} }

15
nix/home-manager/modules/packages/emacs.nix
View file

@ -1,8 +1,11 @@
{ ... }:
{ {
home.file = { config,
".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el; lib,
".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el; pkgs,
".doom.d/packages.el".source = ../../../../emacs/emacs.doom/packages.el; system,
}; ...
}: {
home.file.".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el;
home.file.".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el;
home.file.".doom.d/packages.el".source = ../../../../emacs/emacs.doom/packages.el;
} }

72
nix/home-manager/modules/packages/git.nix
View file

@ -1,12 +1,12 @@
{ pkgs, ... }:
{ {
config,
lib,
pkgs,
...
}: {
programs.git = { programs.git = {
enable = true; enable = true;
# Don't use difftastic on git-diff by default difftastic.enable = true;
# it makes distributing patches difficult
#
# Instead use difftastic as a difftool
difftastic.enable = false;
userName = "Anthony Cicchetti"; userName = "Anthony Cicchetti";
userEmail = "anthony@anthonycicchetti.com"; userEmail = "anthony@anthonycicchetti.com";
@ -15,7 +15,6 @@
pushall = "!git remote | xargs -L1 git push --all"; pushall = "!git remote | xargs -L1 git push --all";
pr = "!f() { git fetch -fu $${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"; pr = "!f() { git fetch -fu $${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f";
logp = "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short"; logp = "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short";
difft = "difftool";
}; };
extraConfig = { extraConfig = {
@ -28,49 +27,18 @@
workers = 0; workers = 0;
}; };
diff = {
tool = "difftastic";
algorithm = "histogram";
submodule = "log";
};
difftool = {
prompt = false;
difftastic = {
cmd = "${pkgs.difftastic}/bin/difft --color auto --background light --display side-by-side \"$LOCAL\" \"$REMOTE\"";
};
};
fetch = { fetch = {
prune = true; prune = true;
fsckObjects = true;
pruneTags = true;
}; };
format = { format = {
pretty = "fuller"; pretty = "fuller";
}; };
help = {
autoCorrect = "prompt";
};
init = {
defaultBranch = "main";
};
log = { log = {
follow = true; follow = true;
}; };
merge = {
conflictStyle = "zdiff3";
};
pack = {
allowPackReuse = "multi";
};
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;
}; };
@ -79,33 +47,19 @@
rebase = true; rebase = true;
}; };
init = {
defaultBranch = "main";
};
help = {
autoCorrect = "prompt";
};
rebase = { rebase = {
updateRefs = true; updateRefs = true;
}; };
receive = {
fsckObjects = true;
};
rerere = {
enabled = true;
};
status = {
submoduleSummary = true;
};
submodule = {
recurse = true;
};
transfer = {
fsckObjects = true;
};
}; };
includes = [ includes = [
{ path = "~/.gitconfig_local"; } {path = "~/.gitconfig_local";}
]; ];
}; };
} }

25
nix/home-manager/modules/packages/mise.nix
View file

@ -1,25 +0,0 @@
{ ... }:
{
programs.mise = {
enable = true;
enableZshIntegration = true;
globalConfig = {
tools = {
node = "lts";
python = "latest";
uv = "latest";
};
settings = {
experimental = true;
pipx = {
uvx = true;
};
status = {
missing_tools = "always";
};
python_compile = true;
python_default_packages_file = "$HOME/.dotfiles/defaults/default-packages";
};
};
};
}

423
nix/home-manager/modules/packages/neovim.nix
View file

@ -1,378 +1,113 @@
{ pkgs, ... }:
{ {
programs.nixvim = { config,
lib,
pkgs,
...
}: {
programs.nixneovim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
extraConfigLuaPre = builtins.readFile ./neovim/pre.lua; extraLuaPreConfig = builtins.readFile ./neovim/pre.lua;
extraConfigLuaPost = builtins.readFile ./neovim/core.lua; extraConfigLua = builtins.readFile ./neovim/core.lua;
colorscheme = "onedark";
colorschemes = { colorschemes = {
onedark.enable = true; onedark.enable = true;
}; };
diagnostics = {
virtual_lines = true;
};
plugins = { plugins = {
fugitive = {
enable = true;
};
gitsigns = {
enable = true;
};
lualine = {
enable = true;
# theme = "bubbles_theme"; # Currently doesn't work
settings = {
componentSeparators = {
left = "";
right = "";
};
sectionSeparators = {
left = "";
right = "";
};
sections = {
lualine_a = [
{
__unkeyed-1 = "mode";
separator = {
left = "";
};
padding = {
right = 2;
left = 0;
};
}
];
lualine_b = [
"filename"
"branch"
];
lualine_c = [ "%=" ];
lualine_x = [ ];
lualine_y = [
"filetype"
"progress"
];
lualine_z = [
{
__unkeyed-1 = "location";
separator = {
right = "";
};
padding = {
right = 0;
left = 2;
};
}
];
};
};
};
lsp = { lsp = {
enable = true; enable = true;
preConfig = '''';
servers = { servers = {
bashls.enable = true; bashls.enable = true;
gopls.enable = true; gopls.enable = true;
jsonls.enable = true; jsonls.enable = true;
pyright.enable = true; # In preference to attempting to use pylyzer pyright.enable = true;
nil_ls.enable = true; rust-analyzer.enable = true;
rust_analyzer =
let
fenix = fenix.latest.withComponents [
"cargo"
"rustc"
];
in
{
enable = true;
installCargo = false;
installRustc = false;
cargoPackage = fenix.cargo;
rustcPackage = fenix.rustc;
};
taplo.enable = true;
terraformls.enable = true;
yamlls.enable = true;
};
};
mini = {
enable = true;
modules = {
ai.enable = true;
align.enable = true;
animate.enable = true;
comment.enable = true;
completion.enable = true;
indentscope.enable = true;
jump.enable = true;
jump2d = {
enable = true;
mappings.start_jumping = "<leader>a";
};
splitjoin.enable = true;
surround.enable = true;
tabline.enable = true;
clue = {
triggers = [
{
mode = "n";
keys = "<leader>";
}
{
mode = "n";
keys = "z";
}
];
clues = [
{ __raw = "require('mini.clue').gen_clues.builtin_completion()"; }
{ __raw = "require('mini.clue').gen_clues.g()"; }
{ __raw = "require('mini.clue').gen_clues.marks()"; }
{ __raw = "require('mini.clue').gen_clues.registers()"; }
{ __raw = "require('mini.clue').gen_clues.windows()"; }
{ __raw = "require('mini.clue').gen_clues.z()"; }
];
};
};
};
blink-cmp = {
enable = true;
settings = {
keymap.preset = "super-tab";
appearance = {
nerd_font_variant = "mono";
};
completion = {
ghost_text = {
enabled = true;
show_with_menu = false;
};
accept = {
auto_brackets = {
enabled = true;
};
};
list = {
selection = {
auto_insert = false;
preselect = true;
};
};
menu = {
draw = {
columns.__raw = "{ { 'kind_icon' }, {'label', gap = 1 } }";
components = {
label.__raw = ''
{
text = function(ctx)
return require('colorful-menu').blink_components_text(ctx)
end,
highlight = function(ctx)
return require('colorful-menu').blink_components_highlight(ctx)
end,
}'';
};
};
};
};
signature = {
enabled = true;
};
sources = {
default = [
"lsp"
"path"
"snippets"
"buffer"
# [TODO] Disabled until I figure this out, rust uses :: "emoji"
];
providers = {
emoji = {
module = "blink-emoji";
name = "Emoji";
score_offset = 15;
opts = {
insert = true;
};
};
};
};
};
};
blink-emoji.enable = true;
project-nvim = {
enable = true;
enableTelescope = true;
settings.detection_methods = [
"lsp"
"pattern"
];
};
telescope = {
enable = true;
extensions.live-grep-args.enable = true;
enabledExtensions = [
"zf-native" # TODO
"projects" # TODO
];
# extraLua = {
# post = builtins.readFile ./neovim/telescope.lua;
# };
keymaps = {
"<leader>ff" = {
mode = "n";
action = "find_files";
options.desc = "Find Files";
};
"<leader>fg" = {
mode = "n";
action = "live_grep";
options.desc = "Live Grep";
};
"<leader>fb" = {
mode = "n";
action = "buffers";
options.desc = "Find Buffers";
};
"<leader>r" = {
mode = "n";
action = "registers";
options.desc = "View Registers";
};
"<leader>pr" = {
mode = "n";
action = "lsp_references";
options.desc = "(LSP) References";
};
"<leader>pi" = {
mode = "n";
action = "lsp_implementations";
options.desc = "(LSP) Implementations";
};
"<leader>pd" = {
mode = "n";
action = "lsp_definitions";
options.desc = "(LSP) Definitions";
};
"<leader>ps" = {
mode = "n";
action = "lsp_document_symbols";
options.desc = "(LSP) Document Symbols";
};
"<leader>pws" = {
mode = "n";
action = "lsp_workspace_symbols";
options.desc = "(LSP) Workspace Symbols";
};
"<leader>pwd" = {
mode = "n";
action = "lsp_dynamic_workspace_symbols";
options.desc = "(LSP) Dynamic Workspace Symbols";
};
}; };
}; };
treesitter = { treesitter = {
enable = true; enable = true;
settings = { indent = true;
indent = {
enable = true;
};
incremental_selection = {
enable = true;
};
};
folding = true; folding = true;
incrementalSelection = {
enable = true;
};
}; };
trouble = { mini = {
enable = true;
ai.enable = true;
align.enable = true;
animate.enable = true;
comment.enable = true;
jump.enable = true;
surround.enable = true;
};
fugitive = {
enable = true; enable = true;
}; };
ts-context-commentstring = { undotree = {
enable = true; enable = true;
}; };
overseer = { which-key = {
enable = true; enable = true;
}; };
nvim-ufo = { project-nvim = {
enable = true; enable = true;
}; };
rainbow-delimiters = {
enable = true;
};
vim-bbye = {
enable = true;
};
web-devicons.enable = true;
}; };
extraPlugins = extraPlugins =
(with pkgs.vimPlugins; [ (
telescope-symbols-nvim with pkgs.vimPlugins; [
telescope-zf-native-nvim vim-ReplaceWithRegister
vim-ReplaceWithRegister ctrlp-vim
vim-dispatch-neovim vim-dispatch-neovim
vim-expand-region vim-bbye
colorful-menu-nvim editorconfig-nvim
]) vim-expand-region
++ (with pkgs.awesomeNeovimPlugins; [ vim-signify
linrongbin16-gitlinker-nvim vim-terraform
officer-nvim leap-nvim
nvim-biscuits ]
colorful-menu-nvim )
++ (with pkgs.vimExtraPlugins; [
nvim-ts-rainbow
]); ]);
keymaps = [ mappings = {
{ normal = {
action = "function() vim.api.nvim_command('wincmd h') end"; "<leader>u" = {
key = "<leader>h"; action = "vim.cmd.UndotreeToggle";
options.desc = "Cursor - Window left"; };
mode = "n"; "<leader>h" = {
} action = "function() vim.api.nvim_command('wincmd h') end";
{ };
action = "function() vim.api.nvim_command('wincmd j') end"; "<leader>j" = {
key = "<leader>j"; action = "function() vim.api.nvim_command('wincmd j') end";
options.desc = "Cursor - Window down"; };
mode = "n"; "<leader>k" = {
} action = "function() vim.api.nvim_command('wincmd k') end";
{ };
action = "function() vim.api.nvim_command('wincmd k') end"; "<leader>l" = {
key = "<leader>k"; action = "function() vim.api.nvim_command('wincmd l') end";
options.desc = "Cursor - Window up"; };
mode = "n"; "<c-k>" = {
} action = "'<c-u>'";
{ };
action = "function() vim.api.nvim_command('wincmd l') end"; "<c-j>" = {
key = "<leader>l"; action = "'<c-d>'";
options.desc = "Cursor - Window right"; };
mode = "n"; "<leader>n" = {
} action = "function() vim.api.nvim_command('nohl') end";
{ };
key = "<c-k>"; };
action = "<c-u>"; visual = {
mode = [ "<c-k>" = {
"n" action = "'<c-u>'";
"v" };
]; "<c-j>" = {
} action = "'<c-d>'";
{ };
key = "<c-j>"; };
action = "<c-d>"; };
mode = [
"n"
"v"
];
}
{
key = "<leader>n";
action = "function() vim.api.nvim_command('nohl') end";
options.desc = "nohl";
mode = "n";
}
{
action = "<cmd>Telescope<cr>";
key = "<leader>t";
options.desc = "Open Telescope";
mode = "n";
}
];
}; };
} }

27
nix/home-manager/modules/packages/neovim/core.lua
View file

@ -1,11 +1,4 @@
vim.o.expandtab = true vim.o.expandtab = true
-- local guifont = { "Iosevka Custom" }
-- if vim.loop.os_uname().sysname == "Darwin" then
-- table.insert(guifont, "Apple Color Emoji")
-- else
-- table.insert(guifont, "Noto Color Emoji")
-- end
-- vim.o.guifont = table.concat(guifont, ",") .. ":14"
vim.o.hidden = true vim.o.hidden = true
vim.o.ignorecase = true vim.o.ignorecase = true
vim.o.inccommand = "split" vim.o.inccommand = "split"
@ -30,20 +23,12 @@ vim.o.title = true
vim.o.updatetime = 500 vim.o.updatetime = 500
vim.o.wildmenu = true vim.o.wildmenu = true
vim.o.wildmode = "list:longest,full" vim.o.wildmode = "list:longest,full"
vim.g.skip_ts_context_commentstring_module = true
-- `page` config vim.api.nvim_create_autocmd('TextYankPost', {
vim.g.page_icon_pipe = "|" callback = function() vim.highlight.on_yank() end
vim.g.page_icon_redirect = ">"
vim.g.page_icon_instance = "$"
vim.api.nvim_create_autocmd("TextYankPost", {
callback = function()
vim.highlight.on_yank()
end,
}) })
require("gitlinker").setup() -- Ctrlp
require("nvim-biscuits").setup() vim.g.ctrlp_map = "<leader>p"
require("overseer").setup() vim.g.ctrlp_cmd = "CtrlPMixed"
require("officer").setup({ create_mappings = true }) vim.g.ctrlp_user_command = "rg --files %s"

78
nix/home-manager/modules/packages/neovim/pre.lua
View file

@ -1,80 +1,2 @@
vim.g.mapleader = " " vim.g.mapleader = " "
vim.g.maplocalleader = "," vim.g.maplocalleader = ","
-- local kind_icons = {
-- Text = "",
-- Method = "",
-- Function = "⨐",
-- Constructor = "",
-- Field = "",
-- Variable = "μ",
-- Class = "",
-- Interface = "",
-- Module = "",
-- Property = "",
-- Unit = "",
-- Value = "",
-- Enum = "",
-- Keyword = "",
-- Snippet = "",
-- Color = "፨",
-- File = "",
-- Reference = "",
-- Folder = "",
-- EnumMember = "",
-- Constant = "",
-- Struct = "",
-- Event = "",
-- Operator = "",
-- TypeParameter = "",
-- }
local colors = {
blue = "#80a0ff",
cyan = "#79dac8",
black = "#080808",
white = "#c6c6c6",
red = "#ff5189",
violet = "#d183e8",
grey = "#303030",
}
local bubbles_theme = {
normal = {
a = { fg = colors.black, bg = colors.violet },
b = { fg = colors.white, bg = colors.grey },
c = { fg = colors.white },
},
insert = { a = { fg = colors.black, bg = colors.blue } },
visual = { a = { fg = colors.black, bg = colors.cyan } },
replace = { a = { fg = colors.black, bg = colors.red } },
inactive = {
a = { fg = colors.white, bg = colors.black },
b = { fg = colors.white, bg = colors.black },
c = { fg = colors.white },
},
}
do
function setup()
require("ufo").setup({
provider_selector = function(bufnr, filetype, buftype)
return { "treesitter", "indent" }
end,
})
require("ufo").setup({})
vim.o.foldcolumn = "1" -- '0' is not bad
vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
vim.o.foldlevelstart = 99
vim.o.foldenable = true
end
success, output = pcall(setup) -- execute 'setup()' and catch any errors
if not success then
print("Error on setup for plugin: ufo")
print(output)
end
end

22
nix/home-manager/modules/packages/neovim/telescope.lua
View file

@ -1,22 +0,0 @@
require("telescope").load_extension("zf-native")
require("telescope").load_extension("projects")
require("telescope").load_extension("egrepify")
local builtin = require("telescope.builtin")
-- greps
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Find Files" })
-- vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Live Grep" })
vim.keymap.set("n", "<leader>fg", ":Telescope egrepify<CR>", { desc = "Live Grep" })
vim.keymap.set("n", "<leader>fb", builtin.buffers, { desc = "Buffers" })
-- register reading
vim.keymap.set("n", "<leader>r", builtin.registers, { desc = "View registers" })
-- lsp stuff
vim.keymap.set("n", "<leader>pr", builtin.lsp_references, { desc = "References" })
vim.keymap.set("n", "<leader>pi", builtin.lsp_implementations, { desc = "Implementations" })
vim.keymap.set("n", "<leader>pd", builtin.lsp_definitions, { desc = "Definitions" })
vim.keymap.set("n", "<leader>ps", builtin.lsp_document_symbols, { desc = "Document Symbols" })
vim.keymap.set("n", "<leader>pws", builtin.lsp_workspace_symbols, { desc = "Workspace Symbols" })
vim.keymap.set("n", "<leader>pwd", builtin.lsp_dynamic_workspace_symbols, { desc = "Dynamic Workspace Symbols" })

55
nix/home-manager/modules/packages/ssh.nix
View file

@ -1,55 +0,0 @@
{
config,
pkgs,
...
}:
let
inherit (pkgs.stdenv.hostPlatform) isDarwin;
_1pass_socket =
if isDarwin then
"${config.home.homeDirectory}/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
else
"${config.home.homeDirectory}/.1password/agent.sock";
in
{
programs.ssh = {
enable = true;
includes = if isDarwin then [ "${config.home.homeDirectory}/.colima/ssh_config" ] else [ ];
matchBlocks = {
"10.*" = {
setEnv = {
"TERM" = "xterm-256color";
};
};
"acicchetti.dev" = {
extraOptions = {
"IdentityAgent" = "'${_1pass_socket}'\n";
};
};
"*.sr.ht" = {
extraOptions = {
"IdentityAgent" = "'${_1pass_socket}'\n";
};
};
"github.com" = {
extraOptions = {
"IdentityAgent" = "'${_1pass_socket}'\n";
};
};
"pass.beer" = {
extraOptions = {
"IdentityAgent" = "'${_1pass_socket}'\n";
};
};
"git.anthonycicchetti.com" = {
extraOptions = {
"IdentityAgent" = "'${_1pass_socket}'\n";
};
};
"steamdeck" = {
user = "deck";
hostname = "192.168.1.55";
};
};
};
}

42
nix/home-manager/modules/packages/starship.nix
View file

@ -1,8 +1,11 @@
{ ... }:
{ {
config,
lib,
pkgs,
...
}: {
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true;
settings = { settings = {
aws = { aws = {
symbol = " "; symbol = " ";
@ -32,41 +35,6 @@
}; };
continuation_prompt = "→→"; continuation_prompt = "→→";
custom.jj = {
command = ''
jj log -r@ -l1 --ignore-working-copy --no-graph --color always -T '
separate(" ",
branches.map(|x| if(
x.name().substr(0, 10).starts_with(x.name()),
x.name().substr(0, 10),
x.name().substr(0, 9) ++ "…")
).join(" "),
tags.map(|x| if(
x.name().substr(0, 10).starts_with(x.name()),
x.name().substr(0, 10),
x.name().substr(0, 9) ++ "…")
).join(" "),
surround("\"","\"",
if(
description.first_line().substr(0, 24).starts_with(description.first_line()),
description.first_line().substr(0, 24),
description.first_line().substr(0, 23) ++ "…"
)
),
if(conflict, "conflict"),
if(divergent, "divergent"),
if(hidden, "hidden"),
)
'
'';
detect_folders = [ ".jj" ];
symbol = "jj";
};
custom.jjstatus = {
command = ''jj log -r@ -l1 --no-graph -T "" --stat | tail -n1 | sd "(\d+) files? changed, (\d+) insertions?\(\+\), (\d+) deletions?\(-\)" " $${1}m $${2}+ $${3}-" | sd " 0." ""'';
detect_folders = [ ".jj" ];
};
dart = { dart = {
symbol = " "; symbol = " ";
}; };

11
nix/home-manager/modules/packages/zellij.nix
View file

@ -1,11 +1,12 @@
{ ... }:
{ {
config,
lib,
pkgs,
...
}: {
programs.zellij = { programs.zellij = {
enable = true; enable = true;
enableZshIntegration = false; # automatically sets up a session - I don't want this, I want manual control of my sessions
}; };
xdg.configFile = { home.file.".config/zellij/config.kdl".source = ../../../../zellij/config.kdl;
"zellij/config.kdl".source = ../../../../zellij/config.kdl;
};
} }

127
nix/home-manager/modules/packages/zsh.nix
View file

@ -1,109 +1,30 @@
{ pkgs, ... }:
let
inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux;
in
{ {
config,
lib,
pkgs,
...
}: {
programs.zsh = { programs.zsh = {
enable = true; enable = false;
initExtraFirst = '' plugins = [
autoload -Uz up-line-or-beginning-search down-line-or-beginning-search zmv colors add-zle-hook-widget compinit {
compinit # fast-syntax-highlighting
zle -N up-line-or-beginning-search }
zle -N down-line-or-beginning-search {
export ZSH_CACHE_DIR="$HOME/.cache/zsh" # zsh-completions
}
typeset -U path PATH {
''; # zsh-completions-anyenv
initExtra = builtins.readFile ../../../../zsh/zshrc; }
antidote = { {
enable = true; # zsh-vimode-visual
plugins = }
let ];
ohmyzsh-lib = "ohmyzsh/oh-my-zsh path:lib";
ohmyzsh-plugin = "ohmyzsh/oh-my-zsh path:plugins";
extraPlugins =
if isLinux then
[ ]
else if isDarwin then
[
"${ohmyzsh-plugin}/brew"
]
else
[ ];
in
extraPlugins
++ [
"zdharma-continuum/fast-syntax-highlighting"
"zsh-users/zsh-completions"
"jeffreytse/zsh-vi-mode"
"reegnz/jq-zsh-plugin"
"${ohmyzsh-lib}/completion.zsh"
"${ohmyzsh-lib}/git.zsh"
"${ohmyzsh-plugin}/1password"
"${ohmyzsh-plugin}/aws"
"${ohmyzsh-plugin}/colored-man-pages"
"${ohmyzsh-plugin}/docker"
"${ohmyzsh-plugin}/docker-compose"
"${ohmyzsh-plugin}/emoji"
"${ohmyzsh-plugin}/fd kind:fpath"
"${ohmyzsh-plugin}/gh"
"${ohmyzsh-plugin}/git"
"${ohmyzsh-plugin}/gitignore"
"${ohmyzsh-plugin}/gradle"
"${ohmyzsh-plugin}/helm"
"${ohmyzsh-plugin}/isodate"
"${ohmyzsh-plugin}/mix-fast"
"${ohmyzsh-plugin}/mosh"
"${ohmyzsh-plugin}/mvn"
"${ohmyzsh-plugin}/nmap"
"${ohmyzsh-plugin}/rsync"
"${ohmyzsh-plugin}/rust"
];
useFriendlyNames = true;
};
autosuggestion = {
enable = true;
};
dirHashes = {
"-- -dotfiles" = "$HOME/.dotfiles";
"-- -src" = "$HOME/src";
"-- -doom" = "$HOME/.emacs.d";
};
autocd = false;
history = { history = {
path = "$HOME/.histfile"; # TODO
size = 10000; # HISTFILE=~/.histfile
save = 10000; # HISTSIZE=10000
ignoreAllDups = true; # SAVEHIST=10000
ignoreSpace = true;
}; };
sessionVariables = {
COMPLETION_WAITING_DOTS = true;
VISUAL = "nvim";
EDITOR = "nvim";
RPROMPT = "' '"; # Fixes a side-effect of the vi-mode oh-my-zsh plugin
KEYTIMEOUT = 1;
AGE = "rage";
AGE_KEYPATH = "op://Jellyfish/age-key";
};
shellAliases =
let
platformSpecificAliases =
if isLinux then
{
cp = "cp --reflink=auto";
}
else
{
# exa = "eza -l --git";
# ls = "exa";
nv = "neovide --fork";
};
in
{ zj = "zellij -l welcome"; } // platformSpecificAliases;
};
programs.carapace = {
enable = true;
enableZshIntegration = true;
}; };
} }

6
nix/home-manager/modules/services/default.nix
View file

@ -1,6 +0,0 @@
{ ... }:
{
imports = [
./git-sync.nix
];
}

13
nix/home-manager/modules/services/git-sync.nix
View file

@ -1,13 +0,0 @@
{ config, ... }:
{
services.git-sync = {
enable = true;
repositories = {
"org-roam" = {
path = "${config.home.homeDirectory}/org-roam";
interval = 300;
uri = "git@git.anthonycicchetti.com:anthonycicc/org-roam";
};
};
};
}

18
nix/setup.sh
View file

@ -1,17 +1,21 @@
#!/bin/bash
if [[ ! -x $(command -v nix) ]]; then if [[ ! -x $(command -v nix) ]]; then
echo "make sure to install nix" echo "make sure to install nix"
exit 1 exit 1
fi fi
nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
nix-channel --update nix-channel --update
nix profile install --accept-flake-config nixpkgs#cachix
cachix use
nix-shell '<home-manager>' -A install nix-shell '<home-manager>' -A install
nix flake update nix flake update
if [[ $(uname) == "Darwin" ]]; then
# we're modern macOS
home-manager switch --flake "$PWD/home-manager#aarch64-darwin-acicchetti"
else
# we're linux
home-manager switch --flake "$PWD/home-manager#x86_64-linux-acicchetti"
fi
./update.sh -a git clone https://github.com/doomemacs/doomemacs ~/.emacs.d
~/.emacs.d/bin/doom install

60
nix/update.sh
View file

@ -1,50 +1,12 @@
#!/bin/bash #!/bin/bash
pushd ~/.dotfiles
do_devenv() { printf "Updating \033[38;5;87mdevenv\033[0m \n"
pushd ~/.dotfiles || return nix flake update
printf "Updating \033[38;5;87mdevenv\033[0m \n" pushd ./nix/home-manager
nix flake update printf "Updating \033[38;5;87mhome-manager\033[0m\n"
popd || return nix flake update
} if [[ $(uname) == "Darwin" ]]; then
home-manager switch --flake ".#aarch64-darwin-acicchetti"
do_topgrade() { else
topgrade home-manager switch --flake '.#x86_64-linux-acicchetti'
} fi
update_home_manager() {
pushd ./home-manager || return
printf "Updating \033[38;5;87mhome-manager\033[0m\n"
nix flake update
popd || return
}
apply_home_manager() {
pushd ./home-manager || return
if [[ $(uname) == "Darwin" ]]; then
home-manager switch --flake ".#aarch64-darwin-acicchetti"
else
home-manager switch --flake '.#x86_64-linux-acicchetti'
fi
popd || return
}
while getopts ':dhat' opt; do
case $opt in
a)
apply_home_manager
;;
d)
do_devenv
;;
h)
update_home_manager
apply_home_manager
;;
t)
do_topgrade
;;
?)
echo "Ignoring unknown option. Please only pass -a, -d, -h, or -t"
exit
;;
esac
done

1
statix.toml
View file

@ -1 +0,0 @@
disabled = ["empty_pattern"]

2
topgrade/topgrade.toml
View file

@ -16,6 +16,8 @@ display_time = true
skip_notify = true skip_notify = true
display_preamble = true
# List of remote machines with Topgrade installed on them # List of remote machines with Topgrade installed on them
#remote_topgrades = ["toothless", "pi", "parnas"] #remote_topgrades = ["toothless", "pi", "parnas"]

163
wezterm/wezterm.lua
View file

@ -1,33 +1,28 @@
local wezterm = require("wezterm") local wezterm = require 'wezterm';
local act = wezterm.action
-- Allow working with both the current release and the nightly -- Allow working with both the current release and the nightly
local config = {} local config = {}
if wezterm.config_builder then if wezterm.config_builder then
config = wezterm.config_builder() config = wezterm.config_builder()
end end
config.font = wezterm.font_with_fallback({ config.font = wezterm.font_with_fallback({
{ family = "0xProto Nerd Font Mono" }, {family="Iosevka Custom", weight="Medium"},
{ family = "Maple Mono NF" },
{ family = "Departure Mono" },
{ family = "Fantasque Sans Mono" },
{ family = "Iosevka Custom", weight = "Medium" },
}) })
config.font_rules = { config.font_rules = {
{ {
italic = true, italic = true,
font = wezterm.font_with_fallback({ font = wezterm.font_with_fallback({
{ family = "Maple Mono NF", italic = true }, {family="Dank Mono", italic=true},
{ family = "Dank Mono", italic = true }, {family="Iosevka Custom", weight="Light"},
{ family = "Fantasque Sans Mono", italic = true }, }
{ family = "Iosevka Custom", weight = "Light" }, ),
}), },
},
} }
config.font_size = 14.0 config.font_size = 15.0
-- wayland? -- wayland?
config.enable_wayland = true config.enable_wayland = true
-- TERM name -- TERM name
@ -35,123 +30,31 @@ config.term = "xterm-256color"
-- Color Scheme(s) -- Color Scheme(s)
-- config.color_scheme = "Hopscotch.256" -- config.color_scheme = "Hopscotch.256"
config.color_scheme = "Everblush"
config.color_schemes = { config.color_schemes = {
["Corvine"] = { ["Corvine"] = {
background = "#262626", background = "#262626",
foreground = "#c6c6c6", foreground = "#c6c6c6",
-- ansi = {"black", "maroon", "green", "olive", "navy", "purple", "teal", "silver"}, -- ansi = {"black", "maroon", "green", "olive", "navy", "purple", "teal", "silver"},
-- brights = {"grey", "red", "lime", "yellow", "blue", "fuchsia", "aqua", "white"}, -- brights = {"grey", "red", "lime", "yellow", "blue", "fuchsia", "aqua", "white"},
ansi = { "#3a3a3a", "#d7d7d7", "#87af5f", "#d7d7af", "#87afd7", "#afafd7", "#87d7d7", "#c6c6c6" }, ansi = {"#3a3a3a", "#d7d7d7", "#87af5f", "#d7d7af", "#87afd7", "#afafd7", "#87d7d7", "#c6c6c6"},
brights = { "#626262", "#ffafaf", "#afd787", "#d7d787", "#87d7ff", "#d7afd7", "#5fd7d7", "#eeeeee" }, brights = {"#626262", "#ffafaf", "#afd787", "#d7d787", "#87d7ff", "#d7afd7", "#5fd7d7", "#eeeeee"}
}, },
["OceanicNext"] = { ["OceanicNext"] = {
background = "#1b2b34", background = "#1b2b34",
foreground = "#c0c5ce", foreground = "#c0c5ce",
-- Overrides the cell background color when the current cell is occupied by the -- Overrides the cell background color when the current cell is occupied by the
-- cursor and the cursor style is set to Block -- cursor and the cursor style is set to Block
cursor_bg = "#c0c5ce", cursor_bg = "#c0c5ce",
-- Overrides the text color when the current cell is occupied by the cursor -- Overrides the text color when the current cell is occupied by the cursor
cursor_fg = "#1b2b34", cursor_fg = "#1b2b34",
ansi = { "#1b2b34", "#ec5f67", "#99c794", "#fac863", "#6699cc", "#c594c5", "#5fb3b3", "#c0c5ce" }, ansi = {"#1b2b34", "#ec5f67", "#99c794", "#fac863", "#6699cc", "#c594c5", "#5fb3b3", "#c0c5ce"},
brights = { "#65737e", "#ec5f67", "#99c794", "#fac863", "#6699cc", "#c594c5", "#5fb3b3", "#d8dee9" }, brights = {"#65737e", "#ec5f67", "#99c794" ,"#fac863", "#6699cc", "#c594c5", "#5fb3b3", "#d8dee9"}
}, },
["Kanagawa"] = {
-- force_reverse_video_cursor = true,
foreground = "#dcd7ba",
background = "#1f1f28",
cursor_bg = "#c8c093",
cursor_fg = "#c8c093",
cursor_border = "#c8c093",
selection_fg = "#c8c093",
selection_bg = "#2d4f67",
scrollbar_thumb = "#16161d",
split = "#16161d",
ansi = { "#090618", "#c34043", "#76946a", "#c0a36e", "#7e9cd8", "#957fb8", "#6a9589", "#c8c093" },
brights = { "#727169", "#e82424", "#98bb6c", "#e6c384", "#7fb4ca", "#938aa9", "#7aa89f", "#dcd7ba" },
indexed = { [16] = "#ffa066", [17] = "#ff5d62" },
},
} }
config.color_scheme = "Kanagawa"
-- Tab Bar -- Tab Bar
config.enable_tab_bar = true config.enable_tab_bar = true
config.hide_tab_bar_if_only_one_tab = true config.hide_tab_bar_if_only_one_tab = true
config.front_end = "WebGpu"
-- Wezterm Mux
config.unix_domains = { { name = "unix" } }
config.default_gui_startup_args = { "connect", "unix" }
-- Some keybinds… A lot of keybinds
local copy_mode = nil
if wezterm.gui then
copy_mode = wezterm.gui.default_key_tables().copy_mode
table.insert(copy_mode, { key = "k", mods = "CTRL", action = act.CopyMode({ MoveByPage = -0.5 }) })
table.insert(copy_mode, { key = "j", mods = "CTRL", action = act.CopyMode({ MoveByPage = 0.5 }) })
end
-- config.leader = { key = "a", mods = "CTRL", timeout_milliseconds = 1000 }
-- config.keys = {
-- {
-- key = "|",
-- mods = "LEADER|SHIFT",
-- action = act.SplitHorizontal({ domain = "CurrentPaneDomain" }),
-- },
-- {
-- key = "a",
-- mods = "LEADER|CTRL",
-- action = act.SendKey({ key = "a", mods = "CTRL" }),
-- },
-- {
-- key = "-",
-- mods = "LEADER",
-- action = act.SplitVertical({ domain = "CurrentPaneDomain" }),
-- },
-- {
-- key = "n",
-- mods = "LEADER",
-- action = act.ActivateKeyTable({
-- name = "manage_panes",
-- one_shot = false,
-- timeout_milliseconds = 5000,
-- until_unknown = true,
-- }),
-- },
-- {
-- key = "Escape",
-- mods = "LEADER",
-- action = act.ActivateCopyMode,
-- },
-- { key = "Tab", mods = "LEADER", action = act.QuickSelect },
-- { key = "c", mods = "LEADER", action = act.SpawnTab("CurrentPaneDomain") },
-- }
-- config.key_tables = {
-- manage_panes = {
-- { key = "LeftArrow", action = act.AdjustPaneSize({ "Left", 1 }) },
-- { key = "h", action = act.AdjustPaneSize({ "Left", 1 }) },
-- { key = "h", mods = "SHIFT", action = act.ActivatePaneDirection("Left") },
-- { key = "RightArrow", action = act.AdjustPaneSize({ "Right", 1 }) },
-- { key = "l", action = act.AdjustPaneSize({ "Right", 1 }) },
-- { key = "l", mods = "SHIFT", action = act.ActivatePaneDirection("Right") },
-- { key = "UpArrow", action = act.AdjustPaneSize({ "Up", 1 }) },
-- { key = "k", action = act.AdjustPaneSize({ "Up", 1 }) },
-- { key = "k", mods = "SHIFT", action = act.ActivatePaneDirection("Up") },
-- { key = "DownArrow", action = act.AdjustPaneSize({ "Down", 1 }) },
-- { key = "j", action = act.AdjustPaneSize({ "Down", 1 }) },
-- { key = "j", mods = "SHIFT", action = act.ActivatePaneDirection("Down") },
-- -- Cancel the mode by pressing escape
-- { key = "Escape", action = "PopKeyTable" },
-- },
-- copy_mode = copy_mode,
-- }
return config return config

9
zed/keymap.json
View file

@ -1,9 +0,0 @@
[
{
"context": "VimControl",
"bindings": {
"space s": "pane::RevealInProjectPanel",
"ctrl-r": "workspace::ToggleRightDock"
}
}
]

96
zed/settings.json
View file

@ -1,96 +0,0 @@
// Zed settings
//
// For information on how to configure Zed, see the Zed
// documentation: https://zed.dev/docs/configuring-zed
//
// To see all of Zed's default settings without changing your
// custom settings, run `zed: open default settings` from the
// command palette
{
"assistant": {
"default_model": {
"provider": "ollama",
"model": "llama3.2:3b"
},
"version": "2"
},
"vim_mode": true,
"autosave": "on_focus_change",
"buffer_font_family": "Berkeley Mono",
"buffer_font_fallbacks": [
"Apple Color Emoji",
"Segoe UI Emoji",
"Noto Color Emoji"
],
"buffer_font_weight": 400,
"buffer_font_size": 14,
"load_direnv": "shell_hook",
"ui_font_size": 16,
"theme": {
"mode": "system",
"light": "Kanagawa Wave",
"dark": "Kanagawa Wave"
},
"scrollbar": {
"show": "always"
},
"tab_bar": {
"show_nav_history_buttons": false
},
"tabs": {
"file_icons": true,
"git_status": true
},
"toolbar": {
"breadcrumbs": true,
"quick_actions": true
},
"lsp": {
"rust-analyzer": {
"initialization_options": {
"check": {
"command": "clippy"
}
}
}
},
"always_treat_brackets_as_autoclosed": true,
"git": {
"git_gutter": "tracked_files",
"inline_blame": {
"enabled": true,
"delay_ms": 200
}
},
"indent_guides": {
"enabled": true,
"coloring": "indent_aware",
"background_coloring": "disabled"
},
"inlay_hints": {
"enabled": true,
"show_type_hints": true,
"show_parameter_hints": true
},
"languages": {
"Python": {
"format_on_save": "on",
"formatter": {
"external": {
"command": "black",
"args": ["--quiet", "-"]
}
}
}
},
"preview_tabs": {
"enabled": true,
"enable_preview_from_file_finder": true,
"enable_preview_from_code_navigation": true
},
"show_whitespaces": "all",
"telemetry": {
"diagnostics": false,
"metrics": false
}
}

364
zellij/config.kdl
View file

@ -1,29 +1,242 @@
keybinds { keybinds clear-defaults=true {
shared_except "locked" "tmux" { normal {
bind "Ctrl g" { SwitchToMode "locked"; } bind "Ctrl g" { SwitchToMode "locked"; }
// bind "Ctrl p" { SwitchToMode "pane"; } bind "Ctrl p" { SwitchToMode "pane"; }
bind "Ctrl n" { SwitchToMode "resize"; } bind "Ctrl n" { SwitchToMode "resize"; }
bind "Ctrl t" { SwitchToMode "tab"; } bind "Ctrl t" { SwitchToMode "tab"; }
bind "Ctrl s" { SwitchToMode "scroll"; } bind "Ctrl s" { SwitchToMode "scroll"; }
bind "Ctrl o" { SwitchToMode "session"; } bind "Ctrl o" { SwitchToMode "session"; }
bind "Ctrl h" { SwitchToMode "move"; } bind "Ctrl h" { SwitchToMode "move"; }
bind "Ctrl a" { SwitchToMode "tmux"; } bind "Ctrl a" { SwitchToMode "tmux"; }
}
normal {
bind "Ctrl q" { Quit; } bind "Ctrl q" { Quit; }
} bind "Alt n" { NewPane; }
move { bind "Alt h" { MoveFocusOrTab "Left"; }
bind "Esc" { SwitchToMode "Normal";} bind "Alt l" { MoveFocusOrTab "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
} }
locked { locked {
bind "Ctrl g" { SwitchToMode "normal"; } bind "Ctrl g" { SwitchToMode "normal"; }
} }
tmux { pane {
bind "Esc" { EditScrollback; SwitchToMode "normal"; } bind "Ctrl g" { SwitchToMode "locked"; }
bind "Ctrl o" "Enter" "Space" "Esc" { SwitchToMode "normal"; } bind "Ctrl n" { SwitchToMode "resize"; }
bind "Ctrl t" { SwitchToMode "tab"; }
bind "Ctrl p" "Enter" "Space" "Esc" { SwitchToMode "normal"; }
bind "Ctrl s" { SwitchToMode "scroll"; }
bind "Ctrl o" { SwitchToMode "session"; }
bind "Ctrl h" { SwitchToMode "move"; }
bind "Ctrl b" { SwitchToMode "tmux"; }
bind "Ctrl q" { Quit; }
bind "h" "Left" { MoveFocus "Left"; }
bind "l" "Right" { MoveFocus "Right"; }
bind "j" "Down" { MoveFocus "Down"; }
bind "k" "Up" { MoveFocus "Up"; }
bind "p" { SwitchFocus; }
bind "n" { NewPane; SwitchToMode "normal"; }
bind "d" { NewPane "Down"; SwitchToMode "normal"; }
bind "r" { NewPane "Right"; SwitchToMode "normal"; }
bind "x" { CloseFocus; SwitchToMode "normal"; }
bind "f" { ToggleFocusFullscreen; SwitchToMode "normal"; }
bind "z" { TogglePaneFrames; SwitchToMode "normal"; }
bind "w" { ToggleFloatingPanes; SwitchToMode "normal"; }
bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "normal"; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
bind "c" { SwitchToMode "RenamePane"; PaneNameInput 0; }
}
tab {
bind "Ctrl g" { SwitchToMode "locked"; }
bind "Ctrl p" { SwitchToMode "pane"; }
bind "Ctrl n" { SwitchToMode "resize"; }
bind "Ctrl t" "Enter" "Space" "Esc" { SwitchToMode "normal"; }
bind "Ctrl s" { SwitchToMode "scroll"; }
bind "Ctrl h" { SwitchToMode "move"; }
bind "Ctrl b" { SwitchToMode "tmux"; }
bind "Ctrl o" { SwitchToMode "session"; }
bind "r" { SwitchToMode "RenameTab"; TabNameInput 0; }
bind "Ctrl q" { Quit; }
bind "h" "Left" "Up" "k" { GoToPreviousTab; }
bind "l" "Right" "Down" "j" { GoToNextTab; }
bind "n" { NewTab; SwitchToMode "normal"; }
bind "x" { CloseTab; SwitchToMode "normal"; }
bind "s" { ToggleActiveSyncTab; SwitchToMode "normal"; }
bind "1" { GoToTab 1; SwitchToMode "normal"; }
bind "2" { GoToTab 2; SwitchToMode "normal"; }
bind "3" { GoToTab 3; SwitchToMode "normal"; }
bind "4" { GoToTab 4; SwitchToMode "normal"; }
bind "5" { GoToTab 5; SwitchToMode "normal"; }
bind "6" { GoToTab 6; SwitchToMode "normal"; }
bind "7" { GoToTab 7; SwitchToMode "normal"; }
bind "8" { GoToTab 8; SwitchToMode "normal"; }
bind "9" { GoToTab 9; SwitchToMode "normal"; }
bind "Tab" { ToggleTab; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
}
resize {
bind "Ctrl g" { SwitchToMode "locked"; }
bind "Ctrl p" { SwitchToMode "pane"; }
bind "Ctrl t" { SwitchToMode "tab"; }
bind "Ctrl n" "Enter" "Space" "Esc" { SwitchToMode "normal"; }
bind "Ctrl s" { SwitchToMode "scroll"; }
bind "Ctrl o" { SwitchToMode "session"; }
bind "Ctrl h" { SwitchToMode "move"; }
bind "Ctrl b" { SwitchToMode "tmux"; }
bind "Ctrl q" { Quit; }
bind "h" "Left" { Resize "Left"; }
bind "j" "Down" { Resize "Down"; }
bind "k" "Up" { Resize "Up"; }
bind "l" "Right" { Resize "Right"; }
bind "=" { Resize "Increase"; }
bind "+" { Resize "Increase"; }
bind "-" { Resize "Decrease"; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
}
move {
bind "Ctrl g" { SwitchToMode "locked"; }
bind "Ctrl p" { SwitchToMode "pane"; }
bind "Ctrl t" { SwitchToMode "tab"; }
bind "Ctrl n" { SwitchToMode "resize"; }
bind "Ctrl h" "Enter" "Space" "Esc" { SwitchToMode "normal"; }
bind "Ctrl s" { SwitchToMode "scroll"; }
bind "Ctrl o" { SwitchToMode "session"; }
bind "Ctrl q" { Quit; }
bind "n" "Tab" { MovePane; }
bind "h" "Left" { MovePane "Left"; }
bind "j" "Down" { MovePane "Down"; }
bind "k" "Up" { MovePane "Up"; }
bind "l" "Right" { MovePane "Right"; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
}
scroll {
bind "Ctrl s" "Space" "Enter" "Esc" { SwitchToMode "normal"; }
bind "Ctrl t" { SwitchToMode "tab"; }
bind "Ctrl g" { SwitchToMode "locked"; }
bind "Ctrl p" { SwitchToMode "pane"; }
bind "Ctrl h" { SwitchToMode "move"; }
bind "Ctrl b" { SwitchToMode "tmux"; }
bind "Ctrl o" { SwitchToMode "session"; }
bind "Ctrl n" { SwitchToMode "resize"; }
bind "Ctrl c" { ScrollToBottom; SwitchToMode "normal"; }
bind "Ctrl q" { Quit; }
bind "j" "Down" { ScrollDown; }
bind "k" "Up" { ScrollUp; }
bind "Ctrl f" "PageDown" "Right" "l" { PageScrollDown; }
bind "Ctrl b" "PageUp" "Left" "h" { PageScrollUp; }
bind "d" { HalfPageScrollDown; }
bind "u" { HalfPageScrollUp; }
bind "e" { EditScrollback; SwitchToMode "normal"; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
}
session {
bind "Ctrl g" { SwitchToMode "locked"; }
bind "Ctrl n" { SwitchToMode "resize"; }
bind "Ctrl p" { SwitchToMode "pane"; }
bind "Ctrl h" { SwitchToMode "move"; }
bind "Ctrl b" { SwitchToMode "tmux"; }
bind "Ctrl t" { SwitchToMode "tab"; }
bind "Ctrl o" "Enter" "Space" "Esc" { SwitchToMode "normal"; }
bind "Ctrl s" { SwitchToMode "scroll"; }
bind "Ctrl q" { Quit; }
bind "d" { Detach; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
}
RenameTab {
bind "Enter" "Ctrl c" "Esc" { SwitchToMode "normal"; }
bind "Esc" { TabNameInput 27; SwitchToMode "tab"; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
}
RenamePane {
bind "Enter" "Ctrl c" "Esc" { SwitchToMode "normal"; }
bind "Esc" { PaneNameInput 27; SwitchToMode "pane"; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { FocusPreviousPane; }
bind "Alt ]" { FocusNextPane; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
}
tmux {
bind "Ctrl g" { SwitchToMode "locked"; }
bind "Esc" { EditScrollback; SwitchToMode "normal"; }
bind "Ctrl n" { SwitchToMode "resize"; }
bind "Ctrl p" { SwitchToMode "pane"; }
bind "Ctrl h" { SwitchToMode "move"; }
bind "Ctrl t" { SwitchToMode "tab"; }
bind "Ctrl o" "Enter" "Space" "Esc" { SwitchToMode "normal"; }
bind "Ctrl s" { SwitchToMode "scroll"; }
bind "Ctrl q" { Quit; } bind "Ctrl q" { Quit; }
bind "[" { SwitchToMode "Scroll";}
bind "-" { NewPane "Down"; SwitchToMode "normal"; } bind "-" { NewPane "Down"; SwitchToMode "normal"; }
bind "|" { NewPane "Right"; SwitchToMode "normal"; } bind "|" { NewPane "Right"; SwitchToMode "normal"; }
bind "z" { ToggleFocusFullscreen; SwitchToMode "normal"; } bind "z" { ToggleFocusFullscreen; SwitchToMode "normal"; }
@ -35,30 +248,129 @@ keybinds {
bind "l" { MoveFocus "Right"; SwitchToMode "normal"; } bind "l" { MoveFocus "Right"; SwitchToMode "normal"; }
bind "j" { MoveFocus "Down"; SwitchToMode "normal"; } bind "j" { MoveFocus "Down"; SwitchToMode "normal"; }
bind "k" { MoveFocus "Up"; SwitchToMode "normal"; } bind "k" { MoveFocus "Up"; SwitchToMode "normal"; }
bind "Alt n" { NewPane; }
bind "Alt h" { MoveFocus "Left"; }
bind "Alt l" { MoveFocus "Right"; }
bind "Alt j" { MoveFocus "Down"; }
bind "Alt k" { MoveFocus "Up"; }
bind "Alt [" { PreviousSwapLayout; }
bind "Alt ]" { NextSwapLayout; }
bind "Alt =" { Resize "Increase"; }
bind "Alt +" { Resize "Increase"; }
bind "Alt -" { Resize "Decrease"; }
bind "Ctrl a" { Write 1; SwitchToMode "normal"; } bind "Ctrl a" { Write 1; SwitchToMode "normal"; }
bind "d" { Detach; } bind "d" { Detach; }
bind "e" { EditScrollback; SwitchToMode "normal"; } bind "e" { EditScrollback; SwitchToMode "normal"; }
bind "y" { ToggleActiveSyncTab; SwitchToMode "normal"; } bind "y" { ToggleActiveSyncTab; SwitchToMode "normal"; }
bind "r" { SwitchToMode "RenamePane"; PaneNameInput 0; } bind "r" { SwitchToMode "RenamePane"; PaneNameInput 0; }
bind "/" { SwitchToMode "EnterSearch"; SearchInput 0;}
bind "m" { SwitchToMode "Move"; }
bind "+" { Resize "Increase";}
bind "=" { Resize "Decrease"; }
bind "w" { ToggleFloatingPanes; SwitchToMode "normal";}
bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "normal";}
bind "i" { TogglePanePinned; SwitchToMode "normal";}
} }
} }
session_serialization false // Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
// eg. when terminal window with an active zellij session is closed
// Options:
// - detach (Default)
// - quit
//
// on_force_close "quit"
// Send a request for a simplified ui (without arrow fonts) to plugins
// Options:
// - true
// - false (Default)
//
// simplified_ui true
// Choose the path to the default shell that zellij will use for opening new panes
// Default: $SHELL
//
// default_shell "fish"
// Toggle between having pane frames around the panes
// Options:
// - true (default)
// - false
//
pane_frames false
// Choose the theme that is specified in the themes section. // Choose the theme that is specified in the themes section.
// Default: default // Default: default
// //
theme "nord" // theme "default"
ui { // The name of the default layout to load on startup
pane_frames { // Default: "default"
rounded_corners true //
} // default_layout "compact"
// Choose the mode that zellij uses when starting up.
// Default: normal
//
// default_mode "locked"
// Toggle enabling the mouse mode.
// On certain configurations, or terminals this could
// potentially interfere with copying text.
// Options:
// - true (default)
// - false
//
// mouse_mode false
// Configure the scroll back buffer size
// This is the number of lines zellij stores for each pane in the scroll back
// buffer. Excess number of lines are discarded in a FIFO fashion.
// Valid values: positive integers
// Default value: 10000
//
// scroll_buffer_size 10000
// Provide a command to execute when copying text. The text will be piped to
// the stdin of the program to perform the copy. This can be used with
// terminal emulators which do not support the OSC 52 ANSI control sequence
// that will be used by default if this option is not set.
// Examples:
//
// copy_command "xclip -selection clipboard" // x11
// copy_command "wl-copy" // wayland
// copy_command "pbcopy" // osx
// Choose the destination for copied text
// Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
// Does not apply when using copy_command.
// Options:
// - system (default)
// - primary
//
// copy_clipboard "primary"
// Enable or disable automatic copy (and clear) of selection when releasing mouse
// Default: true
//
// copy_on_select false
// Path to the default editor to use to edit pane scrollbuffer
// Default: $EDITOR or $VISUAL
//
// scrollback_editor "/usr/bin/vim"
// When attaching to an existing session with other users,
// should the session be mirrored (true)
// or should each user have their own cursor (false)
// Default: false
//
// mirror_session true
// The folder in which Zellij will look for layouts
//
// layout_dir /path/to/my/layout_dir
// The folder in which Zellij will look for themes
//
// theme_dir "/path/to/my/theme_dir"
plugins {
tab-bar { path "tab-bar"; }
status-bar { path "status-bar"; }
strider { path "strider"; }
} }

10
zsh/bin/run_ollama
View file

@ -1,10 +0,0 @@
#!/usr/bin/env zsh
if ! command -v ollama; then
echo "Go install ollama"
fi
env GIN_MODE=release ollama serve &|
sleep 2
ollama pull llama3
ollama cp llama3 gpt-4-turbo-preview

205
zsh/completions/_gh
View file

@ -1,205 +0,0 @@
#compdef gh
# zsh completion for gh -*- shell-script -*-
__gh_debug()
{
local file="$BASH_COMP_DEBUG_FILE"
if [[ -n ${file} ]]; then
echo "$*" >> "${file}"
fi
}
_gh()
{
local shellCompDirectiveError=1
local shellCompDirectiveNoSpace=2
local shellCompDirectiveNoFileComp=4
local shellCompDirectiveFilterFileExt=8
local shellCompDirectiveFilterDirs=16
local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace
local -a completions
__gh_debug "\n========= starting completion logic =========="
__gh_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
# The user could have moved the cursor backwards on the command-line.
# We need to trigger completion from the $CURRENT location, so we need
# to truncate the command-line ($words) up to the $CURRENT location.
# (We cannot use $CURSOR as its value does not work when a command is an alias.)
words=("${=words[1,CURRENT]}")
__gh_debug "Truncated words[*]: ${words[*]},"
lastParam=${words[-1]}
lastChar=${lastParam[-1]}
__gh_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
# For zsh, when completing a flag with an = (e.g., gh -n=<TAB>)
# completions must be prefixed with the flag
setopt local_options BASH_REMATCH
if [[ "${lastParam}" =~ '-.*=' ]]; then
# We are dealing with a flag with an =
flagPrefix="-P ${BASH_REMATCH}"
fi
# Prepare the command to obtain completions
requestComp="${words[1]} __complete ${words[2,-1]}"
if [ "${lastChar}" = "" ]; then
# If the last parameter is complete (there is a space following it)
# We add an extra empty parameter so we can indicate this to the go completion code.
__gh_debug "Adding extra empty parameter"
requestComp="${requestComp} \"\""
fi
__gh_debug "About to call: eval ${requestComp}"
# Use eval to handle any environment variables and such
out=$(eval ${requestComp} 2>/dev/null)
__gh_debug "completion output: ${out}"
# Extract the directive integer following a : from the last line
local lastLine
while IFS='\n' read -r line; do
lastLine=${line}
done < <(printf "%s\n" "${out[@]}")
__gh_debug "last line: ${lastLine}"
if [ "${lastLine[1]}" = : ]; then
directive=${lastLine[2,-1]}
# Remove the directive including the : and the newline
local suffix
(( suffix=${#lastLine}+2))
out=${out[1,-$suffix]}
else
# There is no directive specified. Leave $out as is.
__gh_debug "No directive found. Setting do default"
directive=0
fi
__gh_debug "directive: ${directive}"
__gh_debug "completions: ${out}"
__gh_debug "flagPrefix: ${flagPrefix}"
if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
__gh_debug "Completion received error. Ignoring completions."
return
fi
local activeHelpMarker="_activeHelp_ "
local endIndex=${#activeHelpMarker}
local startIndex=$((${#activeHelpMarker}+1))
local hasActiveHelp=0
while IFS='\n' read -r comp; do
# Check if this is an activeHelp statement (i.e., prefixed with $activeHelpMarker)
if [ "${comp[1,$endIndex]}" = "$activeHelpMarker" ];then
__gh_debug "ActiveHelp found: $comp"
comp="${comp[$startIndex,-1]}"
if [ -n "$comp" ]; then
compadd -x "${comp}"
__gh_debug "ActiveHelp will need delimiter"
hasActiveHelp=1
fi
continue
fi
if [ -n "$comp" ]; then
# If requested, completions are returned with a description.
# The description is preceded by a TAB character.
# For zsh's _describe, we need to use a : instead of a TAB.
# We first need to escape any : as part of the completion itself.
comp=${comp//:/\\:}
local tab="$(printf '\t')"
comp=${comp//$tab/:}
__gh_debug "Adding completion: ${comp}"
completions+=${comp}
lastComp=$comp
fi
done < <(printf "%s\n" "${out[@]}")
# Add a delimiter after the activeHelp statements, but only if:
# - there are completions following the activeHelp statements, or
# - file completion will be performed (so there will be choices after the activeHelp)
if [ $hasActiveHelp -eq 1 ]; then
if [ ${#completions} -ne 0 ] || [ $((directive & shellCompDirectiveNoFileComp)) -eq 0 ]; then
__gh_debug "Adding activeHelp delimiter"
compadd -x "--"
hasActiveHelp=0
fi
fi
if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
__gh_debug "Activating nospace."
noSpace="-S ''"
fi
if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
# File extension filtering
local filteringCmd
filteringCmd='_files'
for filter in ${completions[@]}; do
if [ ${filter[1]} != '*' ]; then
# zsh requires a glob pattern to do file filtering
filter="\*.$filter"
fi
filteringCmd+=" -g $filter"
done
filteringCmd+=" ${flagPrefix}"
__gh_debug "File filtering command: $filteringCmd"
_arguments '*:filename:'"$filteringCmd"
elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
# File completion for directories only
local subdir
subdir="${completions[1]}"
if [ -n "$subdir" ]; then
__gh_debug "Listing directories in $subdir"
pushd "${subdir}" >/dev/null 2>&1
else
__gh_debug "Listing directories in ."
fi
local result
_arguments '*:dirname:_files -/'" ${flagPrefix}"
result=$?
if [ -n "$subdir" ]; then
popd >/dev/null 2>&1
fi
return $result
else
__gh_debug "Calling _describe"
if eval _describe "completions" completions $flagPrefix $noSpace; then
__gh_debug "_describe found some completions"
# Return the success of having called _describe
return 0
else
__gh_debug "_describe did not find completions."
__gh_debug "Checking if we should do file completion."
if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
__gh_debug "deactivating file completion"
# We must return an error code here to let zsh know that there were no
# completions found by _describe; this is what will trigger other
# matching algorithms to attempt to find completions.
# For example zsh can match letters in the middle of words.
return 1
else
# Perform file completion
__gh_debug "Activating file completion"
# We must return the result of this command, so it must be the
# last command, or else we must store its result to return it.
_arguments '*:filename:_files'" ${flagPrefix}"
fi
fi
fi
}
# don't run the completion function when being source-ed or eval-ed
if [ "$funcstack[1]" = "_gh" ]; then
_gh
fi

2036
zsh/completions/_op
View file

File diff suppressed because it is too large Load diff

11
zsh/funcs/atuin
View file

@ -1,11 +0,0 @@
# zsh-vi-mode for some reason is overriding these - so overriding them back
bindkey -M emacs '^r' atuin-search
bindkey -M viins '^r' atuin-search-viins
bindkey -M vicmd '/' atuin-search
bindkey -M emacs '^[[A' atuin-up-search
bindkey -M vicmd '^[[A' atuin-up-search-vicmd
bindkey -M viins '^[[A' atuin-up-search-viins
bindkey -M emacs '^[OA' atuin-up-search
bindkey -M vicmd '^[OA' atuin-up-search-vicmd
bindkey -M viins '^[OA' atuin-up-search-viins
bindkey -M vicmd 'k' atuin-up-search-vicm

9
zsh/funcs/ls Normal file
View file

@ -0,0 +1,9 @@
function ls {
if [[ "${LS_PICKER}" == "lsd" ]]; then
lsd $@
elif [[ "${LS_PICKER}" == "exa" ]]; then
exa $@
else
/bin/ls $@
fi
}

5
zsh/funcs/man
View file

@ -1,5 +0,0 @@
man () {
PROGRAM="${@[-1]}"
SECTION="${@[-2]}"
page -W "man://${PROGRAM}${SECTION:+($SECTION)}"
}

8
zsh/funcs/updater
View file

@ -1,8 +0,0 @@
function update_me {
(
setopt local_options pushd_silent
cd ~/.dotfiles/nix
./update.sh $@
)
}

1
zsh/zsh_plugins.txt
View file

@ -1,4 +1,5 @@
https://github.com/ohmyzsh/oh-my-zsh https://github.com/ohmyzsh/oh-my-zsh
https://github.com/zdharma-continuum/fast-syntax-highlighting https://github.com/zdharma-continuum/fast-syntax-highlighting
https://github.com/zsh-users/zsh-completions https://github.com/zsh-users/zsh-completions
https://github.com/ress997/zsh-completions-anyenv
https://github.com/b4b4r07/zsh-vimode-visual https://github.com/b4b4r07/zsh-vimode-visual

169
zsh/zshrc
View file

@ -1,5 +1,8 @@
setopt extendedglob nomatch notify histnofunctions histnostore histverify incappendhistory autopushd pushdignoredups HISTFILE=~/.histfile
unsetopt beep HISTSIZE=10000
SAVEHIST=10000
setopt extendedglob nomatch notify histignorespace histignorealldups histnofunctions histnostore histverify incappendhistory autopushd pushdignoredups
unsetopt autocd beep
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]];
then then
@ -11,6 +14,12 @@ bindkey -v
# allow ctrl-a and ctrl-e to move to beginning/end of line # allow ctrl-a and ctrl-e to move to beginning/end of line
bindkey '^a' beginning-of-line bindkey '^a' beginning-of-line
bindkey '^e' end-of-line bindkey '^e' end-of-line
export RPROMPT=' ' # Fixes a side-effect of the vi-mode oh-my-zsh plugin
export KEYTIMEOUT=1
typeset -U path
typeset -U fpath
if [[ $(uname) == 'Darwin' ]]; then if [[ $(uname) == 'Darwin' ]]; then
if [[ $(arch) == 'arm64' ]]; then if [[ $(arch) == 'arm64' ]]; then
@ -20,45 +29,118 @@ if [[ $(uname) == 'Darwin' ]]; then
fi fi
fi fi
hash -d -- -dotfiles=~/.dotfiles
hash -d -- -src=~/src
hash -d -- -doom=~/.doom-emacs
fpath=(~/bin ~/.zshcompletions $fpath) fpath=(~/bin ~/.zshcompletions $fpath)
zstyle :compinstall filename '/home/anthonys/.zshrc' zstyle :compinstall filename '/home/anthonys/.zshrc'
export CARAPACE_BRIDGES='zsh,fish,bash' zstyle ":completion:*" complete _complete _ignored _approximate _expand
zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m' zstyle ":completion:*" glob 1
# Both because it's nice and as an example zstyle ":completion:*" insert-unambiguous true
zstyle ':completion:*:git:*' group-order 'main commands' 'alias commands' 'external commands' zstyle ':completion:*' menu select
zstyle ':completion:*' rehash true
zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'l:|=* r:|=*'
zstyle ":completion:*" substitute 1
# zsh-vi-mode stuff autoload -Uz up-line-or-beginning-search down-line-or-beginning-search zmv colors
ZVM_VI_SURROUND_BINDKEY="s-prefix" zle -N up-line-or-beginning-search
ZVM_READKEY_ENDINE=$ZVM_READKEY_ENGINE_NEX zle -N down-line-or-beginning-search
ZVM_INSERT_MODE_CURSOR=$ZVM_CURSOR_BLOCK
ZVM_LINE_INIT_MODE=$ZVM_MODE_INSERT
function zvm_after_lazy_keybindings() {
eval "$(/nix/store/imgh8mjpck0xadj64h9q4gqrjaj9pbn7-atuin-18.3.0/bin/atuin init zsh )"
}
# zstyle ":completion:*" complete _complete _ignored _approximate _expand
# zstyle ":completion:*" glob 1
# zstyle ":completion:*" insert-unambiguous true
# zstyle ':completion:*' menu select
# zstyle ':completion:*' rehash true
# zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'l:|=* r:|=*'
# zstyle ":completion:*" substitute 1
[[ -n "$key[Up]" ]] && bindkey -- "$key[Up]" up-line-or-beginning-search [[ -n "$key[Up]" ]] && bindkey -- "$key[Up]" up-line-or-beginning-search
[[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
_command-exists() {
[[ -x "$(command -v $1)" ]] && return 0 || return 1
}
export COMPLETION_WAITING_DOTS="true"
export VISUAL='nvim'
export EDITOR='nvim'
path=("$HOME/bin" "$HOME/go/bin" $path) path=("$HOME/bin" "$HOME/go/bin" $path)
local ZSH_PLUGIN_DIR="$HOME/.zsh_plugins"
zstyle ':znap:*' repos-dir "${ZSH_PLUGIN_DIR}"
zstyle ':znap:*' auto-compile no
zstyle ':znap:*:*' git-maintenance off
autoload -Uz add-zle-hook-widget
local ZSH_PLUGIN_DIR="$HOME/.zsh_plugins"
if [[ ! -d "${ZSH_PLUGIN_DIR}/zsh-snap" ]]; then
mkdir -p ~/.zsh_plugins
cd ~/.zsh_plugins
git clone https://github.com/marlonrichert/zsh-snap.git
fi
source "${ZSH_PLUGIN_DIR}/zsh-snap/znap.zsh" && export ZNAP_USED=1
local -a paths
for line in "${(@f)"$(<~/.zsh_plugins.txt)"}"
{
if [[ ! -d "${ZSH_PLUGIN_DIR}/$(basename $line)" ]]; then
paths=($paths $line)
fi
}
if [[ ! ${#paths[@]} -eq 0 ]]; then
echo "Paths not empty: $paths"
znap clone ${^paths}
fi
if [[ ( $ZNAP_USED = 1 ) ]]; then
znap source oh-my-zsh lib/{git,completion}
znap source oh-my-zsh plugins/colored-man-pages
fpath=($fpath ~[oh-my-zsh]/plugins/{pass,ripgrep,cargo,docker,docker-compose,rsync,fd})
znap source fast-syntax-highlighting
fpath=($fpath ~[zsh-completions]/src)
znap source zsh-vimode-visual
fi
if [[ -d ~/.cargo/bin ]]; then if [[ -d ~/.cargo/bin ]]; then
path=($path $HOME/.cargo/bin) path=($path $HOME/.cargo/bin)
fi fi
if (_command-exists starship); then
znap eval starship 'starship init zsh --print-full-init'
znap prompt
else
if [[ ( $ZNAP_USED = 1 ) ]]; then
autoload -Uz promptinit
promptinit
znap clone https://github.com/denysdovhan/spaceship-prompt
znap prompt spaceship-prompt
fi
fi
autoload -Uz compinit
compinit
znap source oh-my-zsh plugins/{gitignore,git,helm,mvn,gradle}
alias exa="exa -l --git"
if [[ $(uname -s) =~ 'Linux' ]]; then
alias cp="cp --reflink=auto"
fi
function dt() { function dt() {
local session_name=${1:-DefaultSession} local session_name
session_name=${1:-DefaultSession}
zellij attach -c $session_name
if [[ "${SESSION_MANAGER}" == "tmux" ]]; then
tmux -u -2 new-session -A -s $session_name
else
zellij attach -c $session_name
fi
} }
function send-to-pane() {
tmux pipe-pane -I -t $1 "$2 | head -n 1"
}
function _send_to_pane {
reply=($(tmux display-panes -b ''))
}
compctl -K _send_to_pane send-to-pane
function root() { function root() {
if [[ -n $(git rev-parse --show-toplevel) ]] if [[ -n $(git rev-parse --show-toplevel) ]]
then then
@ -66,6 +148,40 @@ function root() {
fi fi
} }
if [[ -d $HOME/.anyenv ]]; then
path+=($HOME/.anyenv/bin)
if [[ ( $ZNAP_USED = 1 ) ]]; then
znap eval anyenv-init ${${:-=anyenv}:A}' init -'
else
eval "$(anyenv init -)"
fi
fi
CTRL_R_PICKER="atuin"
if [[ "${CTRL_R_PICKER}" == "mcfly" ]]; then
znap eval mcfly 'mcfly init zsh'
export MCFLY_KEY_SCHEME=vim
export MCFLY_FUZZY=true
export MCFLY_RESULTS=50
export MCFLY_USED=1
fi
if [[ "${CTRL_R_PICKER}" == "atuin" ]]; then
znap eval atuin 'atuin init zsh'
fi
if (_command-exists direnv); then
eval "$(direnv hook zsh)"
fi
if (_command-exists pdm); then
eval "$(pdm --pep582 zsh)"
fi
##THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
export SDKMAN_DIR="$HOME/.sdkman"
[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && znap eval sdkman-init "cat $HOME/.sdkman/bin/sdkman-init.sh # $SDKMAN_VERSION"
if [[ -a $HOME/.zshsrc ]]; then if [[ -a $HOME/.zshsrc ]]; then
source $HOME/.zshsrc source $HOME/.zshsrc
else else
@ -73,8 +189,7 @@ else
touch $HOME/.zshsrc touch $HOME/.zshsrc
fi fi
alias exa="eza -l --git" LS_PICKER="exa"
for funcfile in $HOME/.zsh.d/* ; do for funcfile in $HOME/.zsh.d/* ; do
source "${funcfile}" source "${funcfile}"
done done