diff --git a/.directory b/.directory new file mode 100644 index 0000000..5092fe1 --- /dev/null +++ b/.directory @@ -0,0 +1,2 @@ +[Desktop Entry] +Icon=configurator diff --git a/.gitignore b/.gitignore index 0c31ce4..e114c5f 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,6 @@ lazy-lock.json # Emacs *.elc -common/**/*current* \ No newline at end of file +common/**/*current* + +default.target.wants diff --git a/Justfile b/Justfile index 80b773e..b17af47 100644 --- a/Justfile +++ b/Justfile @@ -1,27 +1,56 @@ set shell := ["fish", "-c"] set windows-shell := ["pwsh", "-c"] + +PLATFORM := \ + if os() == "linux" { + if env("WSL_DISTRO_NAME","") != "" { + "wsl" + } else { + "linux" + } + } else if os() == "windows" { + "win" + } else if os() == "macos" { + "mac" + } else { "" } DOTFILES := join(home_directory(), ".dotfiles") XDG_CONFIG_HOME := \ - if env_var("XDG_CONFIG_HOME") != "" {env_var("XDG_CONFIG_HOME")} \ + if env("XDG_CONFIG_HOME") != "" {env("XDG_CONFIG_HOME")} \ else { if os_family() == "windows" { - env_var("APPDATA") + env("APPDATA") } else { join(home_directory(), ".config") } } XDG_DATA_HOME := \ - if env_var("XDG_DATA_HOME") != "" {env_var("XDG_DATA_HOME")} \ + if env("XDG_DATA_HOME") != "" {env("XDG_DATA_HOME")} \ else { if os_family() == "windows" { - env_var("LOCALAPPDATA") + env("LOCALAPPDATA") } else { join(home_directory(), ".local/share") } } +XDG_STATE_HOME := \ + if env("XDG_STATE_HOME") != "" {env("XDG_STATE_HOME")} \ + else { + if os_family() == "windows" { + join(env("LOCALAPPDATA"), "state") + } else { + join(home_directory(), ".local/state") + } + } + +LN := \ + if os_family() == "windows" { # Sudo and coreutils are required + "sudo ln -sf" + } else { + "ln -sf" + } test: echo {{DOTFILES}} @@ -37,18 +66,69 @@ check: @just check_shell format: @just format_shell - - push: git push github master git push codeberg master setup: @just ideavim + @just vivaldi ideavim: - ln -sf {{DOTFILES}}/common/ideavimrc $XDG_CONFIG_HOME/ideavim/ideavimrc - git clone https://github.com/MarcoIeni/intellimacs {{join(home_directory(), ".local/share/intellimacs")}} + 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 + +vivaldi: + curl https://github.com/SocietasEvanescentes/Vivaldi/files/12446831/Rose.Pine.Dawn.zip > $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 + +[linux] +systemd: + ln -sf {{DOTFILES}}/platforms/{{PLATFORM}}/systemd {{XDG_CONFIG_HOME}}/systemd/ + + +uv: + uv init {{XDG_DATA_HOME}}/uvenv + cd {{XDG_DATA_HOME}}/uvenv + uv venv + uv add -r {{DOTFILES}}/bootstrap/components/requirements.txt + +[unix] +vim: + mkdir -p {{XDG_DATA_HOME}}/vim/after + mkdir -p {{XDG_STATE_HOME}}/vim/{backup,swap,undo,view} + mkdir -p {{XDG_CONFIG_HOME}}/vim/ + ln -sf {{DOTFILES}}/common/vimrc {{XDG_CONFIG_HOME}}/vim/vimrc + + +[windows] +vim: + New-Item -ItemType SymbolicLink -Path $HOME/_vimrc -Value {{DOTFILES}}/common/vim.noxdg.vimrc + +yazi: + which yazi || cargo install --locked yazi-fm yazi-cli + -ya pack -a llanosrocas/yaziline + -ya pack -a yazi-rs/plugins:git + -ya pack -a Rolv-Apneseth/starship + +wezterm: + which wezterm + {{LN}} {{DOTFILES}}/tools/wezterm {{XDG_CONFIG_HOME}}/wezterm/wezterm.lua + +neovim: + which nvim + {{LN}} {{DOTFILES}}/tools/nvim {{XDG_CONFIG_HOME}}/nvim + nvim --headless +checkhealth +"w nvim-healthcheck.txt" +qall + + +[linux] +bash: + {{LN}} {{DOTFILES}}/tools/bash {{XDG_CONFIG_HOME}}/bash + sudo cp $DOTFILES/tools/bash/xdg-compat.sh /etc/profile.d/xdg-compat.sh + +[linux] +flatpak: + flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo [private] pull: @@ -73,4 +153,4 @@ format_shell: [private] check_info: shellcheck -x -s sh **/*.sh platforms/mac/yabairc - shellcheck -x -s bash **/*.bash tools/bash/* scripts/*.{sh,zsh,bash} **/*.bashrc \ No newline at end of file + shellcheck -x -s bash **/*.bash tools/bash/* scripts/*.{sh,zsh,bash} **/*.bashrc diff --git a/platforms/linux/hypr/hyprland.conf b/platforms/linux/hypr/hyprland.conf index d01aa2b..6d9a6aa 100644 --- a/platforms/linux/hypr/hyprland.conf +++ b/platforms/linux/hypr/hyprland.conf @@ -147,12 +147,12 @@ decoration { active_opacity = 1.0 inactive_opacity = 1.0 - shadow { - enabled = true - range = 4 - render_power = 3 - color = $base - } + # shadow { + # enabled = true + # range = 4 + # render_power = 3 + # color = $base + # } # https://wiki.hyprland.org/Configuring/Variables/#blur blur { diff --git a/platforms/linux/hypr/hyprlock.conf b/platforms/linux/hypr/hyprlock.conf new file mode 100644 index 0000000..fa7a65e --- /dev/null +++ b/platforms/linux/hypr/hyprlock.conf @@ -0,0 +1,69 @@ +# BACKGROUND +background { + monitor = + path = ~/.config/hypr/walls/1.png + # blur_passes = 0 + # contrast = 1 + # brightness = 1 + # vibrancy = 0.2 + # vibrancy_darkness = 0.2 +} + +# GENERAL +general { + no_fade_in = false + no_fade_out = false + hide_cursor = true + grace = 0 + disable_loading_bar = true + ignore_empty_input = true +} + +# INPUT FIELD +input-field { + monitor = + size = 250, 60 + outline_thickness = 2 + dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true + outer_color = rgba(0, 0, 0, 0) + inner_color = rgba(0, 0, 0, 0.2) + font_color = rgb(205, 214, 244) + fade_on_empty = false + rounding = -1 + placeholder_text = Password + hide_input = false + position = 0, -200 + halign = center + valign = center + check_color = rgb(108, 112, 134) + fail_color = rgb(243, 139, 168) # if authentication failed, changes outer_color and fail message color + fail_text = $ATTEMPTS # can be set to empty + fail_timeout = 2000 # milliseconds before fail_text and fail_color disappears + fail_transition = 300 # transition time in ms between normal outer_color and fail_color +} + +# DATE +label { + monitor = + text = cmd[update:1000] date +"%A, %B %d" + color = rgb(205, 214, 244) + font_size = 22 + font_family = JetBrains Mono + position = 0, 300 + halign = center + valign = center +} + +# TIME +label { + monitor = + text = cmd[update:1000] date +"%-I:%M" + color = rgb(205, 214, 244) + font_size = 95 + font_family = JetBrains Mono Extrabold + position = 0, 200 + halign = center + valign = center +} diff --git a/platforms/linux/kde/elisarc b/platforms/linux/kde/elisarc deleted file mode 100644 index 2995c64..0000000 --- a/platforms/linux/kde/elisarc +++ /dev/null @@ -1,5 +0,0 @@ -[ElisaFileIndexer] -RootPath[$e]=$HOME/Music - -[Views] -InitialFilesViewPath=/mnt/d/Media/Music diff --git a/platforms/linux/kde/kglobalshortcutsrc b/platforms/linux/kde/kglobalshortcutsrc index 1ae46b8..c8bcce4 100644 --- a/platforms/linux/kde/kglobalshortcutsrc +++ b/platforms/linux/kde/kglobalshortcutsrc @@ -1,13 +1,15 @@ [ActivityManager] _k_friendly_name=Activity Manager switch-to-activity-32e1f2d2-08d1-4a8b-886a-0a062f999068=none,none,Switch to activity "Default" +switch-to-activity-e1ebfdac-0f52-47a5-9e7a-d9eb5cc26845=none,none,切换到活动“默认” [KDE Keyboard Layout Switcher] Switch keyboard layout to English (Colemak)=none,none,Switch keyboard layout to English (Colemak) Switch keyboard layout to English (US)=none,none,Switch keyboard layout to English (US) -Switch to Last-Used Keyboard Layout=Meta+Alt+L,Meta+Alt+L,Switch to Last-Used Keyboard Layout -Switch to Next Keyboard Layout=Meta+Alt+K,Meta+Alt+K,Switch to Next Keyboard Layout -_k_friendly_name=Keyboard Layout Switcher +Switch keyboard layout to 英语(美国)=none,none,切换键盘布局为 英语(美国) +Switch to Last-Used Keyboard Layout=Meta+Alt+L,Meta+Alt+L,切换到上次使用过的键盘布局 +Switch to Next Keyboard Layout=Meta+Alt+K,Meta+Alt+K,切换到下一个键盘布局 +_k_friendly_name=键盘布局切换器 [Strawberry] _k_friendly_name=Strawberry @@ -17,54 +19,54 @@ prev_track=none,none,Previous track stop=none,none,Stop [kaccess] -Toggle Screen Reader On and Off=Meta+Alt+S,Meta+Alt+S,Toggle Screen Reader On and Off -_k_friendly_name=Accessibility +Toggle Screen Reader On and Off=Meta+Alt+S,Meta+Alt+S,切换屏幕阅读器开关 +_k_friendly_name=无障碍辅助 [kcm_touchpad] Disable Touchpad=Touchpad Off,Touchpad Off, Enable Touchpad=Touchpad On,Touchpad On, Toggle Touchpad=Touchpad Toggle\tMeta+Ctrl+Zenkaku Hankaku,Touchpad Toggle\tTouchpad Toggle\tMeta+Ctrl+Touchpad Toggle\tMeta+Ctrl+Zenkaku Hankaku, -_k_friendly_name=Touchpad +_k_friendly_name=触摸板 [kmix] -_k_friendly_name=KMix -decrease_microphone_volume=Microphone Volume Down,Microphone Volume Down,Decrease Microphone Volume -decrease_volume=Volume Down,Volume Down,Decrease Volume -decrease_volume_small=Shift+Volume Down,Shift+Volume Down,Decrease Volume by 1% -increase_microphone_volume=Microphone Volume Up,Microphone Volume Up,Increase Microphone Volume -increase_volume=Volume Up,Volume Up,Increase Volume -increase_volume_small=Shift+Volume Up,Shift+Volume Up,Increase Volume by 1% -mic_mute=Microphone Mute\tMeta+Volume Mute,Microphone Mute\tMeta+Volume Mute,Mute Microphone -mute=Volume Mute,Volume Mute,Mute +_k_friendly_name=音量 +decrease_microphone_volume=Microphone Volume Down,Microphone Volume Down,降低麦克风音量 +decrease_volume=Volume Down,Volume Down,降低音量 +decrease_volume_small=Shift+Volume Down,Shift+Volume Down,音量降低 1% +increase_microphone_volume=Microphone Volume Up,Microphone Volume Up,提高麦克风音量 +increase_volume=Volume Up,Volume Up,提高音量 +increase_volume_small=Shift+Volume Up,Shift+Volume Up,音量提高 1% +mic_mute=Microphone Mute\tMeta+Volume Mute,Microphone Mute\tMeta+Volume Mute,麦克风静音 +mute=Volume Mute,Volume Mute,静音 [krusader] _k_friendly_name=Krusader bring_main_window_to_top=Meta+K,Meta+K,Bring Main Window to Top [ksmserver] -Halt Without Confirmation=none,none,Shut Down Without Confirmation +Halt Without Confirmation=none,,关机 (无需确认) Lock Session=Meta+L\tScreensaver,Meta+L\tScreensaver,Lock Session -Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Screen -Log Out Without Confirmation=none,none,Log Out Without Confirmation -LogOut=none,none,Log Out -Reboot=none,none,Reboot -Reboot Without Confirmation=none,none,Reboot Without Confirmation -Shut Down=none,none,Shut Down -_k_friendly_name=KWin +Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,显示注销屏幕 +Log Out Without Confirmation=none,,注销 (无需确认) +LogOut=none,,注销 +Reboot=none,,重启 +Reboot Without Confirmation=none,,重启 (无需确认) +Shut Down=none,,关机 +_k_friendly_name=Session Management [kwin] -Activate Window Demanding Attention=Meta+Ctrl+A,Meta+Ctrl+A,Activate Window Demanding Attention -Cycle Overview=none,none,Cycle through Overview and Grid View -Cycle Overview Opposite=none,none,Cycle through Grid View and Overview -Decrease Opacity=none,,Decrease Opacity of Active Window by 5% -Edit Tiles=Meta+T,Meta+T,Toggle Tiles Editor -Expose=Ctrl+F9,Ctrl+F9,Toggle Present Windows (Current desktop) -ExposeAll=Ctrl+F10\tLaunch (C),Ctrl+F10\tLaunch (C),Toggle Present Windows (All desktops) -ExposeClass=Ctrl+F7,Ctrl+F7,Toggle Present Windows (Window class) -ExposeClassCurrentDesktop=none,none,Toggle Present Windows (Window class on current desktop) -Grid View=Meta+G,Meta+G,Toggle Grid View -Increase Opacity=none,,Increase Opacity of Active Window by 5% -Kill Window=Meta+Ctrl+Esc,Meta+Ctrl+Esc,Kill Window +Activate Window Demanding Attention=Meta+Ctrl+A,Meta+Ctrl+A,激活请求注意的窗口 +Cycle Overview=none,none,循环显示桌面概览和网格视图 +Cycle Overview Opposite=none,none,循环显示网格视图和桌面概览 +Decrease Opacity=none,,降低活动窗口不透明度 5% +Edit Tiles=Meta+T,Meta+T,磁贴编辑器开关 +Expose=Ctrl+F9,Ctrl+F9,显示/隐藏窗口平铺 (当前桌面) +ExposeAll=Ctrl+F10\tLaunch (C),Ctrl+F10\tLaunch (C),显示/隐藏窗口平铺 (全部桌面) +ExposeClass=Ctrl+F7,Ctrl+F7,显示/隐藏窗口平铺 (窗口类) +ExposeClassCurrentDesktop=none,none,显示/隐藏窗口平铺 (当前桌面的窗口类) +Grid View=Meta+G,Meta+G,切换网格视图 +Increase Opacity=none,,提高活动窗口不透明度 5% +Kill Window=Meta+Ctrl+Esc,Meta+Ctrl+Esc,强制终止窗口 KrohnkiteBTreeLayout=Meta+X,none,Krohnkite: BTree Layout KrohnkiteColumnsLayout=none,none,Krohnkite: Columns Layout KrohnkiteDecrease=none,none,Krohnkite: Decrease @@ -99,210 +101,210 @@ KrohnkiteTileLayout=none,none,Krohnkite: Tile Layout KrohnkiteToggleFloat=Meta+Shift+F,none,Krohnkite: Toggle Float KrohnkiteTreeColumnLayout=none,none,Krohnkite: Tree Column Layout KrohnkitegrowWidth=Meta+Ctrl+I,none,Krohnkite: Grow Width -Move Tablet to Next Output=none,none,Move the tablet to the next output -MoveMouseToCenter=Meta+F6,Meta+F6,Move Mouse to Centre -MoveMouseToFocus=Meta+F5,Meta+F5,Move Mouse to Focus -MoveZoomDown=none,none,Move Zoomed Area Downwards -MoveZoomLeft=none,none,Move Zoomed Area to Left -MoveZoomRight=none,none,Move Zoomed Area to Right -MoveZoomUp=none,none,Move Zoomed Area Upwards -Overview=Meta+W\tMeta+Tab,Meta+W,Toggle Overview -Setup Window Shortcut=none,,Setup Window Shortcut -Show Desktop=Meta+D,Meta+D,Peek at Desktop -Switch One Desktop Down=Meta+Ctrl+Down,Meta+Ctrl+Down,Switch One Desktop Down -Switch One Desktop Up=Meta+Ctrl+Up,Meta+Ctrl+Up,Switch One Desktop Up -Switch One Desktop to the Left=Meta+Ctrl+Left,Meta+Ctrl+Left,Switch One Desktop to the Left -Switch One Desktop to the Right=Meta+Ctrl+Right,Meta+Ctrl+Right,Switch One Desktop to the Right -Switch Window Down=Meta+Alt+Down,Meta+Alt+Down,Switch to Window Below -Switch Window Left=Meta+Alt+Left,Meta+Alt+Left,Switch to Window to the Left -Switch Window Right=Meta+Alt+Right,Meta+Alt+Right,Switch to Window to the Right -Switch Window Up=Meta+Alt+Up,Meta+Alt+Up,Switch to Window Above -Switch to Desktop 1=Meta+1,Ctrl+F1,Switch to Desktop 1 -Switch to Desktop 10=none,,Switch to Desktop 10 -Switch to Desktop 11=none,,Switch to Desktop 11 -Switch to Desktop 12=none,,Switch to Desktop 12 -Switch to Desktop 13=none,,Switch to Desktop 13 -Switch to Desktop 14=none,,Switch to Desktop 14 -Switch to Desktop 15=none,,Switch to Desktop 15 -Switch to Desktop 16=none,,Switch to Desktop 16 -Switch to Desktop 17=none,,Switch to Desktop 17 -Switch to Desktop 18=none,,Switch to Desktop 18 -Switch to Desktop 19=none,,Switch to Desktop 19 -Switch to Desktop 2=Meta+2,Ctrl+F2,Switch to Desktop 2 -Switch to Desktop 20=none,,Switch to Desktop 20 -Switch to Desktop 3=Meta+3,Ctrl+F3,Switch to Desktop 3 -Switch to Desktop 4=Meta+4,Ctrl+F4,Switch to Desktop 4 -Switch to Desktop 5=Meta+5,,Switch to Desktop 5 -Switch to Desktop 6=Meta+6,,Switch to Desktop 6 -Switch to Desktop 7=Meta+7,,Switch to Desktop 7 -Switch to Desktop 8=Meta+8,,Switch to Desktop 8 -Switch to Desktop 9=Meta+9,,Switch to Desktop 9 -Switch to Next Desktop=none,,Switch to Next Desktop -Switch to Next Screen=none,,Switch to Next Screen -Switch to Previous Desktop=none,,Switch to Previous Desktop -Switch to Previous Screen=none,,Switch to Previous Screen -Switch to Screen 0=none,,Switch to Screen 0 -Switch to Screen 1=none,,Switch to Screen 1 -Switch to Screen 2=none,,Switch to Screen 2 -Switch to Screen 3=none,,Switch to Screen 3 -Switch to Screen 4=none,,Switch to Screen 4 -Switch to Screen 5=none,,Switch to Screen 5 -Switch to Screen 6=none,,Switch to Screen 6 -Switch to Screen 7=none,,Switch to Screen 7 -Switch to Screen Above=none,,Switch to Screen Above -Switch to Screen Below=none,,Switch to Screen Below -Switch to Screen to the Left=none,,Switch to Screen to the Left -Switch to Screen to the Right=none,,Switch to Screen to the Right -Toggle Night Color=none,none,Suspend/Resume Night Light -Toggle Window Raise/Lower=none,,Toggle Window Raise/Lower -Walk Through Windows=Alt+Tab,Alt+Tab,Walk Through Windows -Walk Through Windows (Reverse)=Alt+Shift+Tab,Alt+Shift+Tab,Walk Through Windows (Reverse) -Walk Through Windows Alternative=none,,Walk Through Windows Alternative -Walk Through Windows Alternative (Reverse)=none,,Walk Through Windows Alternative (Reverse) -Walk Through Windows of Current Application=Alt+`,Alt+`,Walk Through Windows of Current Application -Walk Through Windows of Current Application (Reverse)=Alt+~,Alt+~,Walk Through Windows of Current Application (Reverse) -Walk Through Windows of Current Application Alternative=none,,Walk Through Windows of Current Application Alternative -Walk Through Windows of Current Application Alternative (Reverse)=none,,Walk Through Windows of Current Application Alternative (Reverse) -Window Above Other Windows=none,,Keep Window Above Others -Window Below Other Windows=none,,Keep Window Below Others -Window Close=Alt+F4\tMeta+Q,Alt+F4,Close Window -Window Custom Quick Tile Bottom=none,,Custom Quick Tile Window to the Bottom -Window Custom Quick Tile Left=none,,Custom Quick Tile Window to the Left -Window Custom Quick Tile Right=none,,Custom Quick Tile Window to the Right -Window Custom Quick Tile Top=none,,Custom Quick Tile Window to the Top -Window Fullscreen=none,,Make Window Fullscreen -Window Grow Horizontal=none,,Expand Window Horizontally -Window Grow Vertical=none,,Expand Window Vertically -Window Lower=none,,Lower Window -Window Maximize=Meta+PgUp,Meta+PgUp,Maximise Window -Window Maximize Horizontal=none,,Maximise Window Horizontally -Window Maximize Vertical=none,,Maximise Window Vertically -Window Minimize=Meta+PgDown,Meta+PgDown,Minimise Window -Window Move=none,,Move Window -Window Move Center=none,,Move Window to the Centre -Window No Border=none,,Toggle Window Titlebar and Frame -Window On All Desktops=none,,Keep Window on All Desktops -Window One Desktop Down=Meta+Ctrl+Shift+Down,Meta+Ctrl+Shift+Down,Window One Desktop Down -Window One Desktop Up=Meta+Ctrl+Shift+Up,Meta+Ctrl+Shift+Up,Window One Desktop Up -Window One Desktop to the Left=Meta+Ctrl+Shift+Left,Meta+Ctrl+Shift+Left,Window One Desktop to the Left -Window One Desktop to the Right=Meta+Ctrl+Shift+Right,Meta+Ctrl+Shift+Right,Window One Desktop to the Right -Window One Screen Down=none,,Move Window One Screen Down -Window One Screen Up=none,,Move Window One Screen Up -Window One Screen to the Left=none,,Move Window One Screen to the Left -Window One Screen to the Right=none,,Move Window One Screen to the Right -Window Operations Menu=Alt+F3,Alt+F3,Window Operations Menu -Window Pack Down=none,,Move Window Down -Window Pack Left=none,,Move Window Left -Window Pack Right=none,,Move Window Right -Window Pack Up=none,,Move Window Up -Window Quick Tile Bottom=Meta+Down,Meta+Down,Quick Tile Window to the Bottom -Window Quick Tile Bottom Left=none,,Quick Tile Window to the Bottom Left -Window Quick Tile Bottom Right=none,,Quick Tile Window to the Bottom Right -Window Quick Tile Left=Meta+Left,Meta+Left,Quick Tile Window to the Left -Window Quick Tile Right=Meta+Right,Meta+Right,Quick Tile Window to the Right -Window Quick Tile Top=Meta+Up,Meta+Up,Quick Tile Window to the Top -Window Quick Tile Top Left=none,,Quick Tile Window to the Top Left -Window Quick Tile Top Right=none,,Quick Tile Window to the Top Right -Window Raise=none,,Raise Window -Window Resize=none,,Resize Window -Window Shade=none,,Shade Window -Window Shrink Horizontal=none,,Shrink Window Horizontally -Window Shrink Vertical=none,,Shrink Window Vertically -Window to Desktop 1=Meta+!,,Window to Desktop 1 -Window to Desktop 10=none,,Window to Desktop 10 -Window to Desktop 11=none,,Window to Desktop 11 -Window to Desktop 12=none,,Window to Desktop 12 -Window to Desktop 13=none,,Window to Desktop 13 -Window to Desktop 14=none,,Window to Desktop 14 -Window to Desktop 15=none,,Window to Desktop 15 -Window to Desktop 16=none,,Window to Desktop 16 -Window to Desktop 17=none,,Window to Desktop 17 -Window to Desktop 18=none,,Window to Desktop 18 -Window to Desktop 19=none,,Window to Desktop 19 -Window to Desktop 2=Meta+@,,Window to Desktop 2 -Window to Desktop 20=none,,Window to Desktop 20 -Window to Desktop 3=Meta+#,,Window to Desktop 3 -Window to Desktop 4=Meta+$,,Window to Desktop 4 -Window to Desktop 5=Meta+%,,Window to Desktop 5 -Window to Desktop 6=Meta+^,,Window to Desktop 6 -Window to Desktop 7=Meta+&,,Window to Desktop 7 -Window to Desktop 8=Meta+*,,Window to Desktop 8 -Window to Desktop 9=none,,Window to Desktop 9 -Window to Next Desktop=none,,Window to Next Desktop -Window to Next Screen=Meta+Shift+Right,Meta+Shift+Right,Move Window to Next Screen -Window to Previous Desktop=none,,Window to Previous Desktop -Window to Previous Screen=Meta+Shift+Left,Meta+Shift+Left,Move Window to Previous Screen -Window to Screen 0=none,,Move Window to Screen 0 -Window to Screen 1=none,,Move Window to Screen 1 -Window to Screen 2=none,,Move Window to Screen 2 -Window to Screen 3=none,,Move Window to Screen 3 -Window to Screen 4=none,,Move Window to Screen 4 -Window to Screen 5=none,,Move Window to Screen 5 -Window to Screen 6=none,,Move Window to Screen 6 -Window to Screen 7=none,,Move Window to Screen 7 +Move Tablet to Next Output=none,none,移动数位板到下一个输出设备 +MoveMouseToCenter=Meta+F6,Meta+F6,移动鼠标到中央 +MoveMouseToFocus=Meta+F5,Meta+F5,移动鼠标到焦点 +MoveZoomDown=none,none,将缩放区域向下移动 +MoveZoomLeft=none,none,将缩放区域向左移动 +MoveZoomRight=none,none,将缩放区域向右移动 +MoveZoomUp=none,none,将缩放区域向上移动 +Overview=Meta+W\tMeta+Tab,Meta+W,显示/隐藏桌面总览 +Setup Window Shortcut=none,,设置窗口快捷键 +Show Desktop=Meta+D,Meta+D,暂时显示桌面 +Switch One Desktop Down=Meta+Ctrl+Down,Meta+Ctrl+Down,切换到下方桌面 +Switch One Desktop Up=Meta+Ctrl+Up,Meta+Ctrl+Up,切换到上方桌面 +Switch One Desktop to the Left=Meta+Ctrl+Left,Meta+Ctrl+Left,切换到左侧桌面 +Switch One Desktop to the Right=Meta+Ctrl+Right,Meta+Ctrl+Right,切换到右侧桌面 +Switch Window Down=Meta+Alt+Down,Meta+Alt+Down,切换到下面的窗口 +Switch Window Left=Meta+Alt+Left,Meta+Alt+Left,切换到左侧的窗口 +Switch Window Right=Meta+Alt+Right,Meta+Alt+Right,切换到右侧的窗口 +Switch Window Up=Meta+Alt+Up,Meta+Alt+Up,切换到上面的窗口 +Switch to Desktop 1=Meta+1,Ctrl+F1,切换到桌面 1 +Switch to Desktop 10=none,,切换到桌面 10 +Switch to Desktop 11=none,,切换到桌面 11 +Switch to Desktop 12=none,,切换到桌面 12 +Switch to Desktop 13=none,,切换到桌面 13 +Switch to Desktop 14=none,,切换到桌面 14 +Switch to Desktop 15=none,,切换到桌面 15 +Switch to Desktop 16=none,,切换到桌面 16 +Switch to Desktop 17=none,,切换到桌面 17 +Switch to Desktop 18=none,,切换到桌面 18 +Switch to Desktop 19=none,,切换到桌面 19 +Switch to Desktop 2=Meta+2,Ctrl+F2,切换到桌面 2 +Switch to Desktop 20=none,,切换到桌面 20 +Switch to Desktop 3=Meta+3,Ctrl+F3,切换到桌面 3 +Switch to Desktop 4=Meta+4,Ctrl+F4,切换到桌面 4 +Switch to Desktop 5=Meta+5,,切换到桌面 5 +Switch to Desktop 6=Meta+6,,切换到桌面 6 +Switch to Desktop 7=Meta+7,,切换到桌面 7 +Switch to Desktop 8=Meta+8,,切换到桌面 8 +Switch to Desktop 9=Meta+9,,切换到桌面 9 +Switch to Next Desktop=none,,切换到下一桌面 +Switch to Next Screen=none,,切换到下一屏幕 +Switch to Previous Desktop=none,,切换到上一桌面 +Switch to Previous Screen=none,,切换到上一屏幕 +Switch to Screen 0=none,,切换到屏幕 0 +Switch to Screen 1=none,,切换到屏幕 1 +Switch to Screen 2=none,,切换到屏幕 2 +Switch to Screen 3=none,,切换到屏幕 3 +Switch to Screen 4=none,,切换到屏幕 4 +Switch to Screen 5=none,,切换到屏幕 5 +Switch to Screen 6=none,,切换到屏幕 6 +Switch to Screen 7=none,,切换到屏幕 7 +Switch to Screen Above=none,,切换到上方屏幕 +Switch to Screen Below=none,,切换到下方屏幕 +Switch to Screen to the Left=none,,切换到左侧屏幕 +Switch to Screen to the Right=none,,切换到右侧屏幕 +Toggle Night Color=none,none,暂停/继续夜间色温 +Toggle Window Raise/Lower=none,,提升/降低窗口 +Walk Through Windows=Alt+Tab,Alt+Tab,遍历窗口 +Walk Through Windows (Reverse)=Alt+Shift+Tab,Alt+Shift+Tab,遍历窗口 (反向) +Walk Through Windows Alternative=none,,遍历窗口交替 +Walk Through Windows Alternative (Reverse)=none,,遍历窗口交替 (反向) +Walk Through Windows of Current Application=Alt+`,Alt+`,遍历当前应用程序窗口 +Walk Through Windows of Current Application (Reverse)=Alt+~,Alt+~,遍历当前应用程序窗口 (反向) +Walk Through Windows of Current Application Alternative=none,,遍历当前应用程序窗口交替 +Walk Through Windows of Current Application Alternative (Reverse)=none,,遍历当前应用程序窗口交替 (反向) +Window Above Other Windows=none,,窗口置顶 +Window Below Other Windows=none,,窗口置底 +Window Close=Alt+F4\tMeta+Q,Alt+F4,关闭窗口 +Window Custom Quick Tile Bottom=none,,自定义快速铺放窗口到下方 +Window Custom Quick Tile Left=none,,自定义快速铺放窗口到左侧 +Window Custom Quick Tile Right=none,,自定义快速铺放窗口到右侧 +Window Custom Quick Tile Top=none,,自定义快速铺放窗口到上方 +Window Fullscreen=none,,全屏显示窗口 +Window Grow Horizontal=none,,水平扩展窗口 +Window Grow Vertical=none,,垂直扩展窗口 +Window Lower=none,,降低窗口 +Window Maximize=Meta+PgUp,Meta+PgUp,最大化窗口 +Window Maximize Horizontal=none,,水平最大化窗口 +Window Maximize Vertical=none,,垂直最大化窗口 +Window Minimize=Meta+PgDown,Meta+PgDown,最小化窗口 +Window Move=none,,移动窗口 +Window Move Center=none,,移动窗口到中央 +Window No Border=none,,显示/隐藏窗口标题栏和框架 +Window On All Desktops=none,,在所有桌面上显示窗口 +Window One Desktop Down=Meta+Ctrl+Shift+Down,Meta+Ctrl+Shift+Down,窗口下移一个桌面 +Window One Desktop Up=Meta+Ctrl+Shift+Up,Meta+Ctrl+Shift+Up,窗口上移一个桌面 +Window One Desktop to the Left=Meta+Ctrl+Shift+Left,Meta+Ctrl+Shift+Left,窗口左移一个桌面 +Window One Desktop to the Right=Meta+Ctrl+Shift+Right,Meta+Ctrl+Shift+Right,窗口右移一个桌面 +Window One Screen Down=none,,移动窗口到下方屏幕 +Window One Screen Up=none,,移动窗口到上方屏幕 +Window One Screen to the Left=none,,移动窗口到左侧屏幕 +Window One Screen to the Right=none,,移动窗口到右侧屏幕 +Window Operations Menu=Alt+F3,Alt+F3,窗口操作菜单 +Window Pack Down=none,,下移窗口 +Window Pack Left=none,,左移窗口 +Window Pack Right=none,,右移窗口 +Window Pack Up=none,,上移窗口 +Window Quick Tile Bottom=Meta+Down,Meta+Down,快速铺放窗口到下方 +Window Quick Tile Bottom Left=none,,快速铺放窗口到左下方 +Window Quick Tile Bottom Right=none,,快速铺放窗口到右下方 +Window Quick Tile Left=Meta+Left,Meta+Left,快速铺放窗口到左侧 +Window Quick Tile Right=Meta+Right,Meta+Right,快速铺放窗口到右侧 +Window Quick Tile Top=Meta+Up,Meta+Up,快速铺放窗口到上方 +Window Quick Tile Top Left=none,,快速铺放窗口到左上方 +Window Quick Tile Top Right=none,,快速铺放窗口到右上方 +Window Raise=none,,提升窗口 +Window Resize=none,,调整窗口大小 +Window Shade=none,,折叠窗口 +Window Shrink Horizontal=none,,水平缩小窗口 +Window Shrink Vertical=none,,垂直缩小窗口 +Window to Desktop 1=Meta+!,,窗口移动到桌面 1 +Window to Desktop 10=none,,窗口移动到桌面 10 +Window to Desktop 11=none,,窗口移动到桌面 11 +Window to Desktop 12=none,,窗口移动到桌面 12 +Window to Desktop 13=none,,窗口移动到桌面 13 +Window to Desktop 14=none,,窗口移动到桌面 14 +Window to Desktop 15=none,,窗口移动到桌面 15 +Window to Desktop 16=none,,窗口移动到桌面 16 +Window to Desktop 17=none,,窗口移动到桌面 17 +Window to Desktop 18=none,,窗口移动到桌面 18 +Window to Desktop 19=none,,窗口移动到桌面 19 +Window to Desktop 2=Meta+@,,窗口移动到桌面 2 +Window to Desktop 20=none,,窗口移动到桌面 20 +Window to Desktop 3=Meta+#,,窗口移动到桌面 3 +Window to Desktop 4=Meta+$,,窗口移动到桌面 4 +Window to Desktop 5=Meta+%,,窗口移动到桌面 5 +Window to Desktop 6=Meta+^,,窗口移动到桌面 6 +Window to Desktop 7=Meta+&,,窗口移动到桌面 7 +Window to Desktop 8=Meta+*,,窗口移动到桌面 8 +Window to Desktop 9=none,,窗口移动到桌面 9 +Window to Next Desktop=none,,窗口移动到下一桌面 +Window to Next Screen=Meta+Shift+Right,Meta+Shift+Right,移动窗口到下一屏幕 +Window to Previous Desktop=none,,窗口移动到上一桌面 +Window to Previous Screen=Meta+Shift+Left,Meta+Shift+Left,移动窗口到上一屏幕 +Window to Screen 0=none,,移动窗口到屏幕 0 +Window to Screen 1=none,,移动窗口到屏幕 1 +Window to Screen 2=none,,移动窗口到屏幕 2 +Window to Screen 3=none,,移动窗口到屏幕 3 +Window to Screen 4=none,,移动窗口到屏幕 4 +Window to Screen 5=none,,移动窗口到屏幕 5 +Window to Screen 6=none,,移动窗口到屏幕 6 +Window to Screen 7=none,,移动窗口到屏幕 7 _k_friendly_name=KWin -disableInputCapture=Meta+Shift+Esc,Meta+Shift+Esc,Disable Active Input Capture -view_actual_size=Meta+0,Meta+0,Zoom to Actual Size -view_zoom_in=Meta++\tMeta+=,Meta++\tMeta+=,Zoom In -view_zoom_out=Meta+-,Meta+-,Zoom Out +disableInputCapture=Meta+Shift+Esc,Meta+Shift+Esc,禁用活动输入捕获 +view_actual_size=Meta+0,Meta+0,缩放为实际大小(A) +view_zoom_in=Meta++\tMeta+=,Meta++\tMeta+=,放大(I) +view_zoom_out=Meta+-,Meta+-,缩小(O) [mediacontrol] -_k_friendly_name=Media Controller -mediavolumedown=none,none,Media volume down -mediavolumeup=none,none,Media volume up -nextmedia=Media Next,Media Next,Media playback next -pausemedia=Media Pause,Media Pause,Pause media playback -playmedia=none,none,Play media playback -playpausemedia=Media Play,Media Play,Play/Pause media playback -previousmedia=Media Previous,Media Previous,Media playback previous -stopmedia=Media Stop,Media Stop,Stop media playback +_k_friendly_name=媒体控制器 +mediavolumedown=none,,媒体音量降低 +mediavolumeup=none,,媒体音量提高 +nextmedia=Media Next,Media Next,播放下一首媒体 +pausemedia=Media Pause,Media Pause,暂停媒体播放 +playmedia=none,,播放媒体 +playpausemedia=Media Play,Media Play,播放/暂停媒体播放 +previousmedia=Media Previous,Media Previous,播放上一首媒体 +stopmedia=Media Stop,Media Stop,停止媒体播放 [org_kde_powerdevil] -Decrease Keyboard Brightness=Keyboard Brightness Down,Keyboard Brightness Down,Decrease Keyboard Brightness -Decrease Screen Brightness=Monitor Brightness Down,Monitor Brightness Down,Decrease Screen Brightness -Decrease Screen Brightness Small=Shift+Monitor Brightness Down,Shift+Monitor Brightness Down,Decrease Screen Brightness by 1% -Hibernate=Hibernate,Hibernate,Hibernate -Increase Keyboard Brightness=Keyboard Brightness Up,Keyboard Brightness Up,Increase Keyboard Brightness -Increase Screen Brightness=Monitor Brightness Up,Monitor Brightness Up,Increase Screen Brightness -Increase Screen Brightness Small=Shift+Monitor Brightness Up,Shift+Monitor Brightness Up,Increase Screen Brightness by 1% -PowerDown=Power Down,Power Down,Power Down -PowerOff=Power Off,Power Off,Power Off -Sleep=Sleep,Sleep,Suspend -Toggle Keyboard Backlight=Keyboard Light On/Off,Keyboard Light On/Off,Toggle Keyboard Backlight -Turn Off Screen=none,none,Turn Off Screen -_k_friendly_name=Power Management -powerProfile=Battery\tMeta+B,Battery\tMeta+B,Switch Power Profile +Decrease Keyboard Brightness=Keyboard Brightness Down,Keyboard Brightness Down,降低键盘亮度 +Decrease Screen Brightness=Monitor Brightness Down,Monitor Brightness Down,降低屏幕亮度 +Decrease Screen Brightness Small=Shift+Monitor Brightness Down,Shift+Monitor Brightness Down,降低屏幕亮度 1% +Hibernate=Hibernate,Hibernate,休眠 +Increase Keyboard Brightness=Keyboard Brightness Up,Keyboard Brightness Up,提高键盘亮度 +Increase Screen Brightness=Monitor Brightness Up,Monitor Brightness Up,提高屏幕亮度 +Increase Screen Brightness Small=Shift+Monitor Brightness Up,Shift+Monitor Brightness Up,提高屏幕亮度 1% +PowerDown=Power Down,Power Down,断电 +PowerOff=Power Off,Power Off,关机 +Sleep=Sleep,Sleep,挂起 +Toggle Keyboard Backlight=Keyboard Light On/Off,Keyboard Light On/Off,开关键盘背光 +Turn Off Screen=none,none,关闭屏幕 +_k_friendly_name=电源管理 +powerProfile=Battery\tMeta+B,Battery\tMeta+B,切换电源管理方案 [plasmashell] _k_friendly_name=plasmashell -activate application launcher=Meta\tAlt+F1,Meta\tAlt+F1,Activate Application Launcher -activate task manager entry 1=none,Meta+1,Activate Task Manager Entry 1 -activate task manager entry 10=none,none,Activate Task Manager Entry 10 -activate task manager entry 2=none,Meta+2,Activate Task Manager Entry 2 -activate task manager entry 3=none,Meta+3,Activate Task Manager Entry 3 -activate task manager entry 4=none,Meta+4,Activate Task Manager Entry 4 -activate task manager entry 5=none,Meta+5,Activate Task Manager Entry 5 -activate task manager entry 6=none,Meta+6,Activate Task Manager Entry 6 -activate task manager entry 7=none,Meta+7,Activate Task Manager Entry 7 -activate task manager entry 8=none,Meta+8,Activate Task Manager Entry 8 -activate task manager entry 9=none,Meta+9,Activate Task Manager Entry 9 +activate application launcher=Meta\tAlt+F1,Meta\tAlt+F1,激活应用程序启动器 +activate task manager entry 1=none,Meta+1,激活任务管理器条目 1 +activate task manager entry 10=none,,激活任务管理器条目 10 +activate task manager entry 2=none,Meta+2,激活任务管理器条目 2 +activate task manager entry 3=none,Meta+3,激活任务管理器条目 3 +activate task manager entry 4=none,Meta+4,激活任务管理器条目 4 +activate task manager entry 5=none,Meta+5,激活任务管理器条目 5 +activate task manager entry 6=none,Meta+6,激活任务管理器条目 6 +activate task manager entry 7=none,Meta+7,激活任务管理器条目 7 +activate task manager entry 8=none,Meta+8,激活任务管理器条目 8 +activate task manager entry 9=none,Meta+9,激活任务管理器条目 9 activate widget 3=none,none,Activate Application Launcher Widget -clear-history=none,none,Clear Clipboard History -clipboard_action=Meta+Ctrl+X,Meta+Ctrl+X,Automatic Action Popup Menu -cycle-panels=Meta+Alt+P,Meta+Alt+P,Move keyboard focus between panels -cycleNextAction=none,none,Next History Item -cyclePrevAction=none,none,Previous History Item -manage activities=none,Meta+Q,Show Activity Switcher -next activity=Meta+A,none,Walk through activities -previous activity=Meta+Shift+A,none,Walk through activities (Reverse) -repeat_action=none,none,Manually Invoke Action on Current Clipboard -show dashboard=Ctrl+F12,Ctrl+F12,Show Desktop -show-barcode=none,none,Show Barcode… -show-on-mouse-pos=Meta+V,Meta+V,Show Clipboard Items at Mouse Position -stop current activity=Meta+S,Meta+S,Stop Current Activity -switch to next activity=none,none,Switch to Next Activity -switch to previous activity=none,none,Switch to Previous Activity -toggle do not disturb=none,none,Toggle do not disturb +clear-history=none,,清除剪贴板历史(L) +clipboard_action=Meta+Ctrl+X,Meta+Ctrl+X,自动弹出操作菜单 +cycle-panels=Meta+Alt+P,Meta+Alt+P,在面板之间移动键盘焦点 +cycleNextAction=none,,下一条历史记录 +cyclePrevAction=none,,上一条历史记录 +manage activities=none,Meta+Q,显示活动切换器 +next activity=Meta+A,none,遍历活动 +previous activity=Meta+Shift+A,none,遍历活动 (反向) +repeat_action=none,,在当前剪贴板上手动执行操作 +show dashboard=Ctrl+F12,Ctrl+F12,显示桌面 +show-barcode=none,,显示条形码(S)… +show-on-mouse-pos=Meta+V,Meta+V,在鼠标位置显示剪贴板项目 +stop current activity=Meta+S,Meta+S,停止当前活动 +switch to next activity=none,,切换到下一个活动 +switch to previous activity=none,,切换到上一个活动 +toggle do not disturb=none,,切换勿扰模式 [services][kitty.desktop] _launch=Meta+R @@ -314,8 +316,7 @@ _launch=Meta+F _launch=none [services][org.kde.krunner.desktop] -RunClipboard=Alt+Shift+F2\tAlt+Space -_launch=Alt+F2\tSearch +_launch=Alt+F2\tSearch\tAlt+Space [services][org.kde.kscreen.desktop] ShowOSD=Display @@ -336,5 +337,5 @@ Toggle touch tool=Meta+Ctrl+T,Meta+Ctrl+T,Enable/Disable the Touch Tool _k_friendly_name=Wacom Tablet [yakuake] -_k_friendly_name=Yakuake -toggle-window-state=Meta+`,F12,Open/Retract Yakuake +_k_friendly_name=Yakuake 下拉式终端 +toggle-window-state=Meta+`,F12,展开/折叠 Yakuake 窗口 diff --git a/platforms/linux/systemd/user/emacs-daemon.service b/platforms/linux/systemd/user/emacs-daemon.service new file mode 100644 index 0000000..c9bdc3f --- /dev/null +++ b/platforms/linux/systemd/user/emacs-daemon.service @@ -0,0 +1,13 @@ +[Unit] +Description=Emacs text editor +Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/ + +[Service] +Type=forking +ExecStart=/usr/bin/emacs --daemon +ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)" +Environment=SSH_AUTH_SOCK=%t/keyring/ssh +Restart=on-failure + +[Install] +WantedBy=default.target diff --git a/platforms/linux/systemd/user/keyd-app.service b/platforms/linux/systemd/user/keyd-app.service new file mode 100644 index 0000000..f20c7c0 --- /dev/null +++ b/platforms/linux/systemd/user/keyd-app.service @@ -0,0 +1,13 @@ +[Unit] +Description=Keyd Application Specific Mapping +Documentation=man:keyd-application-mapper(1) https://github.com/rvaiya/keyd + +[Service] +Type=forking +ExecStart=/usr/bin/keyd-application-mapper -d +ExecStop=pkill keyd-applicatio +Restart=on-failure + +[Install] +WantedBy=default.target + diff --git a/platforms/wsl/systemd/symlink-wayland-socket.service b/platforms/wsl/systemd/user/symlink-wayland-socket.service similarity index 100% rename from platforms/wsl/systemd/symlink-wayland-socket.service rename to platforms/wsl/systemd/user/symlink-wayland-socket.service diff --git a/tools/bash/bashrc b/tools/bash/bashrc index 4f79d68..8ec8bbd 100644 --- a/tools/bash/bashrc +++ b/tools/bash/bashrc @@ -5,6 +5,8 @@ # ln -sf $DOTFILES/tools/bash/bashrc ~/.bashrc export DOTFILES=$HOME/.dotfiles +# Force to choose English font name +export LC_CTYPE=en_GB.UTF-8 if [ -n "$WSL_DISTRO_NAME" ]; then alias clip="clip.exe" diff --git a/tools/doom/config.el b/tools/doom/config.el index f6d71f8..8bf26d8 100644 --- a/tools/doom/config.el +++ b/tools/doom/config.el @@ -22,20 +22,20 @@ ;; accept. For example: ;; ;; https://emacs-china.org/t/doom-emacs/23513/13 -(setq doom-font (font-spec :family "Iosevka Nerd Font Propo" :size 14) +(setq doom-font (font-spec :family "Sarasa Mono SC Nerd Font" :size 14) doom-serif-font doom-font - doom-symbol-font (font-spec :family "LXGW WenKai Mono") - doom-variable-pitch-font (font-spec :family "LXGW WenKai Mono" :weight 'extra-bold)) + doom-symbol-font (font-spec :family "Sarasa Mono SC Nerd Font") + doom-variable-pitch-font (font-spec :family "Sarasa Mono SC Nerd Font" :weight 'extra-bold)) ;; 如果不把这玩意设置为 nil, 会默认去用 fontset-default 来展示, 配置无效 (setq use-default-font-for-symbols nil) ;; Doom 的字体加载顺序问题, 如果不设定这个 hook, 配置会被覆盖失效 -(add-hook! 'after-setting-font-hook - (set-fontset-font t 'latin (font-spec :family "Iosevka Nerd Font Propo")) - (set-fontset-font t 'symbol (font-spec :family "Symbola")) - (set-fontset-font t 'mathematical (font-spec :family "Symbola")) - (set-fontset-font t 'emoji (font-spec :family "Symbola"))) +;;(add-hook! 'after-setting-font-hook +;; (set-fontset-font t 'latin (font-spec :family "Iosevka Nerd Font Propo")) +;; (set-fontset-font t 'symbol (font-spec :family "Symbola")) +;; (set-fontset-font t 'mathematical (font-spec :family "Symbola")) +;; (set-fontset-font t 'emoji (font-spec :family "Symbola"))) ;; (dolist (charset '(kana han cjk-misc bopomofo)) ;; (set-fontset-font t charset (font-spec :family "LXGW WenKai Mono" :size 16))) diff --git a/tools/kitty/kitty.conf b/tools/kitty/kitty.conf index 4acdec9..e7b86d0 100644 --- a/tools/kitty/kitty.conf +++ b/tools/kitty/kitty.conf @@ -3,7 +3,7 @@ # Fonts {{{ # Family -font_family family="Iosevka Nerd Font" +font_family family="Sarasa Term SC Nerd Font" bold_font auto italic_font auto bold_italic_font auto @@ -77,3 +77,11 @@ map ctrl+q>shift+I kitten window.py -resize right map cmd+enter toggle_layout stack map ctrl+shift+enter toggle_layout stack # }}} + + +# BEGIN_KITTY_FONTS +font_family family="Sarasa Term SC Nerd Font" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS diff --git a/tools/nvim/lua/config/servers.lua b/tools/nvim/lua/config/servers.lua index 3508981..a45c8c1 100644 --- a/tools/nvim/lua/config/servers.lua +++ b/tools/nvim/lua/config/servers.lua @@ -6,30 +6,28 @@ local M = {} -- Use :Mason to list all available servers M.servers = { "ast_grep", - "bashls", -- Bash - "clangd", -- C/C++ - "cssls", -- CSS - "denols", -- Deno - -- "cmake", -- CMake - "eslint", -- JavaScript - "gopls", -- Go - "hls", -- Haskell - "html", -- HTML - "jsonls", -- JSON - "lua_ls", -- Lua + "bashls", -- Bash + "clangd", -- C/C++ + "cssls", -- CSS + "denols", -- Deno + "eslint", -- JavaScript + "gopls", -- Go + "html", -- HTML + "jsonls", -- JSON + "lua_ls", -- Lua "markdown_oxide", -- Markdown - "omnisharp", -- C# & F# - "powershell_es", -- PowerShell - "pyright", -- Python - "rust_analyzer", -- Rust - "svelte", -- Svelte - "svlangserver", -- SystemVerilog - "tailwindcss", -- TailwindCSS - "taplo", -- TOML - "ts_ls", -- TypeScript - "vimls", -- vimscript - "yamlls", -- YAML - "beancount", -- Beancount + "omnisharp", -- C# & F# + "powershell_es", -- PowerShell + "pyright", -- Python + "rust_analyzer", -- Rust + "svelte", -- Svelte + "svlangserver", -- SystemVerilog + "tailwindcss", -- TailwindCSS + "taplo", -- TOML + "ts_ls", -- TypeScript + "vimls", -- vimscript + "yamlls", -- YAML + "beancount", -- Beancount } -- Configuration for each server defines here diff --git a/tools/wezterm/appearance.lua b/tools/wezterm/appearance.lua index 9b32511..23d2f7a 100644 --- a/tools/wezterm/appearance.lua +++ b/tools/wezterm/appearance.lua @@ -25,7 +25,7 @@ end return function(config) config.max_fps = 120 config.font = wezterm.font({ - family = "JetBrainsMono Nerd Font", + family = "Sarasa Term SC Nerd Font", }) config.color_scheme = scheme_for_appearance(get_appearance()) config.font_size = 12.0