update

update config file
2023-07-30 22:51:14 +08:00 · 2023-07-29 01:29:42 -04:00 · 2023-07-28 10:11:16 -04:00 · 2023-07-28 09:55:59 -04:00 · 2023-07-17 09:07:06 +08:00 · 2023-07-17 08:51:09 +08:00
62 changed files with 11028 additions and 2830 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+env
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dotdrop"]
+	path = dotdrop
+	url = https://github.com/deadc0de6/dotdrop.git
--- a/SimpRead/simpread.AppImage
+++ b/SimpRead/simpread.AppImage
--- a/SimpRead/simpread_config.json
+++ b/SimpRead/simpread_config.json
--- a/config.yaml
+++ b/config.yaml
@@ -11,35 +11,16 @@ dotfiles:
  f_zshrc:
    src: zshrc
    dst: ~/.zshrc
-  d_hypr:
-    src: config/hypr
-    dst: ~/.config/hypr
-  d_waybar:
-    src: config/waybar
-    dst: ~/.config/waybar
-  d_wofi:
-    src: config/wofi
-    dst: ~/.config/wofi
-  d_kitty:
-    src: config/kitty
-    dst: ~/.config/kitty
-  d_swaylock:
-    src: config/swaylock
-    dst: ~/.config/swaylock
-  d_mako:
-    src: config/mako
-    dst: ~/.config/mako
-  f_software.md:
-    src: software.md
-    dst: ~/software.md
+  d_oh-my-zsh:
+    src: oh-my-zsh
+    dst: ~/.oh-my-zsh
+    chmod: '751'
+  d_applications:
+    src: local/share/applications
+    dst: ~/.local/share/applications
 profiles:
-  lostecho-nuc11pahi5:
+  penguin:
    dotfiles:
    - f_zshrc
-    - d_hypr
-    - d_waybar
-    - d_wofi
-    - d_kitty
-    - d_swaylock
-    - d_mako
-    - f_software.md
+    - d_oh-my-zsh
+    - d_applications
--- a/1
+++ b/1
--- a/dotfiles/config/hypr/endeavouros-wallpaper.png
+++ b/dotfiles/config/hypr/endeavouros-wallpaper.png
--- a/dotfiles/config/hypr/env_var.conf
+++ b/dotfiles/config/hypr/env_var.conf
@@ -1,52 +0,0 @@
-# Environment Variables
-# see https://wiki.hyprland.org/Configuring/Environment-variables/ 
-
-# Theming Related Variables
-# Set cursor size. See FAQ below for why you might want this variable set.
-# https://wiki.hyprland.org/FAQ/
-env = XCURSOR_SIZE,24
-
-# Set a GTK theme manually, for those who want to avoid appearance tools such as lxappearance or nwg-look
-#env = GTK_THEME,
-
-# Set your cursor theme. The theme needs to be installed and readable by your user.
-#env = XCURSOR_THEME,
-
-# the line below may help with multiple monitors
-#env = WLR_EGL_NO_MODIFIERS,1
-
-#XDG Specifications
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-# Toolkit Backend Variables
-
-# GTK: Use wayland if available, fall back to x11 if not.
-#env = GDK_BACKEND,wayland,x11
-
-# QT: Use wayland if available, fall back to x11 if not.
-#env = QT_QPA_PLATFORM,wayland,xcb
-
-# Run SDL2 applications on Wayland. Remove or set to x11 if games that 
-# provide older versions of SDL cause compatibility issues
-#env = SDL_VIDEODRIVER,wayland 
-
-# Clutter package already has wayland enabled, this variable 
-#will force Clutter applications to try and use the Wayland backend
-#env = CLUTTER_BACKEND,wayland 
-
-# QT Variables
-
-# (From the QT documentation) enables automatic scaling, based on the monitor’s pixel density
-# https://doc.qt.io/qt-5/highdpi.html
-#env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-
-# Tell QT applications to use the Wayland backend, and fall back to x11 if Wayland is unavailable
-#env = QT_QPA_PLATFORM,wayland,xcb
-
-# Disables window decorations on QT applications
-#env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-
-#Tells QT based applications to pick your theme from qt5ct, use with Kvantum.
-#env = QT_QPA_PLATFORMTHEME,qt5ct
--- a/dotfiles/config/hypr/hyprland.conf
+++ b/dotfiles/config/hypr/hyprland.conf
@@ -1,324 +0,0 @@
-
-########################################################################################
-AUTOGENERATED HYPR CONFIG.
-PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-########################################################################################
-
-#
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-#
-
-# autogenerated = 1 # remove this line to remove the warning
-
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor =     , preferred,    auto,   auto
-monitor = DP-2, 2560x1440@75, 0x0,    1
-monitor = DP-3, 2256x1504@60, 0x1440, 1
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-
-# Execute your favorite apps at launch
-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/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 = waybar &
-exec-once = v2raya --lite &
-exec-once = mako
-exec-once = blueman-applet
-exec-once = nm-applet --indicator
-exec-once = gtk-launch simpread
-
-
-# Source a file (multi-file configs)
-# source = ~/.config/hypr/myColors.conf
-
-# Some default env vars.
-env = XCURSOR_SIZE,24
-
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
-input {
-
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options = ctrl:nocaps
-    kb_rules =
-    numlock_by_default = false
-
-    follow_mouse = 1
-
-    touchpad {
-    	disable_while_typing = yes
-        natural_scroll = yes
-        tap-to-click = yes
-        drag_lock = yes
-        scroll_factor = 0.5
-    }
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-}
-
-general {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-    gaps_in = 2
-    gaps_out = 2
-    border_size = 2
-    col.active_border = rgba(5fc9f8ee) rgba(fecb2eee) rgba(fd9426ee) rgba(fc3158ee) rgba(147efbee) rgba(53d769ee) rgba(fc3d39ee) rgba(f77737ee) rgba(fcaf45ee) rgba(ffdc80ee) 36deg
-    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 {
-    disable_hyprland_logo = yes
-    disable_splash_rendering = yes
-    focus_on_activate = yes
-    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
-}
-
-
-decoration {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-    active_opacity=1
-    inactive_opacity=0.95
-    fullscreen_opacity=1.0
-
-    rounding = 5
-    blur {
-	enabled = yes
-    	size = 5
-    	passes = 2
-    	new_optimizations = on
-    }
-
-    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 {
-    enabled = yes
-
-    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-    animation = windows, 1, 7, myBezier
-    animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
-
-dwindle {
-    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = yes # you probably want this
-}
-
-master {
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
-}
-
-gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = yes
-    workspace_swipe_fingers = 3
-    workspace_swipe_cancel_ratio = 0.15
-}
-
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-device:epic mouse V1 {
-    #sensitivity = -0.5
-}
-
-device:apple-inc.-magic-trackpad-1 {
-    #scroll_factor = 1.0
-    #middle_button_emulation=0
-}
-
-plugin {
-  
-    hyprload {
-        quiet = true
-    }
-
-    touch_gestures {
-        # default sensitivity is probably too low on tablet screens,
-        # I recommend turning it up to 4.0
-        sensitivity = 4.0
-        workspace_swipe_fingers = 3
-    }
-
-    hyprbars {
-        # config
-        buttons {
-            # button config
-        }
-    }
-
-    borders-plus-plus {
-        #add_borders = 1 # 0 - 2
-        #col.border_1 = rgb(ffffff) # example col for border 1
-        #col.border_2 = rgb(2222ff) # example col for border 2
-    }
-}
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrulev2 = opacity 0.8 0.9,  class:^(kitty)$
-windowrulev2 = opacity 0.8 0.8,  class:^(VSCodium)$
-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 = 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)$
-windowrulev2 = float,            class:^(org.kde.polkit-kde-authentication-agent-1)$
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$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,       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=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
-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 ~/PycharmProjects/the-craft-of-selfteaching; jupyter-lab
-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, microsoft-edge-stable --profile-directory=Default --app-id=bicgkabnllfcnajoaobgkmpjchldbdco --app-url=https://www.notion.so/
-#bind = $mainMod,       N,     exec, notion-app-enhanced
-bind = $mainMod SHIFT, N,     exec, kitty nvim
-bind = $mainMod,       O,     exec, obsidian
-bind = $mainMod SHIFT, O,     exec, okular
-bind = $mainMod,       Q,     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,       S,     exec, spotify
-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, 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, microsoft-edge-stable --profile-directory=Default --app-id=jihkolckjdlcnmbfapjpmheicbncfalm --app-url=https://webapp.songy.info/
-
-bind = $mainMod,       Space, fullscreen,
-bind = $mainMod,       C,     killactive,
-bind = $mainMod,       F,     togglefloating,
-bind = $mainMod CTRL,  P,     pseudo,
-bind = $mainMod SHIFT, M,     exit,
-bind = $mainMod SHIFT, T,     togglesplit,
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod,       left,  movefocus, l
-bind = $mainMod,       right, movefocus, r
-bind = $mainMod,       up,    movefocus, u
-bind = $mainMod,       down,  movefocus, d
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod,       1, workspace, 1
-bind = $mainMod,       2, workspace, 2
-bind = $mainMod,       3, workspace, 3
-bind = $mainMod,       4, workspace, 4
-bind = $mainMod,       5, workspace, 5
-bind = $mainMod,       6, workspace, 6
-bind = $mainMod,       7, workspace, 7
-bind = $mainMod,       8, workspace, 8
-bind = $mainMod,       9, workspace, 9
-bind = $mainMod,       0, workspace, 10
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod,        mouse_down, workspace, e+1
-bind = $mainMod,        mouse_up,   workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod,       mouse:272, movewindow
-bindm = $mainMod,       mouse:273, resizewindow
-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
-
-# Sound control
-binde =        , F9,                     exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
-binde =        , F8,                     exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
-binde =        , F7,                     exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
-binde =        , XF86AudioRaiseVolume,   exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
-binde =        , XF86AudioLowerVolume,   exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
-binde =        , XF86AudioMute,          exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
-
-# Player control
-binde = $mainMod, F11,                   exec, playerctl play-pause
-binde = $mainMod, F12,                   exec, playerctl next
-binde = $mainMod, F10,                   exec, playerctl previous
-binde =         , XF86AudioPlay,         exec, playerctl play-pause
-binde =         , XF86AudioNext,         exec, playerctl next
-binde =         , XF86AudioPrev,         exec, playerctl previous
--- a/dotfiles/config/hypr/hyprload.toml
+++ b/dotfiles/config/hypr/hyprload.toml
@@ -1,10 +0,0 @@
-plugins = [
-    "Duckonaut/split-monitor-workspaces",
-    "zakk4223/hyprNStack",
-    "zakk4223/hyprRiver",
-    "VortexCoyote/hyprfocus",
-    "ItsDrike/hyprland-dwindle-autogroup",
-    "outfoxxed/hy3",
-    "horriblename/hyprland-touch-gestures",
-    "Duckonaut/split-monitor-workspaces",
-]
--- a/dotfiles/config/hypr/hyprv_util
+++ b/dotfiles/config/hypr/hyprv_util
@@ -1,145 +0,0 @@
-#!/bin/bash
-. ~/.config/HyprV/hyprv.conf
-
-get_theme() {
-    # Check which waybar theme is set
-    THEMEIS=$(readlink -f ~/.config/waybar/style.css | cut -d '-' -f3)
-
-    #if the theme is not dark then we need to switch to it
-    if [[ $THEMEIS == "dark.css" ]]; then
-        SWITCHTO="-dark"
-        MODESTR="Dark"
-    else
-        SWITCHTO=""
-        MODESTR="Light"
-    fi
-}
-
-update_theme() {
-    #set the xfce and GTK theme
-    if [[ $VER == "v4" || $VERTO == "v4-" ]]; then
-        xfconf-query -c xsettings -p /Net/IconThemeName -s "Papirus-Dark"
-        gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark"
-    else 
-        xfconf-query -c xsettings -p /Net/IconThemeName -s "Adwaita$SWITCHTO"
-        gsettings set org.gnome.desktop.interface icon-theme "Adwaita$SWITCHTO"
-    fi
-
-    xfconf-query -c xsettings -p /Net/ThemeName -s "Adwaita$SWITCHTO"
-    gsettings set org.gnome.desktop.interface gtk-theme "Adwaita$SWITCHTO"
-}
-
-get_ver() {
-    VER=$(readlink -f ~/.config/waybar/config.jsonc | cut -d '-' -f1 | cut -d '/' -f8)
-}
-
-restart_waybar() {
-    #restart the waybar
-    pkill waybar
-    waybar & 
-
-    get_ver   
-
-    if [[ $VER == "v4" ]]; then
-        waybar --config ~/.config/HyprV/waybar/conf/v4-config-bottom.jsonc
-    fi
-
-}
-
-set_current_background() {
-    get_theme
-    get_ver
-    
-    if [[ ! -z "$SET_BG" ]]; then
-        #set the current background
-        if [[ $THEMEIS == "dark.css" ]]; then
-            swww img ~/.config/HyprV/backgrounds/$VER'-background-dark.jpg'
-        else
-            swww img ~/.config/HyprV/backgrounds/$VER'-background.jpg'
-        fi
-    else
-        swww img $SET_BG
-    fi
-}
-
-switch_version() {
-    get_theme
-    get_ver
-    case $VER in
-        v1)
-            #we are on v1 so switch to v2
-            VERTO="v2-"
-            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV2"
-        ;;
-        
-        v2)
-            #we are on v2 so switch to v3
-            VERTO="v3-"
-            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV3"
-        ;;
-
-        v3)
-            #we are on v3 so switch to v4
-            VERTO="v4-"
-            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV4"
-        ;;
-
-        v4)
-            #we are on v4 so switch to v1
-            VERTO="v1-"
-            notify-send -h string:x-canonical-private-synchronous:sys-notify -u low "switching to HyprV1"
-        ;;
-        
-    esac
-    #set the waybar config
-    ln -sf ~/.config/HyprV/waybar/conf/$VERTO'config.jsonc' ~/.config/waybar/config.jsonc
-    #set the waybar theme
-    ln -sf ~/.config/HyprV/waybar/style/$VERTO'style'$SWITCHTO.css ~/.config/waybar/style.css
-    #set the wofi theme
-    ln -sf ~/.config/HyprV/wofi/style/$VERTO'style'$SWITCHTO.css ~/.config/wofi/style.css
-
-    #set the background
-    if [ -z $SET_BG ]; then
-        swww img ~/.config/HyprV/backgrounds/$VERTO'background'$SWITCHTO.jpg --transition-fps 60 --transition-type wipe --transition-duration 2
-    else
-        swww img $SET_BG --transition-fps 60 --transition-type wipe --transition-duration 2
-    fi
-
-    #update the sddm image
-    cp -f ~/.config/HyprV/backgrounds/$VERTO'background'$SWITCHTO.jpg /usr/share/sddm/themes/sdt/wallpaper.jpg
-
-}
-
-switch_keyboard() {
-    hyprctl switchxkblayout $SET_KB next
-}
-
-if [[ "$1" == "vswitch" ]]; then
-    switch_version
-    update_theme
-    restart_waybar
-elif [[ "$1" == "setbg" ]]; then
-    set_current_background
-    update_theme
-    restart_waybar
-elif [[ "$1" == "swkb" ]]; then
-    switch_keyboard
-    restart_waybar
-fi
-
-# need to show the version and tooltip
-get_ver
-
-TOOLTIP='Default Keybinds\n'\
-'SUPER + Q = Start Kitty\n'\
-'SUPER + F4 = Close Window\n'\
-'SUPER + L = Lock Screen\n'\
-'SUPER + M = Logout menu\n'\
-'SUPER + E = File Manager\n'\
-'SUPER + V = Toggle Float\n'\
-'SUPER + SPACE = App Launcher\n'\
-'SUPER + S = Screenshot\n'\
-'SUPER + T = Switch HyprV version\n'\
-'ALT + V = Open clipboard manager'
-
-echo '{"text": "'$VER'", "tooltip": "'$TOOLTIP'"}'
--- a/dotfiles/config/hypr/media-binds.conf
+++ b/dotfiles/config/hypr/media-binds.conf
@@ -1,12 +0,0 @@
-$SCRIPT = ~/.config/HyprV/waybar/scripts
-
-bind = , xf86audioraisevolume, exec, $SCRIPT/volume --inc 
-bind = , xf86audiolowervolume, exec, $SCRIPT/volume --dec 
-bind = , xf86AudioMicMute, exec, $SCRIPT/volume --toggle-mic 
-bind = , xf86audioMute, exec, $SCRIPT/volume --toggle 
-
-bind = , xf86KbdBrightnessDown, exec, $SCRIPT/kb-brightness --dec 
-bind = , xf86KbdBrightnessUp, exec, $SCRIPT/kb-brightness --inc 
-
-bind = , xf86MonBrightnessDown, exec, $SCRIPT/brightness --dec 
-bind = , xf86MonBrightnessUp, exec, $SCRIPT/brightness --inc 
--- a/dotfiles/config/hypr/scripts/bgaction
+++ b/dotfiles/config/hypr/scripts/bgaction
@@ -1,17 +0,0 @@
-#!/usr/bin/bash
-
-#start swwww
-swww init
-
-#figure out which waybar theme is set
-THEMEIS=$(readlink -f ~/.config/waybar/style.css | cut -d '-' -f2)
-
-#show the correct wallpapper based on the theme
-#if [ $THEMEIS == "dark.css" ]; then
-#    swww img -o DP-2 ~/.config/hypr/wallpaper-dark.jpg
-#else
-#    swww img -o DP-2 ~/.config/hypr/wallpaper.jpg
-#fi
-
-swww img -o DP-2 ~/.config/hypr/endeavouros-wallpaper.png
-swww img -o DP-1 ~/.config/hypr/endeavouros-wallpaper.png
--- a/dotfiles/config/hypr/scripts/gamemode.sh
+++ b/dotfiles/config/hypr/scripts/gamemode.sh
@@ -1,14 +0,0 @@
-#!/usr/bin/env sh
-HYPRGAMEMODE=$(hyprctl getoption animations:enabled | awk 'NR==2{print $2}')
-if [ "$HYPRGAMEMODE" = 1 ] ; then
-    hyprctl --batch "\
-        keyword animations:enabled 0;\
-        keyword decoration:drop_shadow 0;\
-        keyword decoration:blur 0;\
-        keyword general:gaps_in 0;\
-        keyword general:gaps_out 0;\
-        keyword general:border_size 1;\
-        keyword decoration:rounding 0"
-    exit
-fi
-hyprctl reload
--- a/dotfiles/config/hypr/scripts/xdg-portal-hyprland
+++ b/dotfiles/config/hypr/scripts/xdg-portal-hyprland
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-sleep 1
-killall xdg-desktop-portal-hyprland
-killall xdg-desktop-portal
-/usr/lib/xdg-desktop-portal-hyprland &
-sleep 2
-/usr/lib/xdg-desktop-portal &
-
-cd ${HOME}
-# <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ի<EFBFBD><D4BB><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>
-export LANG=zh_CN.UTF-8
-# <20><><EFBFBD><EFBFBD>QT<51><54><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-export QT_AUTO_SCREEN_SCALE_FACTOR=1
-# QTʹ<54><CAB9>wayland<6E><64>gtk
-export QT_QPA_PLATFORM="wayland;xcb"
-export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-# ʹ<><CAB9>qt5ct<63><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>QT<51><54><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-export QT_QPA_PLATFORMTHEME=qt5ct
-
-# һЩ<D2BB><D0A9>Ϸʹ<CFB7><CAB9>wayland
-export SDL_VIDEODRIVER=wayland
-# <20><><EFBFBD><EFBFBD>java<76><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-export _JAVA_AWT_WM_NONEREPARENTING=1
-# GTK<54><4B><EFBFBD><EFBFBD>Ϊ wayland<6E><64>x11,<2C><><EFBFBD><EFBFBD>wayland
-export GDK_BACKEND="wayland,x11"
-
-#fcitx5 gtk
-GTK_IM_MODULE=fcitx
-
-export XDG_SESSION_TYPE=wayland
-export XDG_SESSION_DESKTOP=Hyprland
-export XDG_CURRENT_DESKTOP=Hyprland
-
-
--- a/dotfiles/config/hypr/wallpaper-dark.jpg
+++ b/dotfiles/config/hypr/wallpaper-dark.jpg
--- a/dotfiles/config/hypr/wallpaper.jpg
+++ b/dotfiles/config/hypr/wallpaper.jpg
--- a/dotfiles/config/kitty/kitty.conf
+++ b/dotfiles/config/kitty/kitty.conf
@@ -1,13 +0,0 @@
-include ./mocha.conf
-font_family      jetbrains mono nerd font
-font_size        15
-bold_font        auto
-italic_font      auto
-bold_italic_font auto
-mouse_hide_wait  2.0
-cursor_shape     block
-url_color        #0087bd
-url_style        dotted
-#Close the terminal without confirmation
-confirm_os_window_close 0
-background_opacity 0.95
--- a/dotfiles/config/kitty/mocha.conf
+++ b/dotfiles/config/kitty/mocha.conf
@@ -1,80 +0,0 @@
-# vim:ft=kitty
-
-## name:     Catppuccin-Mocha
-## author:   Pocco81 (https://github.com/Pocco81)
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
-## blurb:    Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground              #CDD6F4
-background              #1E1E2E
-selection_foreground    #1E1E2E
-selection_background    #F5E0DC
-
-# Cursor colors
-cursor                  #F5E0DC
-cursor_text_color       #1E1E2E
-
-# URL underline color when hovering with mouse
-url_color               #F5E0DC
-
-# Kitty window border colors
-active_border_color     #B4BEFE
-inactive_border_color   #6C7086
-bell_border_color       #F9E2AF
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #11111B
-active_tab_background   #CBA6F7
-inactive_tab_foreground #CDD6F4
-inactive_tab_background #181825
-tab_bar_background      #11111B
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1E1E2E
-mark1_background #B4BEFE
-mark2_foreground #1E1E2E
-mark2_background #CBA6F7
-mark3_foreground #1E1E2E
-mark3_background #74C7EC
-
-# The 16 terminal colors
-
-# black
-color0 #45475A
-color8 #585B70
-
-# red
-color1 #F38BA8
-color9 #F38BA8
-
-# green
-color2  #A6E3A1
-color10 #A6E3A1
-
-# yellow
-color3  #F9E2AF
-color11 #F9E2AF
-
-# blue
-color4  #89B4FA
-color12 #89B4FA
-
-# magenta
-color5  #F5C2E7
-color13 #F5C2E7
-
-# cyan
-color6  #94E2D5
-color14 #94E2D5
-
-# white
-color7  #BAC2DE
-color15 #A6ADC8
--- a/dotfiles/config/mako/config
+++ b/dotfiles/config/mako/config
@@ -1,22 +0,0 @@
-font=UbuntuMono 12.5
-
-background-color=#404552
-text-color=#e5e9f0
-width=315
-height=200
-padding=10
-margin=10
-progress-color=over #eceff480
-icon-path=/usr/share/icons/Arc-X-D
-max-icon-size=70
-layer=overlay
-
-border-size=5
-border-radius=0
-border-color=#5294e2
-
-default-timeout=5000
-
-[urgency=high]
-
-ignore-timeout=1
--- a/dotfiles/config/swaylock/config
+++ b/dotfiles/config/swaylock/config
@@ -1,38 +0,0 @@
-daemonize
-show-failed-attempts
-clock
-screenshot
-effect-blur=9x5
-effect-vignette=0.5:0.5
-color=1f1d2e80
-font="Inter"
-indicator
-indicator-radius=200
-indicator-thickness=20
-line-color=1f1d2e
-ring-color=191724
-inside-color=1f1d2e
-key-hl-color=eb6f92
-separator-color=00000000
-text-color=e0def4
-text-caps-lock-color=""
-line-ver-color=eb6f92
-ring-ver-color=eb6f92
-inside-ver-color=1f1d2e
-text-ver-color=e0def4
-ring-wrong-color=31748f
-text-wrong-color=31748f
-inside-wrong-color=1f1d2e
-inside-clear-color=1f1d2e
-text-clear-color=e0def4
-ring-clear-color=9ccfd8
-line-clear-color=1f1d2e
-line-wrong-color=1f1d2e
-bs-hl-color=31748f
-grace=2
-grace-no-mouse
-grace-no-touch
-datestr=%a, %B %e
-timestr=%I:%M %p
-fade-in=0.2
-ignore-empty-password
--- a/dotfiles/config/swaylock/config
+++ b/dotfiles/config/swaylock/config
@@ -1,50 +0,0 @@
-ignore-empty-password
-font=Ubuntu Mono Nerd Font
-
-clock
-timestr=%R
-
-image=~/.config/hypr/wallpaper-dark.jpg
-
-fade-in=0.2
-
-#effect-blur=15x2
-#effect-greyscale
-#effect-scale=0.1
-
-indicator
-indicator-radius=110
-indicator-thickness=10
-indicator-caps-lock
-
-key-hl-color=880033ff
-
-separator-color=00000000
-
-inside-color=01010133
-inside-clear-color=ffd20433
-inside-caps-lock-color=009ddc33
-inside-ver-color=d9d8d833
-inside-wrong-color=ee2e2433
-
-ring-color=231f20D9
-ring-clear-color=231f20D9
-ring-caps-lock-color=231f20D9
-ring-ver-color=231f20D9
-ring-wrong-color=231f20D9
-
-line-color=00000000
-line-clear-color=ffd204FF
-line-caps-lock-color=009ddcFF
-line-ver-color=d9d8d8FF
-line-wrong-color=ee2e24FF
-
-text-color=dededeff
-text-clear-color=ffd204ff
-text-ver-color=000000ff
-text-wrong-color=ee2e24ff
-
-bs-hl-color=ffd204ff
-caps-lock-key-hl-color=ffd204FF
-caps-lock-bs-hl-color=dededeFF
-text-caps-lock-color=009ddcff
--- a/dotfiles/config/waybar/config.jsonc
+++ b/dotfiles/config/waybar/config.jsonc
@@ -1,301 +0,0 @@
-{
-    "layer": "top",
-    "position": "top",
-    "mod": "dock",
-    "exclusive": true,
-    "passthrough": false,
-    "gtk-layer-shell": true,
-    "height": 30,
-    "modules-left": [
-        "custom/launcher",
-        "wlr/workspaces",
-        "custom/playerctl",
-        "custom/playerlabel"
-    ],
-    "modules-center": [
-        "hyprland/window",
-        "wlr/taskbar"
-
-    ],
-    "modules-right": [
-        "custom/weather",
-        //"custom/weather_sway",
-        //"network",
-        "idle_inhibitor",
-        "cpu",
-        "memory",
-        "disk",
-        "temperature",
-        "battery",
-        //"custom/PBPbattery",
-        "pulseaudio",
-        //"pulseaudio_pamixer",
-        //"pulseaudio_pamixer#microphone",
-        //"custom/keyboard-layout",
-        //"backlight#icon",
-        //"backlight#value",
-        //"custom/updates",
-        "clock",
-        "tray",
-        //"custom/power",
-        "custom/lock_screen",
-        "custom/light_dark"
-    ],
-    "custom/launcher": {
-        "format": "  ",
-        "on-click": "sh -c '(sleep 0.5s; pkill wofi || wofi -c ~/.config/wofi/config-lmenu)' & disown",
-        "tooltip": false
-    },
-    "wlr/workspaces": {
-        "disable-scroll": true,
-        "all-outputs": true,
-        "on-click": "activate",
-        "on-scroll-up": "hyprctl dispatch workspace -1",
-        "on-scroll-down": "hyprctl dispatch workspace +1",
-        "persistent_workspaces": {
-            "1": [],
-            "2": [],
-            "3": [],
-            "4": [],
-            "5": [],
-            "6": [],
-            "7": [],
-            "8": [],
-            "9": [],
-            "10": []
-        }
-    },
-    "custom/playerctl": {
-      "format": "{icon}",
-      "return-type": "json",
-      "max-length": 64,
-      "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
-      "on-click-middle": "playerctl play-pause",
-      "on-click": "playerctl play-pause",
-      //"on-click": "playerctl previous",
-      "on-click-right": "playerctl next",
-      "format-icons": {
-        "Playing": "<span foreground='#E5B9C6'> 󰒮  󰒭 </span>",
-        "Paused": "<span foreground='#928374'> 󰒮 󰏥 󰒭 </span>"
-      }
-    },
-
-    "custom/playerlabel": {
-      "format": "<span>{}</span>",
-      "return-type": "json",
-      "max-length": 48,
-      "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
-      "on-click-middle": "playerctl play-pause",
-      "on-click": "playerctl play-pause",
-      //"on-click": "playerctl previous",
-      "on-click-right": "playerctl next",
-      "format-icons": {
-        "Playing": "<span foreground='#E5B9C6'> 󰒮  󰒭 </span>",
-        "Paused": "<span foreground='#928374'> 󰒮 󰏥 󰒭 </span>"
-      }
-    },
-
-    // --------------------
-
-    "hyprland/window": {
-        "format": "{}"
-    },
-    "wlr/taskbar": {
-        "format": "{icon}",
-        "icon-size": 24,
-        "all-outputs": true,
-        "tooltip-format": "{name} - {title}",
-        "on-click": "activate",
-        "on-click-middle": "close",
-        "ignore-list": [
-            "wofi"
-        ],
-	    "app_ids-mapping": {
-	        "steam_app_39210": "Final Fantasy 14"
-	    }
-    },
-
-
-    // --------------------
-
-
-    "custom/weather": {
-        //shows the current weather and forecast
-        "tooltip" : true,
-        "format" : "{}",
-        "interval" : 30,
-        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
-        "return-type" : "json"
-    },
-    // to use the weather module replace <your_location> with your city or town
-    // note: do not use spaces: new york would be newyork
-    "custom/weather_sway": {
-        "exec": "~/.config/waybar/scripts/weather.sh <your_location>",
-        "return-type": "json",
-        "interval": 600
-    },
-    "network": {
-        "interval": 5,
-        "format-wifi": "  {essid} ({signalStrength}%)", // Icon: wifi
-        "format-ethernet": "  {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
-        "format-disconnected": "⚠  Disconnected",
-        "tooltip-format": "{ifname}: {ipaddr}",
-        "on-click": "xfce4-terminal -e 'nmtui'"
-    },
-    "network#vpn": {
-        "interface": "tun0",
-        "format": "  {essid} ({signalStrength}%)",
-        "format-disconnected": "⚠  Disconnected",
-        "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
-    },
-    "idle_inhibitor": {
-        "format": "{icon} ",
-        "format-icons":{
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-    "cpu": {
-        "interval": 10,
-        "format": " {usage}%",
-        "max-length": 10,
-        "on-click": "kitty --start-as=fullscreen --title htop sh -c 'htop'"
-    },
-    "memory": {
-        "interval": 30,
-        "format": " {}%",
-        "max-length": 10,
-        "tooltip": true,
-        "tooltip-format": "Memory - {used:0.1f}GB used",
-        "on-click": "kitty --start-as=fullscreen --title htop sh -c 'htop'"
-    },
-    "disk": {
-        "interval": 30,
-        "format": "󰋊 {percentage_used}%",
-        "path": "/",
-        "tooltip": true,
-        "tooltip-format": "HDD - {used} used out of {total} on {path} ({percentage_used}%)",
-        "on-click": "kitty --start-as=fullscreen --title htop sh -c 'htop'"
-    },
-    "temperature": {
-        "thermal-zone": 1,
-        "format": " {temperatureC}°C",
-        "format-alt-click": "click-right",
-        "format-alt": "",
-        "critical-threshold": 70,
-        "format-critical": " {temperatureC}°C",
-        "on-click": "kitty --start-as=fullscreen --title htop sh -c 'htop'"
-    },
-     "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-
-    "custom/PBPbattery": {
-        "exec": "~/.config/waybar/scripts/PBPbattery.sh",
-        "format": "{}"
-    },
-    "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-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "וֹ",
-            "headset": "  ",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": [""]
-        },
-        "on-click": "pavucontrol",
-        "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%",
-        "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%"
-    },
-    "pulseaudio_pamixer": {
-        "format": "{icon}",
-        "format-muted": "",
-        "on-click": "~/.config/waybar/scripts/volume --toggle",
-        "on-click-right": "pavucontrol",
-        "on-scroll-up": "~/.config/waybar/scripts/volume --inc",
-        "on-scroll-down": "~/.config/waybar/scripts/volume --dec",
-        "scroll-step": 1,
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "tooltip": true,
-        "tooltip-format": "{icon} at {volume}%"
-    },
-    "pulseaudio_pamixer#microphone": {
-        "format": "{format_source}",
-        "format-source": "",
-        "format-source-muted": "",
-        "on-click": "~/.config/waybar/scripts/volume --toggle-mic",
-        "on-click-right": "pavucontrol",
-        "on-scroll-up": "~/.config/waybar/scripts/volume --mic-inc",
-        "on-scroll-down": "~/.config/waybar/scripts/volume --mic-dec",
-        "scroll-step": 1,
-        "tooltip": true,
-        "tooltip-format": " at {volume}%"
-    },
-    "custom/keyboard-layout": {
-        "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
-        // Interval set only as a fallback, as the value is updated by signal
-        "interval": 30,
-        "format": "  {}", // Icon: keyboard
-        // Signal sent by Sway key binding (~/.config/sway/key-bindings)
-        "signal": 1, // SIGHUP
-        "tooltip": false,
-        "on-click": "~/.config/waybar/scripts/keyhint.sh"
-    },
-    "backlight#icon": {
-        "format": "{icon}",
-        "format-icons": [""],
-        "on-scroll-down": "brightnessctl -c backlight set 1%-",
-        "on-scroll-up": "brightnessctl -c backlight set +1%"
-    },
-
-    "backlight#value" :{
-         "format": "{percent}%",
-         "on-scroll-down": "brightnessctl -c backlight set 1%-",
-         "on-scroll-up": "brightnessctl -c backlight set +1%"
-    },
-    "tray": {
-        "icon-size": 18,
-        "spacing": 10
-    },
-    "custom/power": {
-        "format":"⏻ ",
-        "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
-        "tooltip": false
-    },
-    "custom/lock_screen": {
-        "format": "",
-        "on-click": "sh -c '(sleep 0.5s; swaylock)' & disown",
-        "tooltip": false
-    },
-    "custom/light_dark": {
-        "format": "󰐾",
-        "on-click": "~/.config/waybar/scripts/baraction light",
-        "tooltip": false
-    }
-}
--- a/dotfiles/config/waybar/config.sway
+++ b/dotfiles/config/waybar/config.sway
@@ -1,218 +0,0 @@
-// Global 
-{
-    "layer": "top",
-    "position": "top",
-
-    // If height property would be not present, it'd be calculated dynamically
-    "height": 30,
-
-    "modules-left": [
-        "custom/launcher",
-        "sway/workspaces",
-        "sway/mode",
-    ],
- 
-    "modules-center": [
-    ],
-
-    "modules-right": [
-        "network",
-        "idle_inhibitor",
-        "memory",
-        "cpu",
-        "pulseaudio",
-        "custom/keyboard-layout",
-        "battery",
-        //"custom/PBPbattery",
-        "backlight#icon",
-        "backlight#value",
-        "clock",
-        "tray",
-        //"custom/weather",
-        "custom/power",
-    ],
-
-    // Modules
-
-    "idle_inhibitor": {
-        "format": "{icon} ",
-        "format-icons":{
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-
-    "custom/PBPbattery": {
-        "exec": "~/.config/waybar/scripts/PBPbattery.sh",
-        "format": "{}",
-    },
-
-    "clock": {
-        "interval": 10,
-        "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
-        "format": "{:%H:%M}",
-        "tooltip-format": "{:%e %B %Y}"
-    },
-
-    "cpu": {
-        "interval": 5,
-        "format": "  {usage}% ({load})", // Icon: microchip
-        "states": {
-            "warning": 70,
-            "critical": 90,
-        },
-        "on-click": "xfce4-terminal -e 'htop'",
-    },
-
-    "custom/keyboard-layout": {
-        "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
-        // Interval set only as a fallback, as the value is updated by signal
-        "interval": 30,
-        "format": "  {}", // Icon: keyboard
-        // Signal sent by Sway key binding (~/.config/sway/key-bindings)
-        "signal": 1, // SIGHUP
-        "tooltip": false,
-        "on-click": "~/.config/waybar/scripts/keyhint.sh",
-    },
-
-    "memory": {
-        "interval": 5,
-        "format": " {}%", // Icon: memory
-        "on-click": "xfce4-terminal -e 'htop'", 
-        "states": {
-            "warning": 70,
-            "critical": 90
-        }
-    },
-
-    "network": {
-        "interval": 5,
-        "format-wifi": "  {essid} ({signalStrength}%)", // Icon: wifi
-        "format-ethernet": "  {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
-        "format-disconnected": "⚠  Disconnected",
-        "tooltip-format": "{ifname}: {ipaddr}",
-        "on-click": "xfce4-terminal -e 'nmtui'",
-    },
-    "network#vpn": {
-        "interface": "tun0",
-        "format": "  {essid} ({signalStrength}%)",
-        "format-disconnected": "⚠  Disconnected",
-        "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-    },
-
-    "sway/mode": {
-        "format": "{}",
-        "tooltip": false
-    },
-
-    "sway/window": {
-        "format": "{}",
-        "max-length": 120
-    },
-
-    "sway/workspaces": {
-        "disable-scroll": true,
-        "disable-markup" : false,
-        "all-outputs": true,
-        "format": "  {icon}  ",
-        //"format":"{icon}",
-        "format-icons": {
-            "1": "",
-            "2": "",
-            "3": "",
-            "4": "",
-        }
-    },
-
-    "pulseaudio": {
-        "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon}  {format_source}",
-        "format-bluetooth-muted": " {icon}  {format_source}",
-        "format-muted": "婢 {format_source}",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "וֹ",
-            "headset": "  ",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": [""]
-        },
-        "on-click": "pavucontrol",
-        "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%",
-        "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%",
-    },
-
-    // to use the weather module replace <your_location> with your city or town
-    // note: do not use spaces: new york would be newyork
-    "custom/weather": {
-        "exec": "~/.config/waybar/scripts/weather.sh <your_location>", 
-        "return-type": "json",
-        "interval": 600,
-    },
-
-    "tray": {
-        "icon-size": 18,
-        "spacing":10,
-     },
-
-    "backlight#icon": {
-        "format": "{icon}",
-        "format-icons": [""],
-        "on-scroll-down": "brightnessctl -c backlight set 1%-",
-        "on-scroll-up": "brightnessctl -c backlight set +1%"
-    },
-
-    "backlight#value" :{
-         "format": "{percent}%",
-         "on-scroll-down": "brightnessctl -c backlight set 1%-",
-         "on-scroll-up": "brightnessctl -c backlight set +1%"
-    },
-
-    "custom/firefox": {
-        "format": " ",
-        "on-click": "exec firefox",
-        "tooltip": false
-    },
-
-    "custom/terminal": {
-        "format": " ",
-        "on-click": "exec xfce4-terminal",
-        "tooltip": false
-    },
-
-    "custom/files": {
-        "format": " ",
-        "on-click": "exec thunar",
-        "tooltip": false
-    },
-
-    "custom/launcher": {
-        "format":" ",
-        "on-click": "exec wofi -c ~/.config/wofi/config -I",
-        "tooltip": false,
-    },
-
-    "custom/power": {
-        "format":"⏻",
-        "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
-        "tooltip": false,
-    },
-}
--- a/dotfiles/config/waybar/icons/brightness-100.png
+++ b/dotfiles/config/waybar/icons/brightness-100.png
--- a/dotfiles/config/waybar/icons/brightness-20.png
+++ b/dotfiles/config/waybar/icons/brightness-20.png
--- a/dotfiles/config/waybar/icons/brightness-40.png
+++ b/dotfiles/config/waybar/icons/brightness-40.png
--- a/dotfiles/config/waybar/icons/brightness-60.png
+++ b/dotfiles/config/waybar/icons/brightness-60.png
--- a/dotfiles/config/waybar/icons/brightness-80.png
+++ b/dotfiles/config/waybar/icons/brightness-80.png
--- a/dotfiles/config/waybar/icons/microphone-mute.png
+++ b/dotfiles/config/waybar/icons/microphone-mute.png
--- a/dotfiles/config/waybar/icons/microphone.png
+++ b/dotfiles/config/waybar/icons/microphone.png
--- a/dotfiles/config/waybar/icons/volume-high.png
+++ b/dotfiles/config/waybar/icons/volume-high.png
--- a/dotfiles/config/waybar/icons/volume-low.png
+++ b/dotfiles/config/waybar/icons/volume-low.png
--- a/dotfiles/config/waybar/icons/volume-mid.png
+++ b/dotfiles/config/waybar/icons/volume-mid.png
--- a/dotfiles/config/waybar/icons/volume-mute.png
+++ b/dotfiles/config/waybar/icons/volume-mute.png
--- a/dotfiles/config/waybar/mesu-met.jsonc
+++ b/dotfiles/config/waybar/mesu-met.jsonc
@@ -1,25 +0,0 @@
-{
-    "clock": {
-        "format": "{:%H:%M}",
-        "tooltip-format": "{: %A, %e %B %Y}"
-    },
-
-    "custom/weather": {
-        //shows the current weather and forecast
-        "tooltip" : true,
-        "format" : "{}",
-        "interval" : 30,
-        "exec" : "~/.config/HyprV/waybar/scripts/waybar-wttr-c.py",
-        "return-type" : "json"
-    },
-
-    "temperature": {
-        "thermal-zone": 1,
-        "format": "",
-        "format-alt-click": "click-right",
-        "format-alt": " {temperatureC}°C",
-        "critical-threshold": 70,
-        "format-critical": " {temperatureC}°C",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    }
-}
--- a/dotfiles/config/waybar/scripts/PBPbattery.sh
+++ b/dotfiles/config/waybar/scripts/PBPbattery.sh
@@ -1,21 +0,0 @@
-
-#!/bin/bash
-#simple Shellscript for waybar/i3blocks/polybar on Pinebook pro
-#05012020 geri123@gmx.net Gerhard S.
-
-PERCENT=$(cat /sys/class/power_supply/cw2015-battery/capacity)
-STATUS=$(cat /sys/class/power_supply/cw2015-battery/status)
-case $((
- $PERCENT >= 0 && $PERCENT <= 20 ? 1 :
- $PERCENT > 20 && $PERCENT <= 40 ? 2 :
- $PERCENT > 40 && $PERCENT <= 60 ? 3 :
- $PERCENT > 60 && $PERCENT <= 80 ? 4 : 5)) in
-#
-       (1) echo $STATUS:"":$PERCENT%;;
-       (2) echo $STATUS:"":$PERCENT%;;
-       (3) echo $STATUS:"":$PERCENT%;;
-       (4) echo $STATUS:"":$PERCENT%;;
-       (5) echo $STATUS:"":$PERCENT%;;
-esac
-
-
--- a/dotfiles/config/waybar/scripts/baraction
+++ b/dotfiles/config/waybar/scripts/baraction
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# Check which waybar theme is set
-THEMEIS=$(readlink -f ~/.config/waybar/style.css | cut -d '-' -f2)
-
-#if the theme is not dark then we need to switch to it
-if [ $THEMEIS != "dark.css" ]; then
-    SWITCHTO="-dark"
-fi
-
-#set the waybar theme
-ln -sf ~/.config/waybar/style/style$SWITCHTO.css ~/.config/waybar/style.css
-
-#set the wofi theme
-ln -sf ~/.config/wofi/style/style$SWITCHTO.css ~/.config/wofi/style.css
-
-#set the xfce and GTK theme
-# if [ $VER == "v4" ]; then
-#     xfconf-query -c xsettings -p /Net/IconThemeName -s "Papirus-Dark"
-#     gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark"
-# else
-#     xfconf-query -c xsettings -p /Net/IconThemeName -s "Adwaita$SWITCHTO"
-#     gsettings set org.gnome.desktop.interface icon-theme "Adwaita$SWITCHTO"
-# fi
-
-#change the background image and be cool about it ;)
-swww img ~/.config/hypr/wallpaper$SWITCHTO.jpg --transition-fps 60 --transition-type wipe --transition-duration 2
-
-#reset mako
-sleep 1
-killall -SIGUSR2 dunst
-dunst &
-
-#restart the waybar
-#killall -SIGUSR2 waybar <-- start causing web brwsers to close so switched to below...
-pkill waybar
-waybar &
-
-# bottom waybar
-#waybar --config ~/.config/waybar/config-bottom.jsonc
--- a/dotfiles/config/waybar/scripts/brightness
+++ b/dotfiles/config/waybar/scripts/brightness
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-iDIR="$HOME/.config/waybar/icons"
-
-# Get brightness
-get_backlight() {
-	LIGHT=$(printf "%.0f\n" $(brightnessctl i))
-	echo "${LIGHT}%"
-}
-
-# Get icons
-get_icon() {
-	backlight="$(brightnessctl g)"
-	current="${backlight%%%}"
-	if [[ ("$current" -ge "0") && ("$current" -le "52") ]]; then
-		icon="$iDIR/brightness-20.png"
-	elif [[ ("$current" -ge "52") && ("$current" -le "103") ]]; then
-		icon="$iDIR/brightness-40.png"
-	elif [[ ("$current" -ge "103") && ("$current" -le "155") ]]; then
-		icon="$iDIR/brightness-60.png"
-	elif [[ ("$current" -ge "155") && ("$current" -le "207") ]]; then
-		icon="$iDIR/brightness-80.png"
-	elif [[ ("$current" -ge "180") && ("$current" -le "255") ]]; then
-		icon="$iDIR/brightness-100.png"
-	fi
-}
-
-# Notify
-notify_user() {
-	notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$icon" "Brightness : $(brightnessctl g)"
-}
-
-# Increase brightness
-inc_backlight() {
-	brightnessctl set 10%+ && get_icon && notify_user
-}
-
-# Decrease brightness
-dec_backlight() {
-	brightnessctl set 10%- && get_icon && notify_user
-}
-
-# Execute accordingly
-if [[ "$1" == "--get" ]]; then
-	brightnessctl g
-elif [[ "$1" == "--inc" ]]; then
-	inc_backlight
-elif [[ "$1" == "--dec" ]]; then
-	dec_backlight
-else
-	get_backlight
-fi
--- a/dotfiles/config/waybar/scripts/keyhint.sh
+++ b/dotfiles/config/waybar/scripts/keyhint.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-yad --title="EndeavourOS Sway-WM keybindings:" --no-buttons --geometry=400x345-15-400 --list --column=key: --column=description: --column=command: "ESC" "close this app" "" "=" "modkey" "(set mod Mod4)" "+enter" "Terminal" "(xfce4-terminal)" "+d" "Application Menu" "(wofi)" "+p" "Activities" "(wofi)" "+o" "" "Open Broswer" "+n" "" "Open Files" "+q" "close focused app" "(kill)" "[Shift]+Print-key" "screenshot" "(grim)" "+Shift+e" "power-menu" "(wofi)" "+t" "open keybinding helper" "full list"
--- a/dotfiles/config/waybar/scripts/power-menu.sh
+++ b/dotfiles/config/waybar/scripts/power-menu.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-entries="Logout Suspend Reboot Shutdown"
-
-selected=$(printf '%s\n' $entries | wofi --conf=$HOME/.config/wofi/config.power --style=$HOME/.config/wofi/style.widgets.css | awk '{print tolower($1)}')
-
-case $selected in
-  logout)
-    swaymsg exit;;
-  suspend)
-    exec systemctl suspend;;
-  reboot)
-    exec systemctl reboot;;
-  shutdown)
-    exec systemctl poweroff -i;;
-esac
--- a/dotfiles/config/waybar/scripts/update-sys
+++ b/dotfiles/config/waybar/scripts/update-sys
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-# Original script by @speltriao on GitHub
-# https://github.com/speltriao/Pacman-Update-for-GNOME-Shell
-
-# If the operating system is not Arch Linux, exit the script successfully
-if [ ! -f /etc/arch-release ]; then
-    exit 0
-fi
-
-# Calculate updates for each service
-AUR=$(yay -Qua | wc -l)
-OFFICIAL=$(pacman -Qu | wc -l)
-
-# Case/switch for each service updates
-case $1 in
-    aur) echo " $AUR";;
-    official) echo " $OFFICIAL";;
-esac
-
-# If the parameter is "update", update all services
-if [ "$1" = "update" ]; then
-    kitty --title update-sys sh -c 'yay -Syu'
-fi
-
-# If there aren't any parameters, return the total number of updates
-if [ "$1" = "" ]; then
-    # Calculate total number of updates
-    COUNT=$((OFFICIAL+AUR))
-    # If there are updates, the script will output the following:   Updates
-    # If there are no updates, the script will output nothing.
-
-    if [[ "$COUNT" = "0" ]]
-    then
-        echo ""
-    else
-        # This Update symbol is RTL. So &#x202d; is left-to-right override.
-        echo " $COUNT"
-    fi
-    exit 0
-fi
--- a/dotfiles/config/waybar/scripts/volume
+++ b/dotfiles/config/waybar/scripts/volume
@@ -1,106 +0,0 @@
-#!/bin/bash
-
-iDIR="$HOME/.config/waybar/icons"
-
-# Get Volume
-get_volume() {
-	volume=$(pamixer --get-volume)
-	echo "$volume"
-}
-
-# Get icons
-get_icon() {
-	current=$(get_volume)
-	if [[ "$current" -eq "0" ]]; then
-		echo "$iDIR/volume-mute.png"
-	elif [[ ("$current" -ge "0") && ("$current" -le "30") ]]; then
-		echo "$iDIR/volume-low.png"
-	elif [[ ("$current" -ge "30") && ("$current" -le "60") ]]; then
-		echo "$iDIR/volume-mid.png"
-	elif [[ ("$current" -ge "60") && ("$current" -le "100") ]]; then
-		echo "$iDIR/volume-high.png"
-	fi
-}
-
-# Notify
-notify_user() {
-	notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$(get_icon)" "Volume : $(get_volume) %"
-}
-
-# Increase Volume
-inc_volume() {
-	pamixer -i 5 && notify_user
-}
-
-# Decrease Volume
-dec_volume() {
-	pamixer -d 5 && notify_user
-}
-
-# Toggle Mute
-toggle_mute() {
-	if [ "$(pamixer --get-mute)" == "false" ]; then
-		pamixer -m && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/volume-mute.png" "Volume Switched OFF"
-	elif [ "$(pamixer --get-mute)" == "true" ]; then
-		pamixer -u && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$(get_icon)" "Volume Switched ON"
-	fi
-}
-
-# Toggle Mic
-toggle_mic() {
-	if [ "$(pamixer --default-source --get-mute)" == "false" ]; then
-		pamixer --default-source -m && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/microphone-mute.png" "Microphone Switched OFF"
-	elif [ "$(pamixer --default-source --get-mute)" == "true" ]; then
-		pamixer -u --default-source u && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/microphone.png" "Microphone Switched ON"
-	fi
-}
-# Get icons
-get_mic_icon() {
-	current=$(pamixer --default-source --get-volume)
-	if [[ "$current" -eq "0" ]]; then
-		echo "$iDIR/microphone.png"
-	elif [[ ("$current" -ge "0") && ("$current" -le "30") ]]; then
-		echo "$iDIR/microphone.png"
-	elif [[ ("$current" -ge "30") && ("$current" -le "60") ]]; then
-		echo "$iDIR/microphone.png"
-	elif [[ ("$current" -ge "60") && ("$current" -le "100") ]]; then
-		echo "$iDIR/microphone.png"
-	fi
-}
-# Notify
-notify_mic_user() {
-	notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$(get_mic_icon)" "Mic-Level : $(pamixer --default-source --get-volume) %"
-}
-
-# Increase MIC Volume
-inc_mic_volume() {
-	pamixer --default-source -i 5 && notify_mic_user
-}
-
-# Decrease MIC Volume
-dec_mic_volume() {
-	pamixer --default-source -d 5 && notify_mic_user
-}
-
-# Execute accordingly
-if [[ "$1" == "--get" ]]; then
-	get_volume
-elif [[ "$1" == "--inc" ]]; then
-	inc_volume
-elif [[ "$1" == "--dec" ]]; then
-	dec_volume
-elif [[ "$1" == "--toggle" ]]; then
-	toggle_mute
-elif [[ "$1" == "--toggle-mic" ]]; then
-	toggle_mic
-elif [[ "$1" == "--get-icon" ]]; then
-	get_icon
-elif [[ "$1" == "--get-mic-icon" ]]; then
-	get_mic_icon
-elif [[ "$1" == "--mic-inc" ]]; then
-	inc_mic_volume
-elif [[ "$1" == "--mic-dec" ]]; then
-	dec_mic_volume
-else
-	get_volume
-fi
--- a/dotfiles/config/waybar/scripts/waybar-wttr.py
+++ b/dotfiles/config/waybar/scripts/waybar-wttr.py
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-
-import json
-import requests
-from datetime import datetime
-
-WEATHER_CODES = {
-    '113': '☀️ ',
-    '116': '⛅ ',
-    '119': '☁️ ',
-    '122': '☁️ ',
-    '143': '☁️ ',
-    '176': '🌧️',
-    '179': '🌧️',
-    '182': '🌧️',
-    '185': '🌧️',
-    '200': '⛈️ ',
-    '227': '🌨️',
-    '230': '🌨️',
-    '248': '☁️ ',
-    '260': '☁️ ',
-    '263': '🌧️',
-    '266': '🌧️',
-    '281': '🌧️',
-    '284': '🌧️',
-    '293': '🌧️',
-    '296': '🌧️',
-    '299': '🌧️',
-    '302': '🌧️',
-    '305': '🌧️',
-    '308': '🌧️',
-    '311': '🌧️',
-    '314': '🌧️',
-    '317': '🌧️',
-    '320': '🌨️',
-    '323': '🌨️',
-    '326': '🌨️',
-    '329': '❄️ ',
-    '332': '❄️ ',
-    '335': '❄️ ',
-    '338': '❄️ ',
-    '350': '🌧️',
-    '353': '🌧️',
-    '356': '🌧️',
-    '359': '🌧️',
-    '362': '🌧️',
-    '365': '🌧️',
-    '368': '🌧️',
-    '371': '❄️',
-    '374': '🌨️',
-    '377': '🌨️',
-    '386': '🌨️',
-    '389': '🌨️',
-    '392': '🌧️',
-    '395': '❄️ '
-}
-
-data = {}
-
-
-weather = requests.get("https://wttr.in/?format=j1").json()
-
-
-def format_time(time):
-    return time.replace("00", "").zfill(2)
-
-
-def format_temp(temp):
-    return (hour['FeelsLikeC']+"°").ljust(3)
-
-
-def format_chances(hour):
-    chances = {
-        "chanceoffog": "Fog",
-        "chanceoffrost": "Frost",
-        "chanceofovercast": "Overcast",
-        "chanceofrain": "Rain",
-        "chanceofsnow": "Snow",
-        "chanceofsunshine": "Sunshine",
-        "chanceofthunder": "Thunder",
-        "chanceofwindy": "Wind"
-    }
-
-    conditions = []
-    for event in chances.keys():
-        if int(hour[event]) > 0:
-            conditions.append(chances[event]+" "+hour[event]+"%")
-    return ", ".join(conditions)
-
-tempint = int(weather['current_condition'][0]['FeelsLikeC'])
-extrachar = ''
-if tempint > 0 and tempint < 10:
-    extrachar = '+'
-
-
-data['text'] = ' '+WEATHER_CODES[weather['current_condition'][0]['weatherCode']] + \
-    " "+extrachar+weather['current_condition'][0]['FeelsLikeC']+"°"
-
-data['tooltip'] = f"<b>{weather['current_condition'][0]['weatherDesc'][0]['value']} {weather['current_condition'][0]['temp_C']}°</b>\n"
-data['tooltip'] += f"Feels like: {weather['current_condition'][0]['FeelsLikeC']}°\n"
-data['tooltip'] += f"Wind: {weather['current_condition'][0]['windspeedKmph']}Km/h\n"
-data['tooltip'] += f"Humidity: {weather['current_condition'][0]['humidity']}%\n"
-for i, day in enumerate(weather['weather']):
-    data['tooltip'] += f"\n<b>"
-    if i == 0:
-        data['tooltip'] += "Today, "
-    if i == 1:
-        data['tooltip'] += "Tomorrow, "
-    data['tooltip'] += f"{day['date']}</b>\n"
-    data['tooltip'] += f"⬆️ {day['maxtempC']}° ⬇️ {day['mintempC']}° "
-    data['tooltip'] += f"🌅 {day['astronomy'][0]['sunrise']} 🌇 {day['astronomy'][0]['sunset']}\n"
-    for hour in day['hourly']:
-        if i == 0:
-            if int(format_time(hour['time'])) < datetime.now().hour-2:
-                continue
-        data['tooltip'] += f"{format_time(hour['time'])} {WEATHER_CODES[hour['weatherCode']]} {format_temp(hour['FeelsLikeC'])} {hour['weatherDesc'][0]['value']}, {format_chances(hour)}\n"
-
-
-print(json.dumps(data))
--- a/dotfiles/config/waybar/scripts/weather.sh
+++ b/dotfiles/config/waybar/scripts/weather.sh
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-LOC="$1"
-# HTML encode string as %20
-LOCATION=$(sed -e "s/ /%20/g" <<<"$LOC")
-content=$(curl -sS "https://thisdavej.azurewebsites.net/api/weather/current?loc=$LOCATION&deg=C")
-ICON=$(curl -s 'https://wttr.in/?format=1' | sed 's/[+0-9a-cA-Z°-]//g' )
-# echo $ICON
-TEMP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)"' | sed 's/"//g')
-TOOLTIP=$(echo $content | jq -r '. | "\(.temperature)°\(.degType)\n\(.skytext)"' | sed 's/"//g')
-CLASS=$(echo $content | jq .skytext)
-echo '{"text": "'$TEMP'", "tooltip": "'$ICON $TOOLTIP $LOC'", "class": '$CLASS' }'
-
--- a/dotfiles/config/waybar/style.css
+++ b/dotfiles/config/waybar/style.css
@@ -1,108 +0,0 @@
-* {
-    border: none;
-    border-radius: 0;
-    font-family: "JetBrainsMono Nerd Font";
-    font-weight: bold;
-    font-size: 16px;
-    min-height: 0;
-}
-
-window#waybar {
-    background: rgba(21, 18, 27, 0);
-    color: #f6f7fc;
-}
-
-tooltip {
-    background: #1e1e2e;
-    opacity: 0.8;
-    border-radius: 10px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: #11111b;
-}
-
-tooltip label{
-    color: #cdd6f4;
-}
-
-#workspaces button {
-    padding: 5px;
-    color: #f6f7fc;
-    margin-right: 5px;
-}
-
-#workspaces button.active {
-    color: #000000;
-    background: #a6e3a1;
-    border-radius: 10px;
-}
-
-#workspaces button:hover {
-    background: #11111b;
-    color: #cdd6f4;
-    border-radius: 10px;
-}
-
-#custom-launch_wofi,
-#custom-launch_firefox,
-#custom-launch_thunderbird,
-#custom-launch_thunar,
-#custom-launch_kitty,
-#custom-lock_screen,
-#custom-light_dark,
-#custom-power_btn,
-#custom-power_profile,
-#custom-weather,
-#custom-myhyprv,
-#window,
-#cpu,
-#disk,
-#custom-updates,
-#memory,
-#clock,
-#battery,
-#pulseaudio,
-#network,
-#tray,
-#temperature,
-#workspaces,
-#idle_inhibitor,
-#backlight {
-    background: rgba(21, 18, 27, 0);
-    opacity: 1;
-    padding: 0px 8px;
-    margin: 0px 3px;
-    border: 0px;
-}
-
-#temperature.critical {
-    color: #e92d4d;
-}
-
-#workspaces {
-    padding-right: 0px;
-    padding-left: 5px;
-}
-
-#window {
-    border-radius: 10px;
-    margin-left: 0px;
-    margin-right: 0px;
-}
-
-#custom-launch_firefox, 
-#custom-launch_thunderbird,
-#custom-launch_thunar,
-#custom-launch_wofi,
-#custom-launch_kitty,
-#custom-weather {
-    margin-left: 0px;
-    border-right: 0px;
-    font-size: 24px;
-    margin-right: 20px;
-}
-
-#custom-launch_firefox, 
-#custom-launch_kitty {
-    font-size: 20px;
-}
--- a/dotfiles/config/waybar/style/style-dark.css
+++ b/dotfiles/config/waybar/style/style-dark.css
@@ -1,108 +0,0 @@
-* {
-    border: none;
-    border-radius: 0;
-    font-family: "JetBrainsMono Nerd Font";
-    font-weight: bold;
-    font-size: 16px;
-    min-height: 0;
-}
-
-window#waybar {
-    background: rgba(21, 18, 27, 0);
-    color: #f6f7fc;
-}
-
-tooltip {
-    background: #1e1e2e;
-    opacity: 0.8;
-    border-radius: 10px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: #11111b;
-}
-
-tooltip label{
-    color: #cdd6f4;
-}
-
-#workspaces button {
-    padding: 5px;
-    color: #f6f7fc;
-    margin-right: 5px;
-}
-
-#workspaces button.active {
-    color: #000000;
-    background: #a6e3a1;
-    border-radius: 10px;
-}
-
-#workspaces button:hover {
-    background: #11111b;
-    color: #cdd6f4;
-    border-radius: 10px;
-}
-
-#custom-launch_wofi,
-#custom-launch_firefox,
-#custom-launch_thunderbird,
-#custom-launch_thunar,
-#custom-launch_kitty,
-#custom-lock_screen,
-#custom-light_dark,
-#custom-power_btn,
-#custom-power_profile,
-#custom-weather,
-#custom-myhyprv,
-#window,
-#cpu,
-#disk,
-#custom-updates,
-#memory,
-#clock,
-#battery,
-#pulseaudio,
-#network,
-#tray,
-#temperature,
-#workspaces,
-#idle_inhibitor,
-#backlight {
-    background: rgba(21, 18, 27, 0);
-    opacity: 1;
-    padding: 0px 8px;
-    margin: 0px 3px;
-    border: 0px;
-}
-
-#temperature.critical {
-    color: #e92d4d;
-}
-
-#workspaces {
-    padding-right: 0px;
-    padding-left: 5px;
-}
-
-#window {
-    border-radius: 10px;
-    margin-left: 0px;
-    margin-right: 0px;
-}
-
-#custom-launch_firefox, 
-#custom-launch_thunderbird,
-#custom-launch_thunar,
-#custom-launch_wofi,
-#custom-launch_kitty,
-#custom-weather {
-    margin-left: 0px;
-    border-right: 0px;
-    font-size: 24px;
-    margin-right: 20px;
-}
-
-#custom-launch_firefox, 
-#custom-launch_kitty {
-    font-size: 20px;
-}
--- a/dotfiles/config/waybar/style/style.css
+++ b/dotfiles/config/waybar/style/style.css
@@ -1,109 +0,0 @@
-* {
-    border: none;
-    border-radius: 0;
-    font-family: "JetBrainsMono Nerd Font";
-    font-weight: bold;
-    font-size: 16px;
-    min-height: 0;
-}
-
-window#waybar {
-    background: rgba(21, 18, 27, 0);
-    color: #f6f7fc;
-}
-
-tooltip {
-    background: #e7e7ec;
-    opacity: 0.8;
-    border-radius: 10px;
-    border-width: 2px;
-    border-style: solid;
-    border-color: #11111b;
-}
-
-tooltip label{
-    color: #2b2b2c;
-}
-
-#workspaces button {
-    padding: 5px;
-    color: #f6f7fc;
-    margin-right: 5px;
-}
-
-#workspaces button.active {
-    color: #000000;
-    background: #a6e3a1;
-    border-radius: 10px;
-}
-
-#workspaces button:hover {
-    background: #11111b;
-    color: #cdd6f4;
-    border-radius: 10px;
-}
-
-#custom-launch_wofi,
-#custom-launch_firefox,
-#custom-launch_thunderbird,
-#custom-launch_thunar,
-#custom-launch_kitty,
-#custom-lock_screen,
-#custom-light_dark,
-#custom-power_btn,
-#custom-power_profile,
-#custom-weather,
-#custom-myhyprv,
-#window,
-#cpu,
-#disk,
-#custom-updates,
-#memory,
-#clock,
-#battery,
-#pulseaudio,
-#network,
-#tray,
-#temperature,
-#workspaces,
-#idle_inhibitor,
-#backlight {
-    background: rgba(21, 18, 27, 0);
-    opacity: 0.8;
-    padding: 0px 8px;
-    margin: 0px 3px;
-    border: 0px;
-}
-
-#temperature.critical {
-    color: #e92d4d;
-}
-
-
-#workspaces {
-    padding-right: 0px;
-    padding-left: 5px;
-}
-
-#window {
-    border-radius: 10px;
-    margin-left: 20px;
-    margin-right: 20px;
-}
-
-#custom-launch_firefox, 
-#custom-launch_thunderbird,
-#custom-launch_thunar,
-#custom-launch_wofi,
-#custom-launch_kitty,
-#custom-weather {
-    margin-left: 0px;
-    border-right: 0px;
-    font-size: 24px;
-    margin-right: 20px;
-}
-
-#custom-launch_firefox, 
-#custom-launch_kitty {
-    font-size: 20px;
-}
--- a/dotfiles/config/wofi/config
+++ b/dotfiles/config/wofi/config
@@ -1,15 +0,0 @@
-width=600
-height=350
-location=center
-show=drun
-prompt=Search...
-filter_rate=100
-allow_markup=true
-no_actions=true
-halign=fill
-orientation=vertical
-content_halign=fill
-insensitive=true
-allow_images=true
-image_size=40
-gtk_dark=true
--- a/dotfiles/config/wofi/config-bmenu
+++ b/dotfiles/config/wofi/config-bmenu
@@ -1,16 +0,0 @@
-width=375
-height=450
-location=bottom_left
-show=drun
-prompt=Search...
-filter_rate=100
-allow_markup=true
-no_actions=false
-halign=fill
-orientation=vertical
-content_halign=fill
-insensitive=true
-allow_images=true
-image_size=32
-gtk_dark=true
-layer=top
--- a/dotfiles/config/wofi/config-lmenu
+++ b/dotfiles/config/wofi/config-lmenu
@@ -1,26 +0,0 @@
-show=drun
-prompt=Apps
-normal_window=false
-layer=top
-columns=4
-width=50%
-height=50%
-location=0
-orientation=vertical
-halign=fill
-line_wrap=off
-dynamic_lines=false
-allow_markup=true
-allow_images=true
-image_size=32
-exec_search=false
-hide_search=false
-parse_search=false
-insensitive=false
-hide_scroll=true
-no_actions=true
-sort_order=alphabetical
-gtk_dark=true
-filter_rate=100
-key_expand=Tab
-key_exit=Escape
--- a/dotfiles/config/wofi/style.css
+++ b/dotfiles/config/wofi/style.css
@@ -1,75 +0,0 @@
-window {
-    margin: 0px;
-    border: 5px solid #1e1e2e;
-    background-color: #cdd6f4;
-    border-radius: 15px;
-}
-
-#input {
-    padding: 4px;
-    margin: 4px;
-    padding-left: 20px;
-    border: none;
-    color: #cdd6f4;
-    font-weight: bold;
-    background-color: #1e1e2e;
-   	outline: none;
-    border-radius: 15px;
-    margin: 10px;
-    margin-bottom: 2px;
-}
-#input:focus {
-    border: 0px solid #1e1e2e;
-    margin-bottom: 0px;
-}
-
-#inner-box {
-    margin: 4px;
-    border: 10px solid #1e1e2e;
-    color: #cdd6f4;
-    font-weight: bold;
-    background-color: #1e1e2e;
-    border-radius: 15px;
-}
-
-#outer-box {
-    margin: 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #1e1e2e;
-}
-
-#scroll {
-    margin-top: 5px;
-    border: none;
-    border-radius: 15px;
-    margin-bottom: 5px;
-    /* background: rgb(255,255,255); */
-}
-
-#img:selected {
-    background-color: #89b4fa;
-    border-radius: 15px;
-}
-
-#text:selected {
-    color: #cdd6f4;
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #89b4fa;
-}
-
-#entry {
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: transparent;
-}
-
-#entry:selected {
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #89b4fa;
-}
--- a/dotfiles/config/wofi/style/style-dark.css
+++ b/dotfiles/config/wofi/style/style-dark.css
@@ -1,75 +0,0 @@
-window {
-    margin: 0px;
-    border: 5px solid #1e1e2e;
-    background-color: #cdd6f4;
-    border-radius: 15px;
-}
-
-#input {
-    padding: 4px;
-    margin: 4px;
-    padding-left: 20px;
-    border: none;
-    color: #cdd6f4;
-    font-weight: bold;
-    background-color: #1e1e2e;
-   	outline: none;
-    border-radius: 15px;
-    margin: 10px;
-    margin-bottom: 2px;
-}
-#input:focus {
-    border: 0px solid #1e1e2e;
-    margin-bottom: 0px;
-}
-
-#inner-box {
-    margin: 4px;
-    border: 10px solid #1e1e2e;
-    color: #cdd6f4;
-    font-weight: bold;
-    background-color: #1e1e2e;
-    border-radius: 15px;
-}
-
-#outer-box {
-    margin: 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #1e1e2e;
-}
-
-#scroll {
-    margin-top: 5px;
-    border: none;
-    border-radius: 15px;
-    margin-bottom: 5px;
-    /* background: rgb(255,255,255); */
-}
-
-#img:selected {
-    background-color: #89b4fa;
-    border-radius: 15px;
-}
-
-#text:selected {
-    color: #cdd6f4;
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #89b4fa;
-}
-
-#entry {
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: transparent;
-}
-
-#entry:selected {
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #89b4fa;
-}
--- a/dotfiles/config/wofi/style/style.css
+++ b/dotfiles/config/wofi/style/style.css
@@ -1,75 +0,0 @@
-window {
-    margin: 0px;
-    border: 5px solid #1e1e2e;
-    background-color: #cdd6f4;
-    border-radius: 15px;
-}
-
-#input {
-    padding: 4px;
-    margin: 4px;
-    padding-left: 20px;
-    border: none;
-    color: #1e1e2e;
-    font-weight: bold;
-    background-color: #e7e7ec;
-   	outline: none;
-    border-radius: 15px;
-    margin: 10px;
-    margin-bottom: 2px;
-}
-#input:focus {
-    border: 0px solid #1e1e2e;
-    margin-bottom: 0px;
-}
-
-#inner-box {
-    margin: 4px;
-    border: 10px solid #e7e7ec;
-    color: #1e1e2e;
-    font-weight: bold;
-    background-color: #e7e7ec;
-    border-radius: 15px;
-}
-
-#outer-box {
-    margin: 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #e7e7ec;
-}
-
-#scroll {
-    margin-top: 5px;
-    border: none;
-    border-radius: 15px;
-    margin-bottom: 5px;
-    /* background: rgb(255,255,255); */
-}
-
-#img:selected {
-    background-color: #89b4fa;
-    border-radius: 15px;
-}
-
-#text:selected {
-    color: #1e1e2e;
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #89b4fa;
-}
-
-#entry {
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: transparent;
-}
-
-#entry:selected {
-    margin: 0px 0px;
-    border: none;
-    border-radius: 15px;
-    background-color: #89b4fa;
-}
--- a/dotfiles/local/share/applications/Logseq.desktop
+++ b/dotfiles/local/share/applications/Logseq.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Logseq
+Exec=/home/lonelinster/Logseq-linux-x64-0.9.11.AppImage
+Terminal=false
+Type=Application
+Icon=~/.local/share/applications/Logseq.png
+StartupWMClass=Logseq
+X-AppImage-Version=0.9.11
+Comment=A privacy-first, open-source platform for knowledge management and collaboration.
+MimeType=x-scheme-handler/logseq
+Categories=Utility
--- a/dotfiles/local/share/applications/Logseq.png
+++ b/dotfiles/local/share/applications/Logseq.png
--- a/dotfiles/oh-my-zsh
+++ b/dotfiles/oh-my-zsh
--- a/dotfiles/software.md
+++ b/dotfiles/software.md
@@ -1,219 +0,0 @@
-# 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 htop \
-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 obsidian
-
-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 \
-notion-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
--- a/dotfiles/zsh
+++ b/dotfiles/zsh
@@ -1,152 +0,0 @@
-# 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:$HOME/.npm/bin:$PATH"
-
-# Path to your oh-my-zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
-
-# Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
-# to know which specific one was loaded, run: echo $RANDOM_THEME
-# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="zhann"
-
-# Set list of themes to pick from when loading at random
-# Setting this variable when ZSH_THEME=random will cause zsh to load
-# a theme from this variable instead of looking in $ZSH/themes/
-# If set to an empty array, this variable will have no effect.
-# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
-
-# Uncomment the following line to use case-sensitive completion.
-# CASE_SENSITIVE="true"
-
-# Uncomment the following line to use hyphen-insensitive completion.
-# Case-sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-# Uncomment one of the following lines to change the auto-update behavior
-# zstyle ':omz:update' mode disabled  # disable automatic updates
-# zstyle ':omz:update' mode auto      # update automatically without asking
-# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
-
-# Uncomment the following line to change how often to auto-update (in days).
-# zstyle ':omz:update' frequency 13
-
-# Uncomment the following line if pasting URLs and other text is messed up.
-# DISABLE_MAGIC_FUNCTIONS="true"
-
-# Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
-
-# Uncomment the following line to disable auto-setting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment the following line to enable command auto-correction.
-# ENABLE_CORRECTION="true"
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# You can also set it to another string to have that shown instead of the default red dots.
-# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
-# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
-# COMPLETION_WAITING_DOTS="true"
-
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# You can set one of the optional three formats:
-# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# or set a custom format using the strftime function format specifications,
-# see 'man strftime' for details.
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=(
-	git
-	sudo
-	F-Sy-H
-	zsh-autosuggestions
-	history-substring-search
-)
-
-source $ZSH/oh-my-zsh.sh
-
-# User configuration
-
-# export MANPATH="/usr/local/man:$MANPATH"
-
-# 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
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# proxy alias
-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
-alias dotdrop="dotdrop --cfg=~/.dotfiles/config.yaml"
-
-# config file shortcut
-alias vim="nvim"
-alias vhypr="vim ~/.config/hypr/hyprland.conf" # edit hyprland config
-alias vzsh="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="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 \
-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"
-
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,6 +1,5 @@
 # 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:$HOME/.npm/bin"

 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
@@ -72,8 +71,9 @@ ZSH_THEME="zhann"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(
-	git
+	#git
 	sudo
+	#zsh-syntax-highlighting
 	F-Sy-H
 	zsh-autosuggestions
 	history-substring-search
@@ -84,13 +84,13 @@ source $ZSH/oh-my-zsh.sh
 # User configuration

 # export MANPATH="/usr/local/man:$MANPATH"
+export PATH="/home/lonelinster/.local/bin:/home/lonelinster/.cargo/bin:$PATH"

 # You may need to manually set your language environment
 export LANG=en_US.UTF-8
 export EDITOR=nvim
-export BROWSER=microsoft-edge-stable 
+#export all_proxy=http://192.168.31.40:7890
 #export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
-export GOPROXY=https://proxy.golang.com.cn,direct

 # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
@@ -113,69 +113,25 @@ export GOPROXY=https://proxy.golang.com.cn,direct

 # 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 local network enviroment
 alias noproxy="export all_proxy=''" # cancel proxy mode

-# dordrop config file alias
 alias dotdrop="dotdrop --cfg=~/.dotfiles/config.yaml"

 # config file shortcut
 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 sz="source ~/.zshrc" # source the zshrc file

 # 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"
-
-# update system
-alias syuu="yay -Syuu"
+alias remm="remmina -c .local/share/remmina/group_rdp_nuc_43-249-192-204-45561.remmina"
+#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 nucx="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:43.249.192.204:45561 /f /sound -themes +multitouch -wallpaper"
+#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"
-alias gall="git add . && git commit -am 'update' && git push"
+alias gall="git add . && git commit -a -m 'update' && git push"

-# archlinuxcn & alhp
-#
-# Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch
-# [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 fcitx5-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-pdf-mupdf 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
--- a/endeavouros-wallpaper.png
+++ b/endeavouros-wallpaper.png
--- a/ss.yaml
+++ b/ss.yaml
Author	SHA1	Message	Date
lostecho	e833be8d41	update	2023-07-30 22:51:14 +08:00
lostecho	09661d9c94	update	2023-07-29 01:29:42 -04:00
lostecho	458ab2a644	update config file	2023-07-28 10:11:16 -04:00
lostecho	6f0d232628	update config file	2023-07-28 09:55:59 -04:00
Lostecho	952046ff32	Add files via upload	2023-07-17 09:07:06 +08:00
Lostecho	da0fb8f573	add file	2023-07-17 08:51:09 +08:00
lostecho	c101db7f84	update	2023-07-10 18:49:53 +08:00