dotfiles · commit

.Xresources +3 -0

!
! .Xresources
!

! DPI for 2160p external monitor: 144
! DPI for 1080p laptop monitor: 112
Xft.dpi:        144
Xft.antialias:  true
Xft.rgba:       rgb
Xcursor.size:   16


.config/kitty/dark.conf added +51 -0

1	+	font_family JetBrains Mono Regular
2	+	bold_font JetBrains Mono Medium
3	+	italic_font JetBrains Mono Italic
4	+	bold_italic_font JetBrains Mono Medium Italic
5	+	font_size 12.0
6	+	adjust_line_height 0
7	+	enable_audio_bell no
8	+
9	+	scrollback_lines 8192
10	+	input_delay 3
11	+	repaint_delay 10
12	+	sync_to_monitor no
13	+	draw_minimal_borders yes
14	+	cursor_blink_interval 0
15	+	strip_trailing_spaces always
16	+	hide_window_decorations yes
17	+
18	+	resize_debounce_time 0.0
19	+	resize_in_steps no
20	+
21	+	window_resize_step_cells 2
22	+	window_resize_step_lines 2
23	+	window_padding_width 6.0
24	+	window_margin_width 2.0
25	+
26	+	map ctrl+shift+equal change_font_size all +1.0
27	+	map ctrl+shift+minus change_font_size all -1.0
28	+
29	+	cursor #B03060
30	+	foreground #DDDDDD
31	+	background #000000
32	+
33	+	selection_foreground #DDDDDD
34	+	selection_background #333333
35	+
36	+	color0 #000000
37	+	color1 #B03060
38	+	color2 #66CDAA
39	+	color3 #FFE4B5
40	+	color4 #483D8F
41	+	color5 #BB66DD
42	+	color6 #ADD8E6
43	+	color7 #BEBEBE
44	+	color8 #A9A9A9
45	+	color9 #D05090
46	+	color10 #7FFFD4
47	+	color11 #FFE4B5
48	+	color12 #8373EA
49	+	color13 #E47FFF
50	+	color14 #ADD8E6
51	+	color15 #FFFFFF

.config/kitty/kitty.conf deleted +0 -48

font_family               JetBrains Mono Regular
bold_font                 JetBrains Mono Medium
italic_font               JetBrains Mono Italic
bold_italic_font          JetBrains Mono Medium Italic
font_size                 12.0
adjust_line_height        0
enable_audio_bell         no

scrollback_lines          8192
input_delay               3
repaint_delay             10
sync_to_monitor           no
draw_minimal_borders      yes
cursor_blink_interval     0
strip_trailing_spaces     always
hide_window_decorations   yes

resize_debounce_time      0.0
resize_in_steps           no

window_resize_step_cells  2
window_resize_step_lines  2
window_padding_width      6.0
window_margin_width       2.0

cursor     #B03060
foreground #DDDDDD
background #000000

selection_foreground #DDDDDD
selection_background #333333

color0     #000000
color1     #B03060
color2     #66CDAA
color3     #FFE4B5
color4     #483D8F
color5     #BB66DD
color6     #ADD8E6
color7     #BEBEBE
color8     #A9A9A9
color9     #D05090
color10    #7FFFD4
color11    #FFE4B5
color12    #8373EA
color13    #E47FFF
color14    #ADD8E6
color15    #FFFFFF

.config/kitty/kitty.conf added +1 -0

1

+

/home/cloudhead/.config/kitty/dark.conf

.config/kitty/light.conf added +48 -0

1	+	font_family JetBrains Mono Regular
2	+	bold_font JetBrains Mono Medium
3	+	italic_font JetBrains Mono Italic
4	+	bold_italic_font JetBrains Mono Medium Italic
5	+	font_size 15.0
6	+	adjust_line_height 0
7	+	enable_audio_bell no
8	+
9	+	scrollback_lines 8192
10	+	input_delay 3
11	+	repaint_delay 10
12	+	sync_to_monitor no
13	+	draw_minimal_borders yes
14	+	cursor_blink_interval 0
15	+	strip_trailing_spaces always
16	+	hide_window_decorations yes
17	+
18	+	resize_debounce_time 0.0
19	+	resize_in_steps no
20	+
21	+	window_resize_step_cells 2
22	+	window_resize_step_lines 2
23	+	window_padding_width 6.0
24	+	window_margin_width 2.0
25	+
26	+	cursor #B03060
27	+	foreground #000000
28	+	background #FFFFFF
29	+
30	+	selection_foreground #000000
31	+	selection_background #DDDDDD
32	+
33	+	color0 #000000
34	+	color1 #B03060
35	+	color2 #66CDAA
36	+	color3 #FFE4B5
37	+	color4 #483D8F
38	+	color5 #BB66DD
39	+	color6 #ADD8E6
40	+	color7 #BEBEBE
41	+	color8 #A9A9A9
42	+	color9 #D05090
43	+	color10 #7FFFD4
44	+	color11 #FFE4B5
45	+	color12 #8373EA
46	+	color13 #E47FFF
47	+	color14 #ADD8E6
48	+	color15 #FFFFFF

.config/nvim/coc-settings.json +5 -3

  "diagnostic.messageDelay": 0,
  "diagnostic.maxWindowHeight": 16,
  "diagnostic.format": "✗ %message",
  "diagnostic.hintSign": "",
  "diagnostic.level": "warning",
  "diagnostic.checkCurrentLine": true,
  "suggest.fixInsertedWord": false,
  "codeLens.enable": false,
  "codeLens.separator": " ",
  "coc.preferences.useQuickfixForLocations": true,
  "coc.preferences.bracketEnterImprove": false,
  "coc.preferences.snippets.enable": false,

  "coc.source.buffer.enable": false,
  "coc.source.file.enable": false,

  "svelte.enable-ts-plugin": true,

  "rust-analyzer.completion.postfix.enable": false,
  "rust-analyzer.inlayHints.closingBraceHints.enable": false,
  "rust-analyzer.inlayHints.parameterHints.enable": false,
  "rust-analyzer.inlayHints.renderColons": false,
  "rust-analyzer.inlayHints.typeHintsSeparator": "",
  "rust-analyzer.inlayHints.chainingHintsSeparator": " ",
  "rust-analyzer.updates.prompt": false,
  "rust-analyzer.diagnostics.enableExperimental": true,
  "rust-analyzer.diagnostics.disabled": [
    "macro-error"
  ],
  "rust-analyzer.lens.enable": true,
  "rust-analyzer.checkOnSave.command": "clippy",

  "list.maxHeight": 10,
  "list.autoResize": false,
  "list.extendedSearchMode": false,

  "suggest.fixInsertedWord": false,
  "suggest.maxCompleteItemCount": 32
}

.gitconfig +11 -3

  remote = green

[color "diff"]
  meta = yellow
  frag = magenta
  old = red
  new = green
  old = brightred
  oldMoved = red
  oldMovedAlternative = red
  newMoved = green
  newMovedAlternative = green
  new = brightgreen

[color "status"]
  added = yellow
  changed = green
  untracked = cyan


[alias]
  b = branch -v
  c = commit -v
  s = status -sb
  r = rebase
  re = rebase
  st = status
  co = checkout
  d = diff --word-diff=color
  l = log --stat
  ll = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  delete-merged = branch --merged | xargs git branch -d
  changes = log -c --reverse
  lg = "!f() { \
      git log --all --color --graph --pretty=format:'%C(bold yellow)<sig>%G?</sig>%C(reset) %C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(blue)<%an>%C(reset)' | \
      sed \
      -e 's#<sig>G</sig>#Good#' \


[rerere]
  enabled = 1

[diff]
  colorMoved = zebra
  colorMoved = dimmed-zebra
  colorMovedWs = allow-indentation-change

[fetch]
  prune = true

.profile +1 -0

export VISUAL=nvim
export MOZ_USE_XINPUT2=1 # Pixel scrolling in Firefox
export RIPGREP_CONFIG_PATH=$HOME/.rgrc
export PATH="$HOME/.radicle/bin:$PATH"
export NNN_FIFO=/tmp/nnn.fifo
export CARGO_BUILD_JOBS=4

systemctl --user start share-sync

if command -v xinput >/dev/null; then
  prop="$(xinput | rg Touchpad | rg -o 'id=[0-9]+' | sed 's/id=//')"

.vim/after/syntax/sql.vim added +8 -0

1	+	"
2	+	" Additional highlighting for SQL.
3	+	"
4	+	syn match sqlOperator "references"
5	+	syn match sqlOperator "strict"
6	+	syn match sqlSpecial "primary"
7	+	syn match sqlSpecial "key"
8	+	syn match sqlType "text"

.vim/syntax/todo.vim +1 -0

"
syntax match todoOther       '^.*'
syntax match todoDone        '^\s*\[[Xx]\].*'
syntax match todoNormal      '^\s*\[ \]\s*.*'
syntax match todoComment     '^\s*%.*'
syntax match todoComment     '^\s*;.*'
syntax match todoCheckbox    '^\s*\[\s\]'
syntax match todoUrgent      '^\s*\[!\]\s.*$'
syntax match todoCanceled    '^\s*\[/\]\s.*$'
syntax match todoImportant   '\s!!'
syntax match todoImportant   '\s![a-zA-Z0-9-]\+'

.vimrc +3 -2


" Repeat previous command
map <Leader><Space> @:

" Commenting
nmap <C-_>           <Plug>CommentaryLine
xmap <C-_>           <Plug>Commentary
nmap <C-/>           <Plug>CommentaryLine
xmap <C-/>           <Plug>Commentary

if has("nvim")
  tnoremap <Esc> <C-\><C-n>
endif


  inoremap <silent><expr> <C-Y> pumvisible() ? "<C-p><C-n><Esc>a" : "\<C-Y>"
  " Trigger completion on <CR>.
  inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
endfunction
autocmd User CocNvimInit call SetupCoc()
command! CocStop call coc#rpc#stop()


" Use custom colors.
" This has to go after plugin initialization.
try

.xinitrc +1 -0


[ -f ~/.synaptics ] && . ~/.synaptics

setxkbmap -option compose:lwin
setxkbmap -option compose:rwin
setxkbmap -option compose:menu
setxkbmap -rules evdev -model evdev -layout us -variant altgr-intl

if [ -f ~/.Xmodmap ]; then
  xmodmap ~/.Xmodmap;
fi

.xmonad/xmonad.hs +1 -1

       , ((modMask .|. shiftMask, xK_F12),      safeSpawn "systemctl" ["hibernate"])
       , ((modMask, xK_F11),                    safeSpawnProg "slock")
       , ((modMask, xK_F10),                    safeSpawnProg "toggle-displays")
       , ((modMask, xK_F5),                     safeSpawnProg "refresh-display")
       , ((modMask .|. controlMask, xK_r),      safeSpawn "killall" ["kitty", "-USR1"])
       , ((modMask, xK_s),                      safeSpawn "autorandr" ["--cycle"])
       , ((modMask, xK_s),                      safeSpawn "autorandr" ["--change"])
       , ((modMask, xK_p),                      runExecutable)
       , ((modMask .|. shiftMask, xK_p),        editPrompt home)
       , ((modMask, xK_o),                      switchWindow)
       , ((modMask, xK_Tab),                    toggleWS)
       , ((modMask .|. controlMask, xK_Return), toggleFloatNext >> (spawn $ XMonad.terminal conf))

85	92
86	93		[rerere]
87	94		enabled = 1
88	95
89	96		[diff]
90		-	colorMoved = zebra
	97	+	colorMoved = dimmed-zebra
	98	+	colorMovedWs = allow-indentation-change
91	99
92	100		[fetch]
93	101		prune = true

287	287
288	288		" Repeat previous command
289	289		map <Leader><Space> @:
290	290
291	291		" Commenting
292		-	nmap <C-_> <Plug>CommentaryLine
293		-	xmap <C-_> <Plug>Commentary
	292	+	nmap <C-/> <Plug>CommentaryLine
	293	+	xmap <C-/> <Plug>Commentary
294	294
295	295		if has("nvim")
296	296		tnoremap <Esc> <C-\><C-n>
297	297		endif
298	298

422	422		inoremap <silent><expr> <C-Y> pumvisible() ? "<C-p><C-n><Esc>a" : "\<C-Y>"
423	423		" Trigger completion on <CR>.
424	424		inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
425	425		endfunction
426	426		autocmd User CocNvimInit call SetupCoc()
	427	+	command! CocStop call coc#rpc#stop()
427	428
428	429
429	430		" Use custom colors.
430	431		" This has to go after plugin initialization.
431	432		try

154	154		, ((modMask .\|. shiftMask, xK_F12), safeSpawn "systemctl" ["hibernate"])
155	155		, ((modMask, xK_F11), safeSpawnProg "slock")
156	156		, ((modMask, xK_F10), safeSpawnProg "toggle-displays")
157	157		, ((modMask, xK_F5), safeSpawnProg "refresh-display")
158	158		, ((modMask .\|. controlMask, xK_r), safeSpawn "killall" ["kitty", "-USR1"])
159		-	, ((modMask, xK_s), safeSpawn "autorandr" ["--cycle"])
	159	+	, ((modMask, xK_s), safeSpawn "autorandr" ["--change"])
160	160		, ((modMask, xK_p), runExecutable)
161	161		, ((modMask .\|. shiftMask, xK_p), editPrompt home)
162	162		, ((modMask, xK_o), switchWindow)
163	163		, ((modMask, xK_Tab), toggleWS)
164	164		, ((modMask .\|. controlMask, xK_Return), toggleFloatNext >> (spawn $ XMonad.terminal conf))

1	1		!
2	2		! .Xresources
3	3		!
	4	+
	5	+	! DPI for 2160p external monitor: 144
	6	+	! DPI for 1080p laptop monitor: 112
4	7		Xft.dpi: 144
5	8		Xft.antialias: true
6	9		Xft.rgba: rgb
7	10		Xcursor.size: 16
8	11

9	9		"diagnostic.messageDelay": 0,
10	10		"diagnostic.maxWindowHeight": 16,
11	11		"diagnostic.format": "✗ %message",
12	12		"diagnostic.hintSign": "",
13	13		"diagnostic.level": "warning",
14		-	"diagnostic.checkCurrentLine": true,
15		-	"suggest.fixInsertedWord": false,
16	14		"codeLens.enable": false,
17	15		"codeLens.separator": " ",
18	16		"coc.preferences.useQuickfixForLocations": true,
19	17		"coc.preferences.bracketEnterImprove": false,
20	18		"coc.preferences.snippets.enable": false,

26	24		"coc.source.buffer.enable": false,
27	25		"coc.source.file.enable": false,
28	26
29	27		"svelte.enable-ts-plugin": true,
30	28
	29	+	"rust-analyzer.completion.postfix.enable": false,
	30	+	"rust-analyzer.inlayHints.closingBraceHints.enable": false,
	31	+	"rust-analyzer.inlayHints.parameterHints.enable": false,
	32	+	"rust-analyzer.inlayHints.renderColons": false,
31	33		"rust-analyzer.inlayHints.typeHintsSeparator": "",
32	34		"rust-analyzer.inlayHints.chainingHintsSeparator": " ",
33	35		"rust-analyzer.updates.prompt": false,
34	36		"rust-analyzer.diagnostics.enableExperimental": true,
35	37		"rust-analyzer.diagnostics.disabled": [
36	38		"macro-error"
37	39		],
38	40		"rust-analyzer.lens.enable": true,
	41	+	"rust-analyzer.checkOnSave.command": "clippy",
39	42
40	43		"list.maxHeight": 10,
41	44		"list.autoResize": false,
42	45		"list.extendedSearchMode": false,
43	46
44		-	"suggest.fixInsertedWord": false,
45	47		"suggest.maxCompleteItemCount": 32
46	48		}

24	24		remote = green
25	25
26	26		[color "diff"]
27	27		meta = yellow
28	28		frag = magenta
29		-	old = red
30		-	new = green
	29	+	old = brightred
	30	+	oldMoved = red
	31	+	oldMovedAlternative = red
	32	+	newMoved = green
	33	+	newMovedAlternative = green
	34	+	new = brightgreen
31	35
32	36		[color "status"]
33	37		added = yellow
34	38		changed = green
35	39		untracked = cyan

41	45
42	46		[alias]
43	47		b = branch -v
44	48		c = commit -v
45	49		s = status -sb
	50	+	r = rebase
	51	+	re = rebase
46	52		st = status
47	53		co = checkout
48	54		d = diff --word-diff=color
49	55		l = log --stat
50	56		ll = log -p
51	57		lol = log --graph --decorate --pretty=oneline --abbrev-commit
52	58		lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
53	59		hist = log --pretty=format:\"%h %ad \| %s%d [%an]\" --graph --date=short
	60	+	delete-merged = branch --merged \| xargs git branch -d
54	61		changes = log -c --reverse
55	62		lg = "!f() { \
56	63		git log --all --color --graph --pretty=format:'%C(bold yellow)<sig>%G?</sig>%C(reset) %C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%cr) %C(blue)<%an>%C(reset)' \| \
57	64		sed \
58	65		-e 's#<sig>G</sig>#Good#' \

11	11		export VISUAL=nvim
12	12		export MOZ_USE_XINPUT2=1 # Pixel scrolling in Firefox
13	13		export RIPGREP_CONFIG_PATH=$HOME/.rgrc
14	14		export PATH="$HOME/.radicle/bin:$PATH"
15	15		export NNN_FIFO=/tmp/nnn.fifo
	16	+	export CARGO_BUILD_JOBS=4
16	17
17	18		systemctl --user start share-sync
18	19
19	20		if command -v xinput >/dev/null; then
20	21		prop="$(xinput \| rg Touchpad \| rg -o 'id=[0-9]+' \| sed 's/id=//')"

5	5		"
6	6		syntax match todoOther '^.*'
7	7		syntax match todoDone '^\s\[[Xx]\].'
8	8		syntax match todoNormal '^\s\[ \]\s.*'
9	9		syntax match todoComment '^\s%.'
	10	+	syntax match todoComment '^\s;.'
10	11		syntax match todoCheckbox '^\s*\[\s\]'
11	12		syntax match todoUrgent '^\s\[!\]\s.$'
12	13		syntax match todoCanceled '^\s\[/\]\s.$'
13	14		syntax match todoImportant '\s!!'
14	15		syntax match todoImportant '\s![a-zA-Z0-9-]\+'

7	7
8	8		[ -f ~/.synaptics ] && . ~/.synaptics
9	9
10	10		setxkbmap -option compose:lwin
11	11		setxkbmap -option compose:rwin
	12	+	setxkbmap -option compose:menu
12	13		setxkbmap -rules evdev -model evdev -layout us -variant altgr-intl
13	14
14	15		if [ -f ~/.Xmodmap ]; then
15	16		xmodmap ~/.Xmodmap;
16	17		fi