diff options
| -rw-r--r-- | Xresources-laptop | 2 | ||||
| -rw-r--r-- | bashrc | 4 | ||||
| -rw-r--r-- | fish2025/conf.d/uv.env.fish | 2 | ||||
| -rw-r--r-- | fish2025/config.fish | 21 | ||||
| -rw-r--r-- | fish2025/functions/gloga.fish | 4 | ||||
| -rw-r--r-- | fish2025/functions/notes.fish | 4 | ||||
| -rw-r--r-- | fish2025/functions/xclip.fish | 4 | ||||
| -rw-r--r-- | i3-config | 2 | ||||
| -rw-r--r-- | khal/config | 4 |
9 files changed, 44 insertions, 3 deletions
diff --git a/Xresources-laptop b/Xresources-laptop index b20ef57..c4b2480 100644 --- a/Xresources-laptop +++ b/Xresources-laptop @@ -1,5 +1,5 @@ /* xterm*font: -Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO10646-1 */ -Xft.dpi: 196 +/* Xft.dpi: 196 */ /* this is good /* XTerm*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 */ @@ -31,7 +31,7 @@ export BORG_PASSCOMMAND='pass show borg-passphrase' export DOTFILES_DIR="$HOME/dotfiles" export DOCUMENTS="$HOME/Documents" export NOTES="$HOME/Documents/Notes" -export LEDGER_FILE="$HOME/Budget/hledger/budget.ledger" +export LEDGER_FILE="$HOME/Budget/hledger/hledger/budget.ledger" #export TERM="screen-256color" arch wiki says not to set this here. export LESS="-iMRS -x2" export RANGER_LOAD_DEFAULT_RC="FALSE" @@ -376,3 +376,5 @@ eval "$(direnv hook bash)" # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. export PATH="$PATH:$HOME/.rvm/bin" + +. "$HOME/.local/bin/env" diff --git a/fish2025/conf.d/uv.env.fish b/fish2025/conf.d/uv.env.fish new file mode 100644 index 0000000..c5be13c --- /dev/null +++ b/fish2025/conf.d/uv.env.fish @@ -0,0 +1,2 @@ + +source "$HOME/.local/bin/env.fish" diff --git a/fish2025/config.fish b/fish2025/config.fish new file mode 100644 index 0000000..b54f3bf --- /dev/null +++ b/fish2025/config.fish @@ -0,0 +1,21 @@ +if status is-interactive + # go for a bar cursor in xterm - if you do this when doing non-interactive stuff, it will break + # the output of the command and you cannot use the pachelbel jump server. + echo -e -n "\x1b[\x36 q" + # Commands to run in interactive sessions can go here +end + +set fish_greeting "" + +if not contains "$HOME/.local/bin" $PATH + # Prepending path in case a system-installed binary needs to be overridden + set -x PATH "$HOME/.local/bin" $PATH +end + +set -gx GPG_TTY (tty) +set -gx SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent + +# make sure direnv is loaded +direnv hook fish | source + diff --git a/fish2025/functions/gloga.fish b/fish2025/functions/gloga.fish new file mode 100644 index 0000000..98da2aa --- /dev/null +++ b/fish2025/functions/gloga.fish @@ -0,0 +1,4 @@ +function gloga --wraps='git log --oneline --decorate --graph --all' --description 'alias gloga=git log --oneline --decorate --graph --all' + git log --oneline --decorate --graph --all $argv + +end diff --git a/fish2025/functions/notes.fish b/fish2025/functions/notes.fish new file mode 100644 index 0000000..d6d7ec7 --- /dev/null +++ b/fish2025/functions/notes.fish @@ -0,0 +1,4 @@ +function notes --wraps='cd ~/Documents/Notes' --description 'alias notes=cd ~/Documents/Notes' + cd ~/Documents/Notes $argv + +end diff --git a/fish2025/functions/xclip.fish b/fish2025/functions/xclip.fish new file mode 100644 index 0000000..b552ec6 --- /dev/null +++ b/fish2025/functions/xclip.fish @@ -0,0 +1,4 @@ +function xclip --description 'alias xclip=xclip -selection c' + command xclip -selection c $argv + +end @@ -85,7 +85,7 @@ exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/stable_diffusion exec --no-startup-id /home/lemon/.screenlayout/all_horiz.sh exec --no-startup-id /home/lemon/.local/bin/Bitwarden-2024.12.0-x86_64.AppImage #exec --no-startup-id /usr/bin/clipit -Exec --no-startup-id /usr/bin/redshift-gtk +exec --no-startup-id /usr/bin/redshift-gtk exec --no-startup-id /usr/bin/xfce4-clipman #exec --no-startup-id /usr/bin/emacs --daemon #exec --no-startup-id /usr/bin/copyq diff --git a/khal/config b/khal/config index 1d6c6a9..b71507d 100644 --- a/khal/config +++ b/khal/config @@ -35,6 +35,10 @@ color = light gray path = ~/.calendars/google/family08070188191404755449@group.calendar.google.com/ color = yellow +[[google_todoist]] +path = ~/.calendars/google/5cf0d4d9bd356cbcd603adfbf0f4b1f32d9fd9d16a8254bcd2a88267a7d79c3a@group.calendar.google.com +color = light cyan + [[google_harvey_ehs_hols]] path = ~/.calendars/google/743e040cac7301332674b35e2b9dbe2c204771e2392a37d1b576e14b9b04115f@group.calendar.google.com/ color = dark green |