aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Lemon <y@yulqen.org>2023-12-15 19:45:43 +0000
committerMatthew Lemon <y@yulqen.org>2023-12-15 19:45:43 +0000
commit353491aaf1f08978f9412958e4112a9ce5b63f32 (patch)
treea223b23550a3109f25325bc01f356381792d693b
parentbafa89abfcd93ff461386129b13ab3ac0b0f6513 (diff)
parentc2af1f7e18c69bde1c61b96058fa124c60b6721f (diff)
Merge branch 'master' of git.sr.ht:~yulqen/arch-dotfiles
Diffstat (limited to '')
-rw-r--r--bashrc2
-rw-r--r--i3-config3
-rw-r--r--mimeapps.list_to_dot_config1
-rw-r--r--vim/vimrc7
4 files changed, 8 insertions, 5 deletions
diff --git a/bashrc b/bashrc
index a973a69..0a85dd3 100644
--- a/bashrc
+++ b/bashrc
@@ -37,7 +37,7 @@ source $HOME/Documents/sync/openai_key
# completion for beets
# from https://wiki.archlinux.org/title/Beets
-eval "$(beet completion)"
+#eval "$(beet completion)"
# aliases
alias pacget="pacman -Slq | fzf --multi --preview 'pacman -Si {1}' | xargs -ro sudo pacman -S"
diff --git a/i3-config b/i3-config
index 7400ca9..bb08df0 100644
--- a/i3-config
+++ b/i3-config
@@ -73,7 +73,8 @@ floating_modifier $mod
#exec --no-startup-id nm-applet
#exec --no-startup-id /usr/bin/qjackctl
#exec --no-startup-id /usr/bin/nextcloud
-exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/wp2015908-dystopia-wallpapers.jpg
+#exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/wp2015908-dystopia-wallpapers.jpg
+exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/stable_diffusion/test_influencer/altar8.png
#exec --no-startup-id /home/lemon/.screenlayout/two_screens_normal.sh
#exec --no-startup-id /home/lemon/.screenlayout/desktop_layout_debian.sh
exec --no-startup-id /home/lemon/.screenlayout/left_horiz_right_vert.sh
diff --git a/mimeapps.list_to_dot_config b/mimeapps.list_to_dot_config
index 3407e7b..4d1e781 100644
--- a/mimeapps.list_to_dot_config
+++ b/mimeapps.list_to_dot_config
@@ -13,3 +13,4 @@ x-scheme-handler/unknown=librewolf.desktop
image/jpeg=feh.desktop
application/pdf=org.pwmt.zathura.desktop
image/png=feh.desktop
+x-scheme-handler/jetbrains=jetbrains-toolbox.desktop
diff --git a/vim/vimrc b/vim/vimrc
index 95a8c2d..edbb0cb 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -7,7 +7,7 @@ runtime macros/matchit.vim "allows jumping between brackets with % in normal mod
" }}}
" Leaders {{{
let maplocalleader = "\\"
-let mapleader = ","
+let mapleader = " "
nnoremap <leader>q :call TaskWarriorAddCurrentLine()<CR>
" pandoc command to generate weekly plan page in Firefox (or not, if we just
" wish to refresh)
@@ -36,7 +36,7 @@ nnoremap <leader>ni :e $NOTES_DIR/index.md<CR>:cd $NOTES_DIR<CR>
" clear search highlights
nnoremap <leader><space> :noh<cr>:call clearmatches()<cr>
nnoremap <leader><C-p> :<C-u>FZF!<CR>
-nnoremap <leader>t :Files<CR>
+nnoremap <C-p>p :Files<CR>
nnoremap <leader>o :Tags<CR>
nnoremap <leader>h :History<CR>
nnoremap <silent> <leader>0 :Files<CR>
@@ -129,6 +129,7 @@ command! W w
" Plugins {{{
call plug#begin()
"Plug 'vim-scripts/AutoComplPop'
+Plug 'lambdalisue/fern.vim',
Plug 'tpope/vim-rails',
Plug 'vim-ruby/vim-ruby',
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
@@ -314,7 +315,7 @@ let g:gruvbox_improved_warnings = 1
let g:gruvbox_invert_indent_guides = 1
let g:gruvbox_invert_signs = 0
"colorscheme evening
-"colorscheme sitruuna
+colorscheme sitruuna
" }}}
" GPG files {{{
" from https://vim.fandom.com/wiki/Edit_gpg_encrypted_files