mirror of
https://github.com/js0ny/dotfiles.git
synced 2025-12-21 16:53:00 +00:00
fix and some QoL changes
* antidots on readline inputrc * keyd to platforms/linux/keyd * org hide archive and sync vanilla with doom on custom vars * delete some appearance plugins
This commit is contained in:
parent
ee793c54af
commit
ccaf0ce33e
9 changed files with 50 additions and 10 deletions
39
Justfile
39
Justfile
|
|
@ -45,12 +45,19 @@ XDG_STATE_HOME := \
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Sudo and coreutils are required
|
||||||
LN := \
|
LN := \
|
||||||
if os_family() == "windows" { # Sudo and coreutils are required
|
if os_family() == "windows" {
|
||||||
"sudo ln -sf"
|
"sudo ln -sf"
|
||||||
} else {
|
} else {
|
||||||
"ln -sf"
|
"ln -sf"
|
||||||
}
|
}
|
||||||
|
CLIP := \
|
||||||
|
if os() == "windows" { "clip.exe" } \
|
||||||
|
else if os() == "linux" { "wl-copy" } \
|
||||||
|
else if os() == "macos" { "pbcopy" } \
|
||||||
|
else { "" }
|
||||||
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
echo {{DOTFILES}}
|
echo {{DOTFILES}}
|
||||||
|
|
@ -78,9 +85,11 @@ ideavim:
|
||||||
ln -sf {{DOTFILES}}/common/ideavimrc {{XDG_CONFIG_HOME}}/ideavim/ideavimrc
|
ln -sf {{DOTFILES}}/common/ideavimrc {{XDG_CONFIG_HOME}}/ideavim/ideavimrc
|
||||||
git clone https://github.com/MarcoIeni/intellimacs {{join(home_directory(), ".local/share/intellimacs")}} --depth 1
|
git clone https://github.com/MarcoIeni/intellimacs {{join(home_directory(), ".local/share/intellimacs")}} --depth 1
|
||||||
|
|
||||||
|
[unix]
|
||||||
vivaldi:
|
vivaldi:
|
||||||
curl https://github.com/SocietasEvanescentes/Vivaldi/files/12446831/Rose.Pine.Dawn.zip > $HOME/Downloads/vivaldi-light.zip # Rose Pine Dawn
|
curl -L https://github.com/SocietasEvanescentes/Vivaldi/files/12446831/Rose.Pine.Dawn.zip -o "$HOME/Downloads/vivaldi-light.zip" # Rose Pine Dawn
|
||||||
curl https://github.com/catppuccin/vivaldi/releases/download/1.0.0-ctpv2/Catppuccin.Mocha.Lavender.zip > $HOME/Downloads/vivaldi-dark.zip # Catppuccino Mocha Lavender
|
curl -L https://github.com/catppuccin/vivaldi/releases/download/1.0.0-ctpv2/Catppuccin.Mocha.Lavender.zip -o "$HOME/Downloads/vivaldi-dark.zip" # Catppuccino Mocha Lavender
|
||||||
|
|
||||||
|
|
||||||
[linux]
|
[linux]
|
||||||
systemd:
|
systemd:
|
||||||
|
|
@ -120,12 +129,36 @@ neovim:
|
||||||
{{LN}} {{DOTFILES}}/tools/nvim {{XDG_CONFIG_HOME}}/nvim
|
{{LN}} {{DOTFILES}}/tools/nvim {{XDG_CONFIG_HOME}}/nvim
|
||||||
nvim --headless +checkhealth +"w nvim-healthcheck.txt" +qall
|
nvim --headless +checkhealth +"w nvim-healthcheck.txt" +qall
|
||||||
|
|
||||||
|
[unix]
|
||||||
|
thunderbird:
|
||||||
|
curl -L https://github.com/wshanks/tbkeys/releases/download/v2.4.0/tbkeys.xpi -o "$HOME/Downloads/tbkeys.xpi"
|
||||||
|
curl -L https://github.com/htyxyt/htyxyt-immersive-translate-Thunderbird/releases/download/thunderbird-v1.14.8/immersive-translate-Thunderbird.v1.14.8.xpi -o "$HOME/Downloads/immersive-translate-Thunderbird.xpi"
|
||||||
|
cat {{DOTFILES}}/tools/thunderbird/tbkeys.json | {{CLIP}}
|
||||||
|
|
||||||
|
[linux]
|
||||||
|
readline:
|
||||||
|
mkdir -p {{XDG_CONFIG_HOME}}/readline
|
||||||
|
{{LN}} {{DOTFILES}}/common/inputrc {{XDG_CONFIG_HOME}}/readline/inputrc
|
||||||
|
|
||||||
[linux]
|
[linux]
|
||||||
bash:
|
bash:
|
||||||
{{LN}} {{DOTFILES}}/tools/bash {{XDG_CONFIG_HOME}}/bash
|
{{LN}} {{DOTFILES}}/tools/bash {{XDG_CONFIG_HOME}}/bash
|
||||||
sudo cp $DOTFILES/tools/bash/xdg-compat.sh /etc/profile.d/xdg-compat.sh
|
sudo cp $DOTFILES/tools/bash/xdg-compat.sh /etc/profile.d/xdg-compat.sh
|
||||||
|
|
||||||
|
[linux]
|
||||||
|
keyd:
|
||||||
|
-which keyd || sudo pacman -S keyd --noconfirm || sudo apt install keyd --yes || @just build_keyd
|
||||||
|
sudo cp {{DOTFILES}}/platforms/linux/keyd/keyd.conf /etc/keyd/default.conf
|
||||||
|
mkdir -p {{XDG_CONFIG_HOME}}/keyd
|
||||||
|
{{LN}} {{DOTFILES}}/platforms/linux/keyd/app.conf {{XDG_CONFIG_HOME}}/keyd/app.conf
|
||||||
|
sudo systemctl enable keyd
|
||||||
|
|
||||||
|
[linux]
|
||||||
|
[private]
|
||||||
|
build_keyd:
|
||||||
|
git clone https://github.com/rvaiya/keyd $HOME/.local/build/keyd
|
||||||
|
cd $HOME/.local/build/keyd && make && sudo make install
|
||||||
|
|
||||||
[linux]
|
[linux]
|
||||||
flatpak:
|
flatpak:
|
||||||
flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ if [ $(uname) = "Darwin" ]; then
|
||||||
else
|
else
|
||||||
echo "[INFO] Running on Linux"
|
echo "[INFO] Running on Linux"
|
||||||
linkDots+=(
|
linkDots+=(
|
||||||
["$DOTFILES/common/inputrc"]="$HOME/.inputrc"
|
["$DOTFILES/common/inputrc"]="$XDG_CONFIG_HOME/readline/inputrc"
|
||||||
)
|
)
|
||||||
# WSL1 : Microsoft
|
# WSL1 : Microsoft
|
||||||
# WSL2 : microsoft
|
# WSL2 : microsoft
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[ActivityManager]
|
[ActivityManager]
|
||||||
_k_friendly_name=Activity Manager
|
_k_friendly_name=活动管理器
|
||||||
switch-to-activity-32e1f2d2-08d1-4a8b-886a-0a062f999068=none,none,Switch to activity "Default"
|
switch-to-activity-32e1f2d2-08d1-4a8b-886a-0a062f999068=none,none,Switch to activity "Default"
|
||||||
switch-to-activity-e1ebfdac-0f52-47a5-9e7a-d9eb5cc26845=none,none,切换到活动“默认”
|
switch-to-activity-e1ebfdac-0f52-47a5-9e7a-d9eb5cc26845=none,none,切换到活动“默认”
|
||||||
|
|
||||||
|
|
@ -45,14 +45,14 @@ bring_main_window_to_top=Meta+K,Meta+K,Bring Main Window to Top
|
||||||
|
|
||||||
[ksmserver]
|
[ksmserver]
|
||||||
Halt Without Confirmation=none,,关机 (无需确认)
|
Halt Without Confirmation=none,,关机 (无需确认)
|
||||||
Lock Session=Meta+L\tScreensaver,Meta+L\tScreensaver,Lock Session
|
Lock Session=Meta+L\tScreensaver,Meta+L\tScreensaver,锁定会话
|
||||||
Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,显示注销屏幕
|
Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,显示注销屏幕
|
||||||
Log Out Without Confirmation=none,,注销 (无需确认)
|
Log Out Without Confirmation=none,,注销 (无需确认)
|
||||||
LogOut=none,,注销
|
LogOut=none,,注销
|
||||||
Reboot=none,,重启
|
Reboot=none,,重启
|
||||||
Reboot Without Confirmation=none,,重启 (无需确认)
|
Reboot Without Confirmation=none,,重启 (无需确认)
|
||||||
Shut Down=none,,关机
|
Shut Down=none,,关机
|
||||||
_k_friendly_name=Session Management
|
_k_friendly_name=会话管理
|
||||||
|
|
||||||
[kwin]
|
[kwin]
|
||||||
Activate Window Demanding Attention=Meta+Ctrl+A,Meta+Ctrl+A,激活请求注意的窗口
|
Activate Window Demanding Attention=Meta+Ctrl+A,Meta+Ctrl+A,激活请求注意的窗口
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,11 @@ minimal_path=(
|
||||||
"/usr/local/sbin"
|
"/usr/local/sbin"
|
||||||
"$HOME/.local/bin"
|
"$HOME/.local/bin"
|
||||||
"$HOME/.local/sbin"
|
"$HOME/.local/sbin"
|
||||||
|
"$HOME/.local/scripts"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc
|
||||||
|
|
||||||
for p in "${minimal_path[@]}"; do
|
for p in "${minimal_path[@]}"; do
|
||||||
pathadd "$p"
|
pathadd "$p"
|
||||||
done
|
done
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
(save-excursion (insert char ?\u200B)))
|
(save-excursion (insert char ?\u200B)))
|
||||||
|
|
||||||
;; Directory
|
;; Directory
|
||||||
(setq org-archive-location "~/OrgFiles/archive/%s_archive::")
|
(setq org-archive-location "~/OrgFiles/.archive/%s_archive::")
|
||||||
(setq org-default-notes-file "~/OrgFiles/tasks/inbox.org")
|
(setq org-default-notes-file "~/OrgFiles/tasks/inbox.org")
|
||||||
|
|
||||||
;; Initial Visibility
|
;; Initial Visibility
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,10 @@
|
||||||
(org-directory "~/OrgFiles/")
|
(org-directory "~/OrgFiles/")
|
||||||
(org-agenda-files (list (concat org-directory "tasks/")))
|
(org-agenda-files (list (concat org-directory "tasks/")))
|
||||||
(org-persist-directory (expand-file-name "org-persist" user-emacs-data))
|
(org-persist-directory (expand-file-name "org-persist" user-emacs-data))
|
||||||
|
(org-archive-location "~/OrgFiles/.archive/%s_archive::")
|
||||||
|
(org-default-notes-file "~/OrgFiles/tasks/inbox.org")
|
||||||
|
(org-startup-folded "show2levels")
|
||||||
|
(org-log-into-drawer "LOGBOOK")
|
||||||
(org-pretty-entities t)
|
(org-pretty-entities t)
|
||||||
(org-src-fontify-natively t)
|
(org-src-fontify-natively t)
|
||||||
(org-src-tab-acts-natively t) ; Use TAB to indent inside source block
|
(org-src-tab-acts-natively t) ; Use TAB to indent inside source block
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ return {
|
||||||
variant = "dawn",
|
variant = "dawn",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ "olimorris/onedarkpro.nvim", cmd = "Telescope colorscheme" },
|
-- { "olimorris/onedarkpro.nvim", cmd = "Telescope colorscheme" },
|
||||||
{ "rebelot/kanagawa.nvim", cmd = "Telescope colorscheme" },
|
{ "rebelot/kanagawa.nvim", cmd = "Telescope colorscheme" },
|
||||||
-- -- Highlight objects under the cursor
|
-- -- Highlight objects under the cursor
|
||||||
-- { "RRethy/vim-illuminate" },
|
-- { "RRethy/vim-illuminate" },
|
||||||
|
|
@ -42,7 +42,7 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ import = "plugins.mod.alpha-nvim" }, -- Dashboard
|
-- { import = "plugins.mod.alpha-nvim" }, -- Dashboard
|
||||||
{ -- Breadcrumb
|
{ -- Breadcrumb
|
||||||
"Bekaboo/dropbar.nvim",
|
"Bekaboo/dropbar.nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue