From 9c038a6cde7ff100b6f545709150d0657dfc8a9d Mon Sep 17 00:00:00 2001 From: lostecho <752549025@qq.com> Date: Mon, 17 Jul 2023 16:50:53 +0800 Subject: [PATCH] update --- config.yaml | 2 +- dotfiles/config/hypr/hyprland.conf | 14 ++++++---- dotfiles/config/hypr/scripts/bgaction | 1 + dotfiles/config/waybar/config.jsonc | 40 +++++++++++++++------------ dotfiles/software | 7 +++-- dotfiles/zshrc | 16 ++++++++--- 6 files changed, 48 insertions(+), 32 deletions(-) diff --git a/config.yaml b/config.yaml index feda4f9..d1997e2 100644 --- a/config.yaml +++ b/config.yaml @@ -33,7 +33,7 @@ dotfiles: src: config/mako dst: ~/.config/mako profiles: - lostecho-nuc11pahi5: + lostecho-atlas: dotfiles: - f_zshrc - d_hypr diff --git a/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf index 7aafd6a..50b3598 100644 --- a/dotfiles/config/hypr/hyprland.conf +++ b/dotfiles/config/hypr/hyprland.conf @@ -14,6 +14,7 @@ OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. # See https://wiki.hyprland.org/Configuring/Monitors/ monitor = , preferred, auto, auto +monitor = eDP-1, 1920x1080@60, auto, 1 monitor = DP-2, 2560x1440@75, auto, 1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -22,16 +23,17 @@ monitor = DP-2, 2560x1440@75, auto, 1 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # Wayland magic (screen sharing etc.) exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # More wayland magic (screen sharing etc.) -exec-once = ~/.config/hypr/scripts/xdg-portal-hyprland exec-once = ~/.config/hypr/scripts/bgaction exec-once = ~/.local/share/hyprload/hyprload.sh +exec-once = ~/.config/hypr/scripts/xdg-portal-hyprland exec-once = /usr/lib/polkit-kde-authentication-agent-1 -exec-once = fcitx5 --replace -d -exec-once = udiskie & +exec-once = mako & +exec-once = clash & exec-once = waybar & -exec-once = mako +exec-once = udiskie & exec-once = blueman-applet +exec-once = fcitx5 --replace -d exec-once = nm-applet --indicator @@ -276,8 +278,8 @@ bindm = $mainMod SHIFT, mouse:272, resizewindow # Brightness control binde = $mainMod, F6, exec, ddcutil setvcp 10 + 10 binde = $mainMod, F5, exec, ddcutil setvcp 10 - 10 -binde = , XF86MonBrightnessUp, exec, ddcutil setvcp 10 + 10 -binde = , XF86MonBrightnessDown, exec, ddcutil setvcp 10 - 10 +binde = , XF86MonBrightnessUp, exec, brightnessctl -c backlight set 1%- +binde = , XF86MonBrightnessDown, exec, brightnessctl -c backlight set +1% # Sound control binde = , F9, exec, pactl set-sink-volume @DEFAULT_SINK@ +1% diff --git a/dotfiles/config/hypr/scripts/bgaction b/dotfiles/config/hypr/scripts/bgaction index b8efed9..cbf8c12 100755 --- a/dotfiles/config/hypr/scripts/bgaction +++ b/dotfiles/config/hypr/scripts/bgaction @@ -14,3 +14,4 @@ THEMEIS=$(readlink -f ~/.config/waybar/style.css | cut -d '-' -f2) #fi swww img -o DP-2 ~/.config/hypr/wallpaper-dark.jpg +swww img -o eDP-1 ~/.config/hypr/wallpaper-dark.jpg diff --git a/dotfiles/config/waybar/config.jsonc b/dotfiles/config/waybar/config.jsonc index 8388bfd..d7e9c34 100644 --- a/dotfiles/config/waybar/config.jsonc +++ b/dotfiles/config/waybar/config.jsonc @@ -8,23 +8,26 @@ "height": 30, "modules-left": [ "custom/launcher", + "clock", "wlr/workspaces", - "custom/playerctl", - "custom/playerlabel" + "wlr/taskbar", + "hyprland/window" + //"custom/playerctl", + //"custom/playerlabel" ], - "modules-center": [ - "hyprland/window", - "wlr/taskbar" + //"modules-center": [ + //"hyprland/window", + //"wlr/taskbar" - ], + //], "modules-right": [ "custom/weather", //"custom/weather_sway", //"network", - "idle_inhibitor", + //"idle_inhibitor", "cpu", "memory", - "disk", + //"disk", "temperature", "battery", //"custom/PBPbattery", @@ -33,12 +36,12 @@ //"pulseaudio_pamixer#microphone", //"custom/keyboard-layout", "backlight#icon", - "backlight#value", + //"backlight#value", "custom/updates", - "clock", + //"clock", "tray", //"custom/power", - "custom/lock_screen", + //"custom/lock_screen", "custom/light_dark" ], "custom/launcher": { @@ -192,9 +195,9 @@ "warning": 30, "critical": 15 }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": " {capacity}%", // "format-good": "", // An empty format will hide the module // "format-full": "", "format-icons": ["", "", "", "", ""] @@ -207,10 +210,10 @@ "pulseaudio": { "scroll-step": 1, // %, can be a float "format": "{icon} {volume}%", - "format-bluetooth": "{icon} {volume}%  {format_source}", - "format-bluetooth-muted": " {icon}  {format_source}", - "format-muted": " ", - "format-source": "{volume}% ", + "format-bluetooth": " {volume}%", //"{icon}  {volume}%", //{format_source}", + "format-bluetooth-muted": " ", //" {icon}", //{format_source}", + "format-muted": "", + "format-source": " {volume}%", "format-source-muted": "", "format-icons": { "headphone": "", @@ -269,6 +272,7 @@ }, "backlight#icon": { "format": "{icon}", + "format": "{icon} {percent}%", "format-icons": [""], "on-scroll-down": "brightnessctl -c backlight set 1%-", "on-scroll-up": "brightnessctl -c backlight set +1%" diff --git a/dotfiles/software b/dotfiles/software index 9b1715d..3524ee7 100644 --- a/dotfiles/software +++ b/dotfiles/software @@ -1,13 +1,14 @@ # core archlinuxcn-keyring yay paru zsh curl \ hyprland xdg-desktop-portal-hyprland \ -kitty mako swaylock-effects udiskie thunar\ +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 \ -blueman network-manager-applet ufw \ 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 \ +kate okular jupyterlab + +blueman ufw network-manager-applet # sound alsa-utils pulseaudio pulseaudio-alsa pamixer pavucontrol diff --git a/dotfiles/zshrc b/dotfiles/zshrc index a110684..42b042d 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,6 +1,6 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH -export PATH="$HOME/bin:/usr/local/bin:$HOME/.cargo/bin:$PATH" +export PATH="$HOME/bin:/usr/local/bin:$HOME/.cargo/bin:$HOME/.npm/bin:$PATH" # Path to your oh-my-zsh installation. export ZSH="$HOME/.oh-my-zsh" @@ -88,6 +88,8 @@ 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 NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" +#[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm #export all_proxy=http://192.168.31.40:7890 #export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab @@ -111,7 +113,8 @@ export EDITOR=nvim # alias ohmyzsh="mate ~/.oh-my-zsh" # proxy alias -alias proxy="export all_proxy=http://192.168.31.40:7890" # for home network enviroment +alias proxy="export all_proxy=http://127.0.0.1:7890" # for home network enviroment +#alias proxy="export all_proxy=http://192.168.31.40:7890" # for home network enviroment alias noproxy="export all_proxy=''" # cancel proxy mode # dordrop config file alias @@ -128,8 +131,13 @@ alias hyprloadreload="curl -sSL https://raw.githubusercontent.com/Duckonaut/hypr 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" +#alias nuc="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:NUC /f /sound" +alias nuc="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:192.168.31.15 /f /sound" +alias nucs="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:43.249.192.204:45561 /f /sound" + +# git alias +alias gup="git pull --rebase" +alias gall="git add . && git commit -a -m 'update' && git push" # install software alias installpac="sudo pacman -S archlinuxcn-keyring yay paru zsh curl \