Compare commits

..

No commits in common. "c3730b43b7e940f9fcd35a09c7e73e07b68186c4" and "43d42a685f8ebc214969fed3a34341848ec51f52" have entirely different histories.

8 changed files with 27 additions and 35 deletions

View File

@ -1,9 +1,7 @@
{{- $name := promptStringOnce . "name" "請輸入您的姓名" -}}
{{- $email := promptStringOnce . "email" "輸入您的Email地址" -}}
{{- $hasGUI := promptBoolOnce . "hasGUI" "Does this machine have a GUI" -}}
sourceDir = "~/.local/share/chezmoi"
[data]
name = {{ $name | quote }}
email = {{ $email | quote }}
noGUI = {{ not $hasGUI }}

View File

@ -16,7 +16,6 @@ brews = [
'go',
'nodejs',
'java',
'jstkdng/programs/ueberzugpp',
]
casks = [

View File

@ -4,23 +4,9 @@ chezmoi.code-workspace
dconf.ini
{{/* ---- 沒有圖形界面 ---------------------------------------------------- */ -}}
{{ if .noGUI }}
.config/iterm2/
.config/alacritty
.config/neovide
.config/konsolerc
.local/share/konsole
dconf.ini
.gvimrc
{{/* ---- 有視窗應用程式 -------------------------------------------------- */ -}}
{{ else}}
{{/* ---- 處理特定os專用 */ -}}
{{ if ne .chezmoi.os "darwin" }}
.chezmoiscripts/run_onchange_before_darwin-install-packages.sh.tmpl
.config/iterm2
.config/iterm2/com.googlecode.iterm2.plist
{{ end }}
{{ if ne .chezmoi.os "linux" }}
.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
@ -33,5 +19,3 @@ dconf.ini
{{ else }}
*.sh
{{ end }}
{{ end }}

View File

@ -22,16 +22,15 @@ export PATH="/usr/local/lib/ruby/gems/3.3.0/bin:$PATH"¬
export PATH="$HOME/.local/share/gem/ruby/3.3.0/bin:$PATH"
{{/* ---- 設定環境變數 ---------------------------------------------------- */ -}}
# 設定預設編輯器
{{ if false -}} {{/* 不執行 */}}
{{- /* 設定預設編輯器 */ -}}
{{ if eq .chezmoi.os "linux" }}
# linux config
[ -n "$DISPLAY" ] && export EDITOR=kate|| export EDITOR=nvim
{{ else }}
export EDITOR=nvim
# non-linux config
{{ end }}
{{ end -}}
export EDITOR=nvim
export VISUAL=nvim
{{/* ---- 設定ailas ------------------------------------------------------ */ -}}

View File

@ -50,15 +50,6 @@ chezmoi apply
```
</details>
#### macOS可能會遇到的狀況
##### 若無法安裝 jstkdng/programs/ueberzugpp
<https://github.com/jstkdng/homebrew-programs/issues/2>
```
$ sudo rm -rf /Library/Developer/CommandLineTools
$ xcode-select --install
```
#### 若需要刪掉重來
```
rm -rf ~/.local/share/chezmoi

View File

@ -7,6 +7,5 @@
{{ end }}
# ----以下是我的自訂內容 ------------------------------------------------------
export LANG=zh_TW.UTF-8 #macOS要手動指定不然被ssh連入使用時會變亂碼
{{ template "common.sh.tmpl" . }}

View File

@ -27,6 +27,17 @@ require("lazy").setup({
hererocks = true, -- recommended if you do not have global installation of Lua 5.1.
},
spec = {
-- 先關閉此功能目前在neo-tree無法work而且會造成neovide出問題
-- {
-- "3rd/image.nvim",
-- opts = {},
-- config = function()
-- require("image").setup({
-- backend = "ueberzug", -- or "ueberzug"
-- processor = "magick_rock", -- or "magick_rock"
-- })
-- end,
-- },
-- 自動載入 plugins 資料夾中的所有插件
{ import = "plugins" },
{ import = "plugins.themes.nightfox" }, -- 自訂配色

View File

@ -20,7 +20,18 @@ return {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim",
-- "3rd/image.nvim", -- 先註解,因為已經由 nvim/lua/plugins/components/image.lua 處理了
-- "3rd/image.nvim",
-- {"3rd/image.nvim",
-- build = false,
-- opts = {
-- processor = "magick_cli",
-- },
-- config = function()
-- require("image").setup({
-- backend = "ueberzug",
-- })
-- end,
-- }, -- Optional image support in preview window: See `# Preview Mode` for more information
{
"s1n7ax/nvim-window-picker", -- for open_with_window_picker keymaps
version = "2.*",