diff --git a/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf index fd53812..dffb0ca 100644 --- a/dotfiles/config/hypr/hyprland.conf +++ b/dotfiles/config/hypr/hyprland.conf @@ -45,13 +45,13 @@ env = XCURSOR_SIZE,24 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { - #kb_options = ctrl:nocaps kb_layout = us kb_variant = kb_model = - kb_options = + kb_options = ctrl:nocaps kb_rules = + numlock_by_default = false follow_mouse = 1 @@ -76,6 +76,10 @@ general { col.inactive_border = rgba(595959aa) layout = dwindle + cursor_inactive_timeout = 10 + resize_on_border = true + extend_border_grab_area = 15 + hover_icon_on_border = true } misc { @@ -85,6 +89,11 @@ misc { animate_manual_resizes = yes animate_mouse_windowdragging = no suppress_portal_warnings = yes + force_hypr_chan = yes + mouse_move_enables_dpms = yes + key_press_enables_dpms = yes + animate_manual_resizes = yes + animate_mouse_windowdragging = yes } @@ -106,7 +115,10 @@ decoration { drop_shadow = yes shadow_range = 4 shadow_render_power = 3 + shadow_ignore_window = true col.shadow = rgba(1a1a1aee) + dim_inactive = true + dim_strength = 0.05 } animations { @@ -195,6 +207,7 @@ windowrulev2 = animation popin, class:^(kitty)$, title:^(update-sys)$ #windowrulev2 = move 100%-433 53, class:^(wofi)$, title:^(clippick)$ windowrulev2 = tile, title:^(微信读书)$ windowrulev2 = tile, title:^(notion)$ +windowrulev2 = tile, title:^(flomo)$ windowrulev2 = tile, title:^(少数派)$ windowrulev2 = tile, title:^(freeCodeCamp)$ windowrulev2 = tile, title:^(bandu_flutter)$ @@ -209,7 +222,8 @@ bind = $mainMod, A, exec, anytype bind = $mainMod, E, exec, thunar bind = $mainMod SHIFT, E, exec, dolphin bind = $mainMod CTRL, E, exec, kitty ranger -bind = $mainMod SHIFT, F, exec, microsoft-edge-stable --profile-directory=Default --app-id=idcicjmfdnncfmmgoogecnlfbkglgcak --app-url=https://www.freecodecamp.org/ +bind = $mainMod SHIFT, F, exec, microsoft-edge-stable --profile-directory=Default --app-id=mjnbhimggobpdngjimoodpenobognheo --app-url=https://v.flomoapp.com/ +bind = $mainMod CTRL, F, exec, microsoft-edge-stable --profile-directory=Default --app-id=idcicjmfdnncfmmgoogecnlfbkglgcak --app-url=https://www.freecodecamp.org/ bind = $mainMod, G, exec, microsoft-edge-stable bind = $mainMod SHIFT, G, exec, github-desktop bind = $mainMod CTRL, G, exec, google-chrome-stable diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 981b76f..e81035c 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -88,7 +88,7 @@ source $ZSH/oh-my-zsh.sh # You may need to manually set your language environment export LANG=en_US.UTF-8 export EDITOR=nvim -#export all_proxy=http://192.168.31.40:7890 +export BROWSER=microsoft-edge-stable #export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab # Preferred editor for local and remote sessions @@ -112,7 +112,7 @@ export EDITOR=nvim # proxy alias alias proxy="export all_proxy=http://192.168.31.40:7890" # for home network enviroment -alias proxyl="export all_proxy=http://127.0.0.1:10809" # for home network enviroment +alias proxyl="export all_proxy=http://127.0.0.1:10809" # for local network enviroment alias noproxy="export all_proxy=''" # cancel proxy mode # dordrop config file alias @@ -123,23 +123,65 @@ alias vim="nvim" alias vh="vim ~/.config/hypr/hyprland.conf" # edit hyprland config alias vz="vim ~/.zshrc" # edit zsh config alias szsh="source ~/.zshrc" # source the zshrc file -#alias hyprloadreload="curl -sSL https://raw.githubusercontent.com/Duckonaut/hyprload/main/install.sh | bash" - -# quick command -alias pdf="zathura" # remotedesktop alias nuc="wlfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:NUC /f" alias nucs="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:192.168.31.15 /f" -# install software -alias installpac="sudo pacman -S archlinuxcn-keyring yay paru zsh curl \ -hyprland xdg-desktop-portal-hyprland \ -kitty dunst swaylock-effects udiskie \ -polkit-kde-agent wofi waybar-hyprland-git sddm btop \ -ttf-jetbrains-mono-nerd noto-fonts-emoji wqy-zenhei wqy-microhei wqy-microhei-lite wqy-bitmapfont \ -alsa-utils pulseaudio pamixer pavucontrol blueman network-manager-applet \ -fcitx5 fcitx5-rime fcitx5-chinese-addons fcitx5-material-color fcitx5-configtool \ -obsidian neofetch notion-app-enhanced vscodium-bin " -alias installyay="yay -S google-chrome dotdrop swww wlogout logseq-desktop-wayland-bin anytype-bin" +# update system +alias syuu="yay -Syuu" +# git alias +alias gup="git pull --rebase" +alias gall="git add . && git commit -am 'update' && git push" + +# archlinuxcn & alhp +# +# [archlinuxcn] +# Server = https://mirrors.tuna.tsinghua.edu.cn/archlinuxcn/$arch +# +# sudo pacman -S archlinuxcn-keyring +# +# yay -S alhp-keyring alhp-mirrorlist +# +# [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 + +# install 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 + +# pacman install software +alias pacmaninstall = "sudo pacman -S neovim base-devel zsh paru yay hyprland xdg-desktop-portal-hyprland wofi \ +kitty mako swaylock-effects udiskie thunar btop polkit-kde-agent waybar-hyprland-git sddm \ +ttf-jetbrains-mono-nerd noto-fonts-emoji wqy-zenhei wqy-microhei wqy-microhei-lite wqy-bitmapfont \ +citx5-im fcitx5-rime fcitx5-chinese-addons fcitx5-material-color fcitx5-configtool fcitx5-pinyin-zhwiki \ +network-manager-applet neofetch github-desktop-bin aria2 motrix zathura zathura-mu-pdf \ +kate okular jupyterlab obsidian mariadb mariadb-libs \ +clang go python-pip cargo npm jdk-openjdk" +alias yayinstall="yay -S wlogout swww fcitx5-input-support rime-ice microsoft-edge-stable \ +visual-studio-code-bin ttf-wps-fonts wps-office-cn jetbrains-toolbox notion-app-enhanced \ +logseq-desktop-wayland-bin anytype-bin aliyunpan-odomu" + +# hyprload +# curl -sSL https://raw.githubusercontent.com/Duckonaut/hyprload/main/install.sh | bash +# ghp_0ykTi91rAkLtVnxhBcLssmIZaUxVvR2hWODQ + +# git init +# git config --global user.name lostecho +# git config --global user.email 752549025@qq.com +# git config --global credential.helper store +# git clone https://github.com/IHHII/.dotfiles.git +# git clone https://github.com/IHHII/logseq.git +# git clone https://github.com/IHHII/Hui-s-notebook.git +# git clone https://github.com/IHHII/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