Reworked kitty conf, qutebrowser, more init.org stuff

This commit is contained in:
Joseph Ferano 2022-09-17 13:08:46 +07:00
parent 9e0f85404f
commit d9e9bd36df
6 changed files with 2581 additions and 53 deletions

View File

@ -38,4 +38,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_pager_color_selected_background:\x2dr
SETUVAR fish_user_paths:/home/joe/\x2elocal/share/cargo/bin\x1e/home/joe/\x2elocal/share/JetBrains/Toolbox/scripts\x1e/home/joe/\x2elocal/bin/jetbrains\x1e/home/joe/\x2elocal/share/JetBrains/Toolbox/script\x1e/home/joe/\x2elocal/share/solana/install/active_release/bin\x1e/home/joe/\x2edotnet/tools\x1e/home/joe/\x2elocal/bin
SETUVAR fish_user_paths:/home/joe/\x2elocal/share/go/bin\x1e/home/joe/\x2elocal/share/cargo/bin\x1e/home/joe/\x2elocal/share/JetBrains/Toolbox/scripts\x1e/home/joe/\x2elocal/bin/jetbrains\x1e/home/joe/\x2elocal/share/JetBrains/Toolbox/script\x1e/home/joe/\x2elocal/share/solana/install/active_release/bin\x1e/home/joe/\x2edotnet/tools\x1e/home/joe/\x2elocal/bin

View File

@ -6,3 +6,13 @@
[alias]
lop = log --pretty='%C(green)%an %C(blue)(%ad)%n %C(yellow)%h %C(white)| %C(reset)%s' --abbrev-commit --date=relative
lol = log --graph --pretty='%C(yellow)%h %C(green)%an %C(reset)%s' --abbrev-commit
[diff]
tool = kitty
guitool = kitty.gui
[difftool]
prompt = false
trustExitCode = true
[difftool "kitty"]
cmd = kitty +kitten diff $LOCAL $REMOTE
[difftool "kitty.gui"]
cmd = kitty kitty +kitten diff $LOCAL $REMOTE

View File

@ -1,38 +1,84 @@
include /home/joe/.config/kitty/theme.conf
font_size 14.0
font_size 13.0
allow_remote_control yes
single_instance yes
listen_on unix:/tmp/kitty
adjust_line_height 5
adjust_column_width 1
window_padding_width 5
tab_bar_style powerline
window_resize_step_cells 3
window_resize_step_lines 3
sync_to_monitor yes
input_delay 0
window_border_width 1.5
draw_minimal_borders yes
window_margin_width 0.0
active_border_color #bbb
inactive_border_color #555
bell_border_color #ff5a00
inactive_text_alpha 0.75
hide_window_decorations yes
map super+f pipe @ansi overlay /home/joe/bin/vim-ansi
map ctrl+shift+enter launch --cwd=current
map f5 load_config_file
cursor_shape block
enabled_layouts tall,stack,fat
allow_remote_control yes
#: single_instance yes
listen_on unix:/tmp/kitty
map ctrl+shift+m toggle_layout stack
window_padding_width 4
window_margin_width 2
map ctrl+alt+h neighboring_window left
map ctrl+alt+j neighboring_window down
map ctrl+alt+k neighboring_window up
map ctrl+alt+l neighboring_window right
tab_bar_style powerline
tab_powerline_style round
tab_bar_align left
map shift+up move_window up
map shift+left move_window left
map shift+right move_window right
map shift+down move_window down
sync_to_monitor yes
input_delay 3
map f1 launch --type overlay --stdin-add-formatting --stdin-source=@screen_scrollback ~/.config/kitty/pager.sh
# scrollback_pager bash -c 'nvim </dev/null -u ~/.config/nvim/init-kitty.vim -c "map q :qa!<CR>" -c "autocmd TermOpen * normal G" -c "terminal cat /proc/$$/fd/0 -" -c "set clipboard+=unnamedplus" -c "call cursor(CURSOR_LINE, CURSOR_COLUMN)"'
# scrollback_pager nvim -u ~/.config/nvim/init-kitty.vim -c "map q :qa!<CR>" -c "set norelativenumber nonumber nolist showtabline=0 foldcolumn=0" -c "autocmd TermOpen * normal G" -c "silent! write /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "
scrollback_pager bash -c "exec nvim 63<&0 0</dev/null -u NONE -c 'map <silent> q :qa!<CR>' -c 'set shell=bash scrollback=100000 termguicolors laststatus=0 clipboard+=unnamedplus' -c 'autocmd TermEnter * stopinsert' -c 'autocmd TermClose * call cursor(max([0,INPUT_LINE_NUMBER-1])+CURSOR_LINE, CURSOR_COLUMN)' -c 'terminal sed </dev/fd/63 -e \"s/'$'\x1b'']8;;file:[^\]*[\]//g\" && sleep 0.01 && printf \"'$'\x1b'']2;\"'"
enabled_layouts tall,stack,fat,grid
kitty_mod alt
map alt+f no_op
map alt+b no_op
map ctrl+shift+f1 show_kitty_doc overview
map kitty_mod+enter launch --cwd=current
map ctrl+alt+c load_config_file
map kitty_mod+m toggle_layout stack
map kitty_mod+shift+c next_layout
map kitty_mod+h neighboring_window left
map kitty_mod+j neighboring_window down
map kitty_mod+k neighboring_window up
map kitty_mod+l neighboring_window right
map kitty_mod+p previous_tab
map kitty_mod+n next_tab
map kitty_mod+q close_tab
map kitty_mod+. move_tab_forward
map kitty_mod+, move_tab_backward
map alt+t>n new_tab
map alt+t>r set_tab_title
map kitty_mod+1 goto_tab 1
map kitty_mod+2 goto_tab 2
map kitty_mod+3 goto_tab 3
map kitty_mod+4 goto_tab 4
map kitty_mod+5 goto_tab 5
map kitty_mod+6 goto_tab 6
map kitty_mod+7 goto_tab 7
map kitty_mod+8 goto_tab 8
map kitty_mod+9 goto_tab 9
map kitty_mod+e show_scrollback
map kitty_mod+shift+k move_window up
map kitty_mod+shift+h move_window left
map kitty_mod+shift+l move_window right
map kitty_mod+shift+j move_window down
#: map f1 launch --type overlay --stdin-add-formatting --stdin-source=@screen_scrollback ~/.config/kitty/pager.sh

File diff suppressed because it is too large Load Diff

View File

@ -395,13 +395,13 @@ The theme of `C-x 4` bindings is that they operate on other windows, so this fun
(defun joe/smooth-scroll-half-page-down ()
"Smooth scroll down"
(interactive)
(joe/pixel-scroll-lerp 2 -1))
(joe/pixel-scroll-lerp 3 -1))
;; (pixel-scroll-kbd-up))
(defun joe/smooth-scroll-half-page-up ()
"Smooth scroll up"
(interactive)
(joe/pixel-scroll-lerp 2 1))
(joe/pixel-scroll-lerp 3 1))
(defun joe/smooth-scroll-short-down ()
"Smooth scroll down"
@ -582,19 +582,29 @@ targets."
*** Consult
#+begin_src emacs-lisp
(straight-use-package 'consult)
;; (defun joe/consult-line ()
;; (interactive)
;; (let ((vertico-posframe-mode -1))
;; (consult-line)))
(global-set-key (kbd "C-. C-l") 'consult-line)
;; (global-set-key (kbd "C-. C-l") 'joe/consult-line)
(global-set-key (kbd "C-. C-i") 'consult-imenu)
(global-set-key (kbd "C-. C-t") 'consult-theme)
(global-set-key (kbd "C-. C-r") 'consult-recent-file)
(global-set-key (kbd "C-. C-y") 'consult-yank-from-kill-ring)
;; (global-set-key (kbd "C-s") 'swiper-thing-at-point)
#+end_src
** Avy
#+begin_src emacs-lisp
(straight-use-package 'avy)
(setq avy-case-fold-search nil) ;; case sensitive makes selection easier
(define-key global-map (kbd "C-;") 'avy-goto-char-2) ;; I use this most frequently
(define-key global-map (kbd "C-'") 'avy-goto-line) ;; Consistent with ivy-avy
(define-key global-map (kbd "C-;") 'avy-goto-char) ;; I use this most frequently
;; (define-key global-map (kbd "C-'") 'avy-goto-line) ;; Consistent with ivy-avy
(define-key global-map (kbd "M-g c") 'avy-goto-char)
(define-key global-map (kbd "M-g e") 'avy-goto-word-0) ;; lots of candidates
(define-key global-map (kbd "M-g g") 'avy-goto-line) ;; digits behave like goto-line
@ -858,8 +868,20 @@ Emacs is an great operating system, if only it had a good text editor...
(straight-use-package 'boon)
(require 'boon-qwerty)
(boon-mode)
(define-key boon-moves-map "h" 'backward-char)
(define-key boon-moves-map "j" 'next-line)
(define-key boon-moves-map "k" 'previous-line)
(define-key boon-moves-map "l" 'forward-char)
(define-key boon-moves-map "i" 'boon-smarter-backward)
(define-key boon-moves-map "o" 'boon-smarter-forward)
(define-key boon-moves-map ";" '("hop" . avy-goto-word-1))
(define-key boon-command-map (kbd "C-k") 'scroll-down-line)
(define-key boon-command-map (kbd "C-j") 'scroll-up-line)
(define-key boon-moves-map "H" 'backward-paragraph)
(define-key boon-moves-map "L" 'forward-paragraph)
(define-key boon-moves-map "K" 'boon-smarter-upward)
(define-key boon-moves-map "J" 'boon-smarter-downward)
#+end_src
*** Kakoune.el
#+begin_src emacs-lisp :tangle no
@ -919,33 +941,37 @@ Emacs is an great operating system, if only it had a good text editor...
;; (add-to-list 'completion-at-point-functions #'cape-dabbrev)
(straight-use-package 'kind-icon)
;; (require 'kind-icon)
(setq completion-in-region-function #'consult-completion-in-region)
(setq completion-in-region-function (kind-icon-enhance-completion completion-in-region-function))
;; (setq completion-in-region-function #'consult-completion-in-region)
;; (setq completion-in-region-function (kind-icon-enhance-completion completion-in-region-function))
(setq completion-in-region-function
(kind-icon-enhance-completion
(lambda (&rest args)
(let ((marginalia-classifiers nil))
(apply #'consult-completion-in-region args)))))
;; (straight-use-package 'company)
;; (require 'company)
(straight-use-package 'company)
(require 'company)
;; (setq company-transformers '())
;; (add-to-list 'completion-at-point-functions #'elisp-completion-at-point)
;; (with-eval-after-load 'company
;; (define-key company-active-map (kbd "C-n") nil)
;; (define-key company-active-map (kbd "C-p") nil)
;; (define-key company-active-map (kbd "<return>") nil)
;; (define-key company-active-map (kbd "RET") nil)
;; (define-key company-active-map (kbd "C-f") #'company-complete-selection)
;; (define-key company-active-map [tab] #'company-complete-common-or-cycle)
;; (define-key company-active-map (kbd "<backtab>") (lambda () (interactive) (company-complete-common-or-cycle -1)))
(add-to-list 'completion-at-point-functions #'elisp-completion-at-point)
(with-eval-after-load 'company
(define-key company-active-map (kbd "C-n") nil)
(define-key company-active-map (kbd "C-p") nil)
(define-key company-active-map (kbd "<return>") nil)
(define-key company-active-map (kbd "RET") nil)
(define-key company-active-map (kbd "C-f") #'company-complete-selection)
(define-key company-active-map [tab] #'company-complete-common-or-cycle)
(define-key company-active-map (kbd "<backtab>") (lambda () (interactive) (company-complete-common-or-cycle -1)))
;; (setq company-idle-delay 0.15
;; company-tooltip-idle-delay 10
;; company-require-match nil
;; company-frontends '(company-pseudo-tooltip-unless-just-one-frontend-with-delay
;; company-preview-frontend company-echo-metadata-frontend)
;; ;; company-frontends '(company-text-icons-margin company-echo-metadata-frontend)
;; company-backends '((company-capf company-files)))
;; (setq company-transformers '(company-sort-by-occurrence)))
;; (add-hook 'after-init-hook (lambda () (global-company-mode)))
(setq company-idle-delay 0.15
company-tooltip-idle-delay 20
company-require-match nil
company-frontends '(company-preview-frontend company-echo-metadata-frontend)
;; company-frontends '(company-text-icons-margin company-echo-metadata-frontend)
company-backends '((company-capf company-files)))
(setq company-transformers '(company-sort-by-occurrence)))
(add-hook 'after-init-hook (lambda () (global-company-mode)))
;; (delete 'elisp-completion-at-point completion-at-point-functions)
;; (delete 'cape-symbol completion-at-point-functions)

3
.gitignore vendored
View File

@ -7,6 +7,9 @@
.emacs.*/undo
.emacs.*/url
.emacs.bankruptcy/elpaca/
.emacs.kak/
.emacs.bankruptcy/
+.emacs.bankruptcy/init.org
.emacs.vanilla/*
!.emacs.vanilla/init.el
/.emacs.d/auto-save-list/