From e440b85d84917b8eac602a624707022af58818b7 Mon Sep 17 00:00:00 2001 From: js0ny Date: Sun, 10 Nov 2024 15:12:09 +0000 Subject: [PATCH] Update --- .config/starship/starship.toml | 199 +++++++++++++++++++++++++++++++++ mac/mac_setup.sh | 9 +- vscode/readme.md | 5 - vscode/vscode.vimrc | 8 +- win/setup_win.ps1 | 85 ++++++++------ 5 files changed, 256 insertions(+), 50 deletions(-) create mode 100644 .config/starship/starship.toml delete mode 100644 vscode/readme.md diff --git a/.config/starship/starship.toml b/.config/starship/starship.toml new file mode 100644 index 0000000..2694029 --- /dev/null +++ b/.config/starship/starship.toml @@ -0,0 +1,199 @@ +# starship.toml +# ~/.config/starship.toml +format = '''$os$time $username @ $hostname $directory $all$character''' + +add_newline = true + +[time] +disabled = false +format = '[\[$time\]](purple)' +time_format = '%H:%M' + +[username] +format = '[$user](bold)' +show_always = true + +[hostname] +ssh_only = false +ssh_symbol = '󰞉 ' + +[character] +success_symbol = "[PS > ](bold green)" +error_symbol = "[PS > ](bold red)" +vimcmd_symbol = "[Vi > ](bold green)" + +[directory] +truncation_length = 2 +truncate_to_repo = true +read_only = " 󰌾" +style ="bold cyan" +truncation_symbol = ".../" + +[aws] +symbol = " " + +[buf] +symbol = " " + +[c] +symbol = " " + +[conda] +symbol = " " + +[crystal] +symbol = " " + +[dart] +symbol = " " + + +[docker_context] +symbol = " " + +[elixir] +symbol = " " + +[elm] +symbol = " " + +[fennel] +symbol = " " + +[fossil_branch] +symbol = " " + +[git_branch] +symbol = " " + +[git_commit] +tag_symbol = '  ' + +[golang] +symbol = " " + +[guix_shell] +symbol = " " + +[haskell] +symbol = " " + +[haxe] +symbol = " " + +[hg_branch] +symbol = " " + +[java] +symbol = " " + +[julia] +symbol = " " + +[kotlin] +symbol = " " + +[lua] +symbol = " " + +[memory_usage] +symbol = "󰍛 " + +[meson] +symbol = "󰔷 " + +[nim] +symbol = "󰆥 " + +[nix_shell] +symbol = " " + +[nodejs] +symbol = " " + +[ocaml] +symbol = " " + +[os] +disabled = false + +[os.symbols] +Alpaquita = " " +Alpine = " " +AlmaLinux = " " +Amazon = " " +Android = " " +Arch = " " +Artix = " " +CentOS = " " +Debian = " " +DragonFly = " " +Emscripten = " " +EndeavourOS = " " +Fedora = " " +FreeBSD = " " +Garuda = "󰛓 " +Gentoo = " " +HardenedBSD = "󰞌 " +Illumos = "󰈸 " +Kali = " " +Linux = " " +Mabox = " " +Macos = " " +Manjaro = " " +Mariner = " " +MidnightBSD = " " +Mint = " " +NetBSD = " " +NixOS = " " +OpenBSD = "󰈺 " +openSUSE = " " +OracleLinux = "󰌷 " +Pop = " " +Raspbian = " " +Redhat = " " +RedHatEnterprise = " " +RockyLinux = " " +Redox = "󰀘 " +Solus = "󰠳 " +SUSE = " " +Ubuntu = " " +Unknown = " " +Void = " " +Windows = "󰍲 " + +[package] +symbol = "󰏗 " + +[perl] +symbol = " " + +[php] +symbol = " " + +[pijul_channel] +symbol = " " + +[python] +symbol = " " + +[rlang] +symbol = "󰟔 " + +[ruby] +symbol = " " + +[rust] +symbol = "󱘗 " + +[scala] +symbol = " " + +[swift] +symbol = " " + +[zig] +symbol = " " + +[gradle] +symbol = " " diff --git a/mac/mac_setup.sh b/mac/mac_setup.sh index 450e2c7..246f0c1 100644 --- a/mac/mac_setup.sh +++ b/mac/mac_setup.sh @@ -99,7 +99,7 @@ brew install mas # Mac App Store CLI # File Management brew install --cask keka # Archiver -brew install --cask google-drive # Cloud Storage +brew install --cask google-drive # `sudo` # Cloud Storage # CLI brew install --formula cfiles @@ -129,6 +129,7 @@ brew install --cask rider # Programming Languages brew install --formula lua brew install --formula luajit +brew install --formula luarocks brew install --formula node brew install --formula dotnet brew install --formula go @@ -136,7 +137,7 @@ brew install --formula go brew install --cask miniconda # PowerShells -brew install --cask powershell +brew install --cask powershell # `sudo` # Launchers brew install --cask raycast @@ -147,7 +148,7 @@ brew install --cask iterm2 # IME -brew install --cask squirrel +brew install --cask squirrel # `sudo` # PKM brew install --cask obsidian @@ -162,7 +163,7 @@ brew install --cask iina brew install --cask keyguard # Engineering -brew install --cask ltspice +brew install --cask ltspice # `sudo` # Office brew install --cask mactex-no-gui diff --git a/vscode/readme.md b/vscode/readme.md deleted file mode 100644 index 9dd4770..0000000 --- a/vscode/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# VSCode Configs - -## Navigator - -- [HyperSnips](./hsnips/readme.md) \ No newline at end of file diff --git a/vscode/vscode.vimrc b/vscode/vscode.vimrc index 6d0821b..190b297 100644 --- a/vscode/vscode.vimrc +++ b/vscode/vscode.vimrc @@ -1,12 +1,12 @@ -" $XDG_CONFIG_HOME/vscode/vscode.vimrc +" ~/.config/vscode/vscode.vimrc " New-Item -ItemType SymbolicLink -Path ~\.config\vscode\vscode.vimrc -Target ~\.dotfiles\vscode\vscode.vimrc " ln -sf $DOTFILES/vscode/vscode.vimrc $XDG_CONFIG_HOME/vscode/vscode.vimrc " And go to vscode vim setting: "vim.vimrc.path": "$HOME/.config/vscode/vscode.vimrc", -" Word wrap -noremap n gj -noremap e gk +" Arrow remap +noremap n j +noremap e k noremap i l " Similar position to i diff --git a/win/setup_win.ps1 b/win/setup_win.ps1 index 133929a..1e61620 100644 --- a/win/setup_win.ps1 +++ b/win/setup_win.ps1 @@ -24,7 +24,8 @@ New-Item -ItemType SymbolicLink -Path "~\.npmrc" -Target "$DOTFILES\.npmrc" New-Item -ItemType SymbolicLink -Path "~\.pip.conf" -Target "$DOTFILES\.pip.conf" New-Item -ItemType SymbolicLink -Path "~\.wslconfig" -Target "$DOTFILES\win\.wslconfig" New-Item -ItemType SymbolicLink -Path "~\.vscode.vimrc" -Target "$DOTFILES\vscode\vscode.vimrc" -Get-ChildItem -Force -Filter .* | ForEach-Object { $_.Attributes += "Hidden" } # Hide dotfiles +# Hide dotfiles +Get-ChildItem -Force -Filter .* | ForEach-Object { $_.Attributes += "Hidden" } # Windows Terminal if (Get-Command wt -ErrorAction SilentlyContinue) { @@ -42,57 +43,62 @@ Get-AppxPackage *Map* | Remove-AppxPackage # 地圖 # Get-AppxPackage *clipchamp* | Remove-AppxPackage # 其實這個還行 # Added Packages -scoop add bucket nerd-fonts -scoop add bucket extras +scoop bucket add main +scoop bucket add nerd-fonts +scoop bucket add extras +scoop bucket add nonportable # CLI Tools # winget install -e --id GnuWin32.Grep # Use Select-String instead -winget install -e --id GnuWin32.Make +scoop install main/make # winget install -e --id GnuWin32.Which # Use Get-Command instead -winget install -e --id junegunn.fzf -winget install -e --id BurntSushi.ripgrep.MSVC -winget install -e --id JernejSimoncic.Wget -winget install -e --id GNU.Wget2 +scoop install main/fzf +scoop install main/ripgrep +scoop install main/wget +scoop install main/wget2 +scoop install main/cmake # File Management -winget install -e --id voidtools.Everything -winget install -e --id 7zip.7zip -winget install -e --id Bandisoft.Bandizip -winget install -e --id JohnMacFarlane.Pandoc -winget install -e --id SumatraPDF.SumatraPDF +scoop install extras/everything +scoop install main/7zip +scoop install extras/bandizip +scoop install main/pandoc +scoop install extras/sumatrapdf winget install -e --id Google.GoogleDrive # System Enhancements -winget install -e --id Rem0o.FanControl -winget install -e --id Microsoft.PowerToys -winget install -e --id Guru3D.Afterburner +scoop install extras/fancontrol +scoop install extras/powertoys +scoop install extras/msiafterburner winget install -e --id Yuanli.uTools -winget install -e --id GeekUninstaller.GeekUninstaller -winget install -e --id Flow-Launcher.Flow-Launcher +scoop install extras/geekuninstaller +scoop install extras/flow-launcher # winget install -e --id AutoHotkey.AutoHotkey -winget install -e --id 9PLQFDG8HH9D --source msstore # AutoHotkey v2 Store Edition -winget install -e --id Mactype.Mactype -winget install -e --id Eassos.DiskGenius +scoop install extras/autohotkey +scoop install nonportable/mactype-np +scoop install extras/diskgenius # winget install -e --id Nilesoft.Shell # scoop install umi-ocr-paddle # Editor -winget install -e --id vim.vim -winget install -e --id Neovim.Neovim -winget install -e --id VSCodium.VSCodium -winget install -e --id Microsoft.VisualStudioCode -winget install -e --id Neovide.Neovide +scoop install main/vim +scoop install main/neovim +scoop install extras/vscodium +scoop install extras/vscode +scoop install extras/neovide + # Security -winget install -e --id Bitwarden.Bitwarden +scoop install main/bitwarden-cli +scoop install extras/bitwarden # PKM -winget install -e --id Obsidian.Obsidian +scoop install extras/obsidian winget install -e --id 9P7HPMXP73K4 # Siyuan -winget install -e --id appmakes.Typora -winget install -e --id DigitalScholar.Zotero -winget install -e --id Anki.Anki -winget install -e --id Notion.Notion +scoop install extras/typora +scoop install extras/zotero +scoop install extras/anki +# winget install -e --id Notion.Notion # Browser # Use Microsoft Edge directly @@ -100,15 +106,18 @@ winget install -e --id Notion.Notion # winget install -e --id Mozilla.Firefox.Nightly # Not working # Programming Languages -winget install -e --id Python.Python.3.12 +winget install -e --id Python.Python.3.13 winget install -e --id Anaconda.Miniconda3 winget install -e --id OpenJS.NodeJS winget install -e --id Rustlang.Rustup winget install -e --id Microsoft.DotNet.SDK.8 -# Dev/IDE -winget install -e --id Docker.DockerDesktop -winget install -e --id JesseDuffield.lazygit +# Dev +scoop install extras/docker +scoop install extras/lazygit + +# IDE +scoop install extras/rider # Gaming winget install -e --id Valve.Steam @@ -117,7 +126,9 @@ winget install -e --id Valve.Steam winget install -e --id Rime.Weasel # 小狼毫 Rime # Misc -winget install --id 9N5LW3JBCXKF --source msstore # MSIX Packaging Tool +winget install -e --id 9N5LW3JBCXKF --source msstore # MSIX Packaging Tool +winget install -e --id 9PKTQ5699M62 --source msstore # iCloud +winget install -e --id RazerInc.RazerInstaller # Razer Synapse # Social winget install -e --id 9N97ZCKPD60Q --source msstore # Unigram (Telegram client)