From fd0022fd5c1dd0c5d515f7e815905199ecb89559 Mon Sep 17 00:00:00 2001 From: lostecho <752549025@qq.com> Date: Wed, 19 Jul 2023 10:42:00 +0800 Subject: [PATCH] update --- config.yaml | 8 +- dotfiles/config/hypr/hyprland.conf | 29 ++-- dotfiles/software | 59 -------- dotfiles/software.md | 219 +++++++++++++++++++++++++++++ dotfiles/zshrc | 3 +- 5 files changed, 240 insertions(+), 78 deletions(-) delete mode 100644 dotfiles/software create mode 100644 dotfiles/software.md diff --git a/config.yaml b/config.yaml index d1997e2..84c0cc2 100644 --- a/config.yaml +++ b/config.yaml @@ -26,12 +26,12 @@ dotfiles: d_swaylock: src: config/swaylock dst: ~/.config/swaylock - f_software: - src: software - dst: ~/.software d_mako: src: config/mako dst: ~/.config/mako + f_software.md: + src: software.md + dst: ~/software.md profiles: lostecho-atlas: dotfiles: @@ -41,5 +41,5 @@ profiles: - d_wofi - d_kitty - d_swaylock - - f_software - d_mako + - f_software.md diff --git a/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf index adf4f03..0bfb699 100644 --- a/dotfiles/config/hypr/hyprland.conf +++ b/dotfiles/config/hypr/hyprland.conf @@ -89,7 +89,7 @@ decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more active_opacity=1 - inactive_opacity=0.95 + inactive_opacity=0.9 fullscreen_opacity=1.0 rounding = 5 @@ -181,15 +181,17 @@ windowrulev2 = tile, title:^(bandu_flutter)$ # Example windowrule v2 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +windowrulev2 = opacity 0.8 0.8, class:^(Code)$ windowrulev2 = opacity 0.8 0.9, class:^(kitty)$ -windowrulev2 = opacity 0.8 0.8, class:^(VSCodium)$ +windowrulev2 = opacity 0.8 0.8, class:^(thunar)$ windowrulev2 = opacity 0.8 1.0, class:^(obsidian)$ -windowrulev2 = opacity 1.0 1.0, class:^(Google-chrome)$ -windowrulev2 = animation popin, class:^(Google-chrome)$ -windowrulev2 = animation slide, class:^(wofi)$ +windowrulev2 = opacity 0.8 0.8, class:^(org.kde.kate)$ +windowrulev2 = opacity 1.0 1.0, class:^(microsoft-edge)$ +windowrulev2 = animation popin, class:^(microsoft-edge)$ windowrulev2 = tile, title:^(Cron)$ windowrulev2 = tile, title:^(Cubox)$ windowrulev2 = tile, title:^(少数派)$ +windowrulev2 = tile, title:^(Spotify)$ windowrulev2 = tile, title:^(微信读书)$ windowrulev2 = tile, title:^(bandu_flutter)$ windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ @@ -200,13 +202,13 @@ $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, F1, exec, ~/.config/hypr/scripts/gamemode.sh bind = $mainMod, A, exec, anytype -bind = $mainMod SHIFT, C, exec, google-chrome-stable --profile-directory=Default --app-id=ciphmlapnadpablfaagijhhenhancbbb +bind = $mainMod SHIFT, C, exec, microsoft-edge-stable --profile-directory=Default --app-id=ciphmlapnadpablfaagijhhenhancbbb --app-url=https://calendar.cron.com/ bind = $mainMod, E, exec, thunar bind = $mainMod SHIFT, E, exec, dolphin bind = $mainMod CTRL, E, exec, kitty ranger bind = $mainMod, G, exec, microsoft-edge-stable bind = $mainMod SHIFT, G, exec, google-chrome-stable -bind = $mainMod CTRL, G, exec, github-desktop +bind = $mainMod CTRL, G, exec, github-desktop bind = $mainMod, I, exec, cd ~/.loacl/share/applications; gtk-launch jetbrains-idea.desktop bind = $mainMod, J, exec, pkill jupyter-lab; jupyter-lab bind = $mainMod SHIFT, J, exec, pkill jupyter-lab; cd ~/Documents/the-craft-of-selfteaching; jupyter-lab @@ -214,26 +216,25 @@ bind = $mainMod, K, exec, kate bind = $mainMod, L, exec, logseq bind = $mainMod SHIFT, L, exec, swaylock bind = $mainMod, M, exec, wlogout --protocol layer-shell -bind = $mainMod CTRL, M, exec, motrix -bind = $mainMod, N, exec, notion-app-enhanced +bind = $mainMod CTRL, M, exec, motrixmicrosoft-edge --profile-directory=Default --app-id=bicgkabnllfcnajoaobgkmpjchldbdco --app-url=https://www.notion.so/000-Inbox-ed0cb9b1899648ea8007e860698d251c bind = $mainMod SHIFT, N, exec, kitty nvim bind = $mainMod, O, exec, obsidian bind = $mainMod SHIFT, O, exec, okular bind = $mainMod, Q, exec, kitty -bind = , XF86Tools , exec, kitty bind = $mainMod SHIFT, Q, exec, linuxqq bind = $mainMod, P, exec, cd ~/.loacl/share/applications; gtk-launch jetbrains-pycharm.desktop bind = $mainMod SHIFT, P, exec, pavucontrol bind = $mainMod, R, exec, pkill wofi; wofi --show drun +bind = $mainMod SHIFT, R, exec, pkill wofi; wofi -c ~/.config/wofi/config-lmenu)' bind = $mainMod, S, exec, spotify -bind = $mainMod SHIFT, S, exec, google-chrome-stable --profile-directory=Default --app-id=idhlnkbfpmbggpopjbaemghibaoobglb +#bind = $mainMod, S, exec, microsoft-edge-stable --profile-directory=Default --app-id=pjibgclleladliembfgfagdaldikeohf "--app-url=https://open.spotify.com/?utm_source=pwa_install" +bind = $mainMod SHIFT, S, exec, microsoft-edge-stable --profile-directory=Default --app-id=idhlnkbfpmbggpopjbaemghibaoobglb "--app-url=https://pwa.sspai.com/?pwa=1" bind = $mainMod, T, exec, typora bind = $mainMod, V, exec, code bind = $mainMod SHIFT, V, exec, vlc -bind = $mainMod, W, exec, google-chrome-stable --profile-directory=Default --app-id=magamgmomalmppfcmkgppgboggkfiphd +bind = $mainMod, W, exec, microsoft-edge-stable --profile-directory=Default --app-id=magamgmomalmppfcmkgppgboggkfiphd --app-url=https://weread.qq.com/ bind = $mainMod SHIFT, W, exec, wechat-uos -bind = $mainMod, X, exec, google-chrome-stable --profile-directory=Default --app-id=jihkolckjdlcnmbfapjpmheicbncfalm - +bind = $mainMod, X, exec, microsoft-edge-stable --profile-directory=Default --app-id=jihkolckjdlcnmbfapjpmheicbncfalm --app-url=https://webapp.songy.info/ bind = $mainMod, F3, fullscreen, bind = $mainMod, F4, togglefloating, bind = $mainMod, C, killactive, diff --git a/dotfiles/software b/dotfiles/software deleted file mode 100644 index 3524ee7..0000000 --- a/dotfiles/software +++ /dev/null @@ -1,59 +0,0 @@ -# core -archlinuxcn-keyring yay paru zsh curl \ -hyprland xdg-desktop-portal-hyprland \ -kitty mako swaylock-effects udiskie thunar \ -polkit-kde-agent wofi waybar-hyprland-git sddm btop timeshift \ -ttf-jetbrains-mono-nerd noto-fonts-emoji wqy-zenhei wqy-microhei wqy-microhei-lite wqy-bitmapfont \ -fcitx5-im fcitx5-rime fcitx5-chinese-addons fcitx5-material-color fcitx5-configtool fcitx5-pinyin-zhwiki \ -obsidian neofetch notion-app-enhanced neovim github-desktop-bin spotify motrix aria2 \ -kate okular jupyterlab - -blueman ufw network-manager-applet - -# sound -alsa-utils pulseaudio pulseaudio-alsa pamixer pavucontrol - -# develop -mariadb mariadb-libs - -# programming language -clang go python-pip cargo npm jdk-openjdk - -# pacman other -plasma-desktop - -# yay/paru -fcitx5-input-support visual-studio-code-bin \ -google-chrome dotdrop swww wlogout logseq-desktop-wayland-bin anytype-bin \ -jetbrains-toolbox typora-free aliyunpan-odomu \ -ttf-wps-fonts wps-office-cn \ -linuxqq wechat-uos - -# yay other -sddm-config-editor-git hyprland-autoname-workspace-git - -# git init -git config --global user.name lostecho -git config --global user.email 752549025@qq.com -git config --global credential.helper store - -# git repositories - -https://github.com/selfteaching/the-craft-of-selfteaching.git -https://github.com/xiaolai/regular-investing-in-box.git -https://github.com/xiaolai/everyone-can-use-english.git -https://github.com/xiaolai/time-as-a-friend.git - -# hyprload -curl -sSL https://raw.githubusercontent.com/Duckonaut/hyprload/main/install.sh | bash - -# oh-my-zsh -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" -git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions -git clone https://github.com/z-shell/F-Sy-H.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/F-Sy-H - - - -ghp_ - -9ykTi91rAkLtVnxhBcLssmIZaUxVvR2hWODQ diff --git a/dotfiles/software.md b/dotfiles/software.md new file mode 100644 index 0000000..1252bd9 --- /dev/null +++ b/dotfiles/software.md @@ -0,0 +1,219 @@ +# the Software of ArchLinux + +## install some necessary software + +### after arch install finish + +1. edit the pacman config file in `/etc/pacman.conf` + +```bash +sudo nano /etc/pacman.conf + +# add to the last of the file +--------------------------------------------------------------- +[archlinuxcn] +Server = https://mirrors.tuna.tsinghua.edu.cn/archlinuxcn/$arch +--------------------------------------------------------------- + +``` + +2. import GPG key + +```bash +sudo pacman -S archlinuxcn-keyring +``` + +3. install yay & paru & other + +```bash +sudo pacman -S yay paru base-devel neovim +``` + +4. clone config file repository + +```bash +git clone https://github.com/IHHII/.dotfiles.git +git checkout -b altas origin/altas +``` + +5. cancel the sudo password and change the environment variable + +```bash +sudo su +nvim /etc/sudoers.d/10-installer + +# change file to this # +-------------------------------- +%wheel ALL=(ALL) ALL +%lostecho ALL=(ALL) NOPASSWD:ALL +-------------------------------- + +nvim /etc/environment + +# change the environment in it # +-------------------------------- +BROWSER=microsoft-edge-stable +EDITOR=nvim +-------------------------------- + +``` + +6. add the alhp source + +- check and install keyring & mirrorlist + +```bash +/lib/ld-linux-x86-64.so.2 --help +yay -S alhp-keyring alhp-mirrorlist +``` + +- add following source to `/etc/pacman.conf` + + +```bash +nvim /etc/pacman.conf + +# add before [core] mirror # +---------------------------------------- +[core-x86-64-v3] +Include = /etc/pacman.d/alhp-mirrorlist + +[extra-x86-64-v3] +Include = /etc/pacman.d/alhp-mirrorlist + +#[community-x86-64-v3] +#Include = /etc/pacman.d/alhp-mirrorlist +---------------------------------------- +``` + +- update software + +```bash +sudo pacman -Syuu +``` + +7. oh-my-zsh setup + +- use script to install oh-my-zsh + +```bash +sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" +git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions +git clone https://github.com/z-shell/F-Sy-H.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/F-Sy-H +``` + +- replace `.zshrc` file + +```zsh +yay -S dotdrop +dotdrop --cfg=~/.dotfiles/config.yaml install +source ~/.zshrc + +``` + +### install desktop environment + +1. install hyprland + +```zsh +sudo pacman -S \ +hyprland xdg-desktop-portal-hyprland wofi \ +kitty mako swaylock-effects udiskie thunar btop \ +polkit-kde-agent waybar-hyprland-git sddm + +yay -S wlogout swww +``` + +2. install fonts and fcitx5 + +- fonts + +```zsh +sudo pacman -S \ +ttf-jetbrains-mono-nerd noto-fonts-emoji wqy-zenhei \ +wqy-microhei wqy-microhei-lite wqy-bitmapfont +``` + +- fcitx5 + +```zsh +sudo pacman -S \ +fcitx5-im fcitx5-rime fcitx5-chinese-addons \ +fcitx5-material-color fcitx5-configtool fcitx5-pinyin-zhwiki + +yay -S fcitx5-input-support + +``` + +3. install some tools + +```zsh +sudo pacman -S \ +blueman ufw network-manager-applet timeshift\ +neofetch github-desktop-bin aria2 motrix \ +zathura zathura-mu-pdf +``` + +4. documents view and edit +```zsh +sudo pacman -S kate okular jupyterlab + +yay -S microsoft-edge-stable visual-studio-code-bin \ +ttf-wps-fonts wps-office-cn +``` + +5. develop tools + +```zsh +sudo pacman -S \ +mariadb mariadb-libs \ +clang go python-pip cargo npm jdk-openjdk + +yay -S jetbrains-toolbox +``` + +6. install sound + +> have some unknown problem + +```zsh +alsa-utils pulseaudio pulseaudio-alsa pamixer pavucontrol +``` + +7. install note software +```zsh +yay -S \ +obsidian nothon-app-enhanced typora-free\ +logseq-desktop-wayland-bin anytype-bin +``` + +### other software + +- pacman + +plasma-desktop + +- yay + +aliyunpan-odomu \ + +sddm-config-editor-git hyprland-autoname-workspace-git + +### git init +git config --global user.name lostecho +git config --global user.email 752549025@qq.com +git config --global credential.helper store + +### some git repositories + +```zsh +git clone https://github.com/selfteaching/the-craft-of-selfteaching.git +git clone https://github.com/xiaolai/regular-investing-in-box.git +git clone https://github.com/xiaolai/everyone-can-use-english.git +git clone https://github.com/xiaolai/time-as-a-friend.git +``` + +# hyprload +curl -sSL https://raw.githubusercontent.com/Duckonaut/hyprload/main/install.sh | bash + +ghp_0ykTi91rAkLtVnxhBcLssmIZaUxVvR2hWODQ diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 809f8e3..aa437f8 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -133,7 +133,8 @@ alias pdf="zathura" # remotedesktop #alias nuc="wlfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:NUC /f /sound" alias nuc="wlfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:192.168.31.15 /f /sound" -alias nucs="wlfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:43.249.192.204:45561 /f /sound" +alias nucx="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:43.249.192.204:45561 /f /sound /floatbar:sticky:off,default:hidden,show:window -themes +multitouch /video -wallpaper +nego +smart-sizing" +alias nucwl="wlfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:43.249.192.204:45561 /f /sound /floatbar:sticky:off,default:hidden,show:window -themes -toggle-fullscreen +multitouch /video -wallpaper +nego +smart-sizing" # git alias alias gup="git pull --rebase"