Compare commits
8 Commits
c181c1ff3f
...
43660dabba
Author | SHA1 | Date | |
---|---|---|---|
|
43660dabba | ||
|
2a8645eb8e | ||
|
09db90af39 | ||
|
d8461b6aa9 | ||
|
a22636cab8 | ||
|
dcfb6648d1 | ||
|
b86adbe790 | ||
|
9fd0e7831e |
@ -6,10 +6,9 @@
|
|||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
command = "nvim"
|
command = "nvim"
|
||||||
args = ["-d", "{{ .Destination }}", "{{ .Source }}", "{{ .Target }}"]
|
args = ["-d", "{{ `{{ .Destination }}` }}", "{{ `{{ .Source }}` }}", "{{ `{{ .Target }}` }}"]
|
||||||
|
|
||||||
{{- $choices := list "desktop" "laptop" "server" -}}
|
|
||||||
{{- $hosttype := promptChoiceOnce . "hosttype" "What type of host?" $choices -}}
|
|
||||||
|
|
||||||
|
{{- $choices := list "desktop" "laptop" "server" }}
|
||||||
|
{{ $hosttype := promptChoiceOnce . "hosttype" "What type of host" $choices }}
|
||||||
[data]
|
[data]
|
||||||
hosttype = {{- $hosttype | quote -}}
|
hosttype = {{- $hosttype | quote -}}
|
||||||
|
@ -7,7 +7,8 @@ README.md
|
|||||||
.config/tmux/bootstraps # note that the pattern is not `dot_config/tmux/bootstraps`
|
.config/tmux/bootstraps # note that the pattern is not `dot_config/tmux/bootstraps`
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{- if (and (ne .chezmoi.hostname "arch") (ne .chezmoi.hostname "buzz")) }}
|
{{- if (not (eq .hosttype "desktop" "laptop")) }}
|
||||||
|
# Only for desktop or laptop (GUI)
|
||||||
.config/alacritty
|
.config/alacritty
|
||||||
.config/conky
|
.config/conky
|
||||||
.config/dunst
|
.config/dunst
|
||||||
@ -22,6 +23,7 @@ README.md
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{- if ne .chezmoi.osRelease.id "arch" }}
|
{{- if ne .chezmoi.osRelease.id "arch" }}
|
||||||
|
# Other than Arch Linux
|
||||||
.config/paru
|
.config/paru
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
@ -45,9 +45,9 @@ shape = "Block"
|
|||||||
TERM = "xterm-256color"
|
TERM = "xterm-256color"
|
||||||
|
|
||||||
[font]
|
[font]
|
||||||
{{- if eq .chezmoi.hostname "arch" }}
|
{{- if eq .hosttype "desktop" }}
|
||||||
size = 7.5
|
size = 7.5
|
||||||
{{- else if eq .chezmoi.hostname "buzz" }}
|
{{- else if eq .hosttype "laptop" }}
|
||||||
size = 5.5
|
size = 5.5
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
{{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
|
|
||||||
if (vim.g.neovide) then
|
|
||||||
vim.g.neovide_scale_factor = 0.7
|
|
||||||
vim.g.neovide_cursor_animation_length = 0
|
|
||||||
end
|
|
||||||
{{- end }}
|
|
||||||
|
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
try
|
try
|
||||||
if exists('+termguicolors')
|
if exists('+termguicolors')
|
||||||
@ -58,7 +51,7 @@ vim.cmd(':ca mkdir. call mkdir(expand("%:p:h"), "p")')
|
|||||||
vim.cmd(':ca W! w !sudo -A tee %')
|
vim.cmd(':ca W! w !sudo -A tee %')
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
|
{{- if (and (eq .hosttype "desktop" "laptop") (eq .chezmoi.os "linux")) }}
|
||||||
vim.cmd([[ autocmd InsertLeave * call system("fcitx5-remote -c") ]])
|
vim.cmd([[ autocmd InsertLeave * call system("fcitx5-remote -c") ]])
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
1
dot_config/nvim/lua/plugins/telescope-fzf-native.lua
Normal file
1
dot_config/nvim/lua/plugins/telescope-fzf-native.lua
Normal file
@ -0,0 +1 @@
|
|||||||
|
return { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }
|
@ -2,6 +2,23 @@ return {
|
|||||||
'nvim-telescope/telescope.nvim', tag = '0.1.5',
|
'nvim-telescope/telescope.nvim', tag = '0.1.5',
|
||||||
dependencies = { 'nvim-lua/plenary.nvim' },
|
dependencies = { 'nvim-lua/plenary.nvim' },
|
||||||
config = function()
|
config = function()
|
||||||
|
local actions = require("telescope.actions")
|
||||||
|
require('telescope').setup({
|
||||||
|
defaults = {
|
||||||
|
mappings = {
|
||||||
|
i = { ["<esc>"] = actions.close },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
extensions = {
|
||||||
|
fzf = {
|
||||||
|
fuzzy = true,
|
||||||
|
override_generic_sorter = true,
|
||||||
|
override_file_sorter = true,
|
||||||
|
case_mode = "smart_case",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
local builtin = require('telescope.builtin')
|
local builtin = require('telescope.builtin')
|
||||||
vim.keymap.set('n', '<leader>\'', builtin.marks, {})
|
vim.keymap.set('n', '<leader>\'', builtin.marks, {})
|
||||||
vim.keymap.set('n', '<leader>.', builtin.find_files, {})
|
vim.keymap.set('n', '<leader>.', builtin.find_files, {})
|
||||||
@ -10,5 +27,7 @@ return {
|
|||||||
vim.keymap.set('n', '<leader>,,', builtin.buffers, {})
|
vim.keymap.set('n', '<leader>,,', builtin.buffers, {})
|
||||||
vim.keymap.set('n', '<leader>,;', builtin.command_history, {})
|
vim.keymap.set('n', '<leader>,;', builtin.command_history, {})
|
||||||
vim.keymap.set('n', '<leader>,?', builtin.search_history, {})
|
vim.keymap.set('n', '<leader>,?', builtin.search_history, {})
|
||||||
|
|
||||||
|
require("telescope").load_extension('fzf')
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,7 @@ truncate_to_repo = false
|
|||||||
truncation_symbol = ""
|
truncation_symbol = ""
|
||||||
format = "[$path]($style)[$read_only]($read_only_style) "
|
format = "[$path]($style)[$read_only]($read_only_style) "
|
||||||
|
|
||||||
{{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
|
{{- if eq .hosttype "desktop" "laptop" }}
|
||||||
[directory.substitutions]
|
[directory.substitutions]
|
||||||
"/mnt/" = " "
|
"/mnt/" = " "
|
||||||
"~/dev/" = ""
|
"~/dev/" = ""
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# 256 color
|
# 256 color
|
||||||
{{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
|
{{- if eq .hosttype "desktop" "laptop" }}
|
||||||
set -g default-terminal "screen-256color"
|
set -g default-terminal "screen-256color"
|
||||||
{{- else }}
|
{{- else }}
|
||||||
set -g default-terminal "tmux-256color"
|
set -g default-terminal "tmux-256color"
|
||||||
@ -83,7 +83,7 @@ bind-key p run "xsel -o | tmux load-buffer - ; tmux paste-buffer"
|
|||||||
# Aesthetic
|
# Aesthetic
|
||||||
###########################
|
###########################
|
||||||
|
|
||||||
{{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
|
{{- if eq .hosttype "desktop" "laptop" }}
|
||||||
set -g pane-active-border-style fg=yellow
|
set -g pane-active-border-style fg=yellow
|
||||||
set -g message-command-style 'fg=#eeeeee bg=#333333 bold'
|
set -g message-command-style 'fg=#eeeeee bg=#333333 bold'
|
||||||
set -g message-style 'fg=#eeeeee bg=#333333 bold'
|
set -g message-style 'fg=#eeeeee bg=#333333 bold'
|
||||||
@ -114,7 +114,7 @@ set -g window-status-current-format ''
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
{{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
|
{{- if eq .hosttype "desktop" "laptop" }}
|
||||||
###############################################
|
###############################################
|
||||||
# local and nested remote tmux sessions
|
# local and nested remote tmux sessions
|
||||||
# - https://www.freecodecamp.org/news/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795/
|
# - https://www.freecodecamp.org/news/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795/
|
||||||
|
Loading…
Reference in New Issue
Block a user