Compare commits

..

No commits in common. "43660dabbad97a1e48cae55391c901f4ee0f56c8" and "c181c1ff3fd1e1494114546b1d0430e323681cb1" have entirely different histories.

8 changed files with 19 additions and 33 deletions

View File

@ -6,9 +6,10 @@
[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 -}}

View File

@ -7,8 +7,7 @@ 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 (not (eq .hosttype "desktop" "laptop")) }} {{- if (and (ne .chezmoi.hostname "arch") (ne .chezmoi.hostname "buzz")) }}
# Only for desktop or laptop (GUI)
.config/alacritty .config/alacritty
.config/conky .config/conky
.config/dunst .config/dunst
@ -23,7 +22,6 @@ 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 }}

View File

@ -45,9 +45,9 @@ shape = "Block"
TERM = "xterm-256color" TERM = "xterm-256color"
[font] [font]
{{- if eq .hosttype "desktop" }} {{- if eq .chezmoi.hostname "arch" }}
size = 7.5 size = 7.5
{{- else if eq .hosttype "laptop" }} {{- else if eq .chezmoi.hostname "buzz" }}
size = 5.5 size = 5.5
{{- end }} {{- end }}

View File

@ -1,3 +1,10 @@
{{- 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')
@ -51,7 +58,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 (and (eq .hosttype "desktop" "laptop") (eq .chezmoi.os "linux")) }} {{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
vim.cmd([[ autocmd InsertLeave * call system("fcitx5-remote -c") ]]) vim.cmd([[ autocmd InsertLeave * call system("fcitx5-remote -c") ]])
{{- end }} {{- end }}

View File

@ -1 +0,0 @@
return { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }

View File

@ -2,23 +2,6 @@ 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, {})
@ -27,7 +10,5 @@ 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
} }

View File

@ -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 eq .hosttype "desktop" "laptop" }} {{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
[directory.substitutions] [directory.substitutions]
"/mnt/" = " " "/mnt/" = " "
"~/dev/" = "" "~/dev/" = ""

View File

@ -1,5 +1,5 @@
# 256 color # 256 color
{{- if eq .hosttype "desktop" "laptop" }} {{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
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 eq .hosttype "desktop" "laptop" }} {{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
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 eq .hosttype "desktop" "laptop" }} {{- if (or (eq .chezmoi.hostname "arch") (eq .chezmoi.hostname "buzz")) }}
############################################### ###############################################
# 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/