conflict in bashrc sorted

5 files changed, 9 insertions, 6 deletions

diff --git a/Xresources b/Xresources
index 20beb5b..d18894a 100644
--- a/Xresources
+++ b/Xresources
@@ -13,6 +13,7 @@
 /* xterm*faceName: terminus-16 */
 /* xterm*font: terminus-18 */
 /* xterm*faceName:  Hack Nerd Font Mono */
+XTerm*selectToClipboard: true
 XTerm*cursorBlink: false
 XTerm*blinkAsBold: false
 /* XTerm*colorMode: false */
@@ -25,6 +26,7 @@ XTerm*colorULMode: false
 /* xterm*faceName: Iosevka Nerd Font Mono */
 xterm*faceName: Cascadia Mono
 /* xterm*faceName: Ubuntu Mono */
+/* xterm*faceName: Hack */
 ! xterm*faceName: Terminus
 xterm*faceSize: 11
 /* xterm*faceName: "Jetbrains Mono Nerd Mono" */
diff --git a/bashrc b/bashrc
index 37786f9..1383533 100644
--- a/bashrc
+++ b/bashrc
@@ -98,8 +98,8 @@ alias gloga='git log --oneline --decorate --graph --all'
 alias _hl_bal_lastmonth='hledger bal --period "this month" --depth 3 Expenses'
 alias jrnl="/home/lemon/src/virtualenvs/jrnl/bin/jrnl"
 alias k5days='khal list today 5 days'
-alias khal="$HOME/src/virtualenvs/khal-venv/bin/khal"
-alias khard="$HOME/src/virtualenvs/khal-venv/bin/khard"
+alias jrnl="/home/lemon/src/virtualenvs/jrnl/bin/jrnl"
+alias ls="ls --color=auto"
 alias ll="ls -larth" # sort by modified
 alias ls="ls --color=auto"
 alias mountmusic='sudo sshfs -o IdentityFile=/home/lemon/.ssh/id_ed25519,default_permissions,allow_other lemon@192.168.1.10:/mnt/music /mnt/music'
@@ -130,7 +130,6 @@ alias t="todo.sh"
 alias tuntagged="task tags.none: list"
 alias tworkprojects='task _unique project|grep "w\."'
 alias upload_datafile_surgetracker='scp /home/lemon/Documents/Notes/Projects/Surgetracker/resources/master_add_data.csv surge@64.227.37.12:code/surgetracker/datafiles'
-alias vdirsyncer="$HOME/src/virtualenvs/khal-venv/bin/vdirsyncer"
 alias vi='vim'
 alias weather='curl wttr.in'
 alias xclip='xclip -selection c'
diff --git a/tmux.conf b/tmux.conf
index c9a8a23..94ca07e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -21,7 +21,6 @@ bind-key Tab capture-pane \; save-buffer /tmp/tmux-buffer \; delete-buffer \; di
 #  Automatically copy selected text to PRIMARY and CLIPBOARD
 bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-selection-and-cancel\; run-shell -b "tmux show-buffer | xclip -selection primary -i && tmux show-buffer | xclip -selection clipboard -i"
 bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X select-pane \; send-keys -X copy-selection-and-cancel\; run-shell -b "tmux show-buffer | xclip -selection primary -i && tmux show-buffer | xclip -selection clipboard -i"
-bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X select-pane \; send-keys -X copy-selection-and-cancel\; run-shell -b "tmux show-buffer | xclip -selection primary -i && tmux show-buffer | xclip -selection clipboard -i"
 
 # set prefix key to ctrl-a
 set -g prefix C-a
diff --git a/todo.cfg b/todo.cfg
index 85e4682..308855f 100644
--- a/todo.cfg
+++ b/todo.cfg
@@ -95,4 +95,4 @@ export COLOR_META=$CYAN
 # priority hiding, context hiding, and project hiding. That is,
 # just before the list output is displayed.
 #
-# export TODOTXT_FINAL_FILTER='cat'
+export TODOTXT_FINAL_FILTER='/home/lemon/.todo.actions.d/futureTasks'
diff --git a/vim/vimrc-sept24 b/vim/vimrc-sept24
index e0706b6..a7f09bd 100644
--- a/vim/vimrc-sept24
+++ b/vim/vimrc-sept24
@@ -8,6 +8,7 @@ runtime macros/matchit.vim	"allows jumping between brackets with % in normal mod
 " Leaders 
 let maplocalleader = "\\"
 let mapleader = ","
+nnoremap <leader>rs :!ruff check --select I --fix .<cr>
 nnoremap <leader>tsk 0i- [ ] 
 nnoremap <silent> <leader>idate :.!date +"\%F"<CR>Ea<space>
 nnoremap <silent> <leader>mdate :.!date -Iminutes<CR>Ea<space>
@@ -108,7 +109,7 @@ set nocuc
 set secure
 set updatetime=300 " https://github.com/neoclide/coc.nvim
 set scrolloff=1
-set history=799
+set history=2000
 set encoding=utf-8
 set wrap
 set wrapmargin=0
@@ -180,6 +181,7 @@ Plug 'mattn/emmet-vim',
 " Plug 'ycm-core/YouCompleteMe'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
+Plug 'github/copilot.vim'
 Plug 'ayu-theme/ayu-vim'
 Plug 'airblade/vim-tailwind'
 Plug 'vim-perl/vim-perl', { 'for': 'perl', 'do': 'make clean carp dancer highlight-all-pragmas moose test-more try-tiny' }
@@ -495,6 +497,7 @@ let g:gruvbox_invert_signs = 0
 let g:gruvbox_italic = 0
 
 "colorscheme evening
+"colorscheme codedark
 colorscheme sitruuna
 "colorscheme ayu
 "colorscheme evening