update

2023-10-18 14:00:37 +08:00 · 2023-10-11 19:30:11 +08:00 · 2023-08-25 09:56:45 +08:00 · 2023-08-24 22:30:46 +08:00 · 2023-08-24 14:46:14 +08:00 · 2023-08-24 13:25:57 +08:00
46 changed files with 1762 additions and 1063 deletions
--- a/SimpRead/simpread.AppImage
+++ b/SimpRead/simpread.AppImage
--- a/SimpRead/simpread_config.json
+++ b/SimpRead/simpread_config.json
--- a/config.yaml
+++ b/config.yaml
@@ -23,12 +23,15 @@ dotfiles:
  d_kitty:
    src: config/kitty
    dst: ~/.config/kitty
-  d_dunst:
-    src: config/dunst
-    dst: ~/.config/dunst
  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
 profiles:
  lostecho-nuc11pahi5:
    dotfiles:
@@ -37,5 +40,6 @@ profiles:
    - d_waybar
    - d_wofi
    - d_kitty
-    - d_dunst
    - d_swaylock
+    - d_mako
+    - f_software.md
--- a/dotfiles/config/dunst/dunstrc
+++ b/dotfiles/config/dunst/dunstrc
@@ -1,461 +0,0 @@
-# See dunst(5) for all configuration options
-
-[global]
-    ### Display ###
-
-    # Which monitor should the notifications be displayed on.
-    monitor = 0
-
-    # Display notification on focused monitor.  Possible modes are:
-    #   mouse: follow mouse pointer
-    #   keyboard: follow window with keyboard focus
-    #   none: don't follow anything
-    #
-    # "keyboard" needs a window manager that exports the
-    # _NET_ACTIVE_WINDOW property.
-    # This should be the case for almost all modern window managers.
-    #
-    # If this option is set to mouse or keyboard, the monitor option
-    # will be ignored.
-    follow = none
-
-    ### Geometry ###
-
-    # dynamic width from 0 to 300
-    # width = (0, 300)
-    # constant width of 300
-    width = 500
-
-    # The maximum height of a single notification, excluding the frame.
-    height = 300
-
-    # Position the notification in the top right corner
-    origin = top-right
-
-    # Offset from the origin
-    offset = 10x10
-
-    # Scale factor. It is auto-detected if value is 0.
-    scale = 0
-
-    # Maximum number of notification (0 means no limit)
-    notification_limit = 20
-
-    ### Progress bar ###
-
-    # Turn on the progess bar. It appears when a progress hint is passed with
-    # for example dunstify -h int:value:12
-    progress_bar = true
-
-    # Set the progress bar height. This includes the frame, so make sure
-    # it's at least twice as big as the frame width.
-    progress_bar_height = 10
-
-    # Set the frame width of the progress bar
-    progress_bar_frame_width = 1
-
-    # Set the minimum width for the progress bar
-    progress_bar_min_width = 150
-
-    # Set the maximum width for the progress bar
-    progress_bar_max_width = 300
-
-    # Corner radius for the progress bar. 0 disables rounded corners.
-    progress_bar_corner_radius = 0
-
-    # Corner radius for the icon image.
-    icon_corner_radius = 8
-
-    # Show how many messages are currently hidden (because of
-    # notification_limit).
-    indicate_hidden = yes
-
-    # The transparency of the window.  Range: [0; 100].
-    # This option will only work if a compositing window manager is
-    # present (e.g. xcompmgr, compiz, etc.). (X11 only)
-    transparency = 30
-
-    # Draw a line of "separator_height" pixel height between two
-    # notifications.
-    # Set to 0 to disable.
-    # If gap_size is greater than 0, this setting will be ignored.
-    separator_height = 2
-
-    # Padding between text and separator.
-    padding = 8
-
-    # Horizontal padding.
-    horizontal_padding = 8
-
-    # Padding between text and icon.
-    text_icon_padding = 0
-
-    # Defines width in pixels of frame around the notification window.
-    # Set to 0 to disable.
-    frame_width = 3
-
-    # Defines color of the frame around the notification window.
-    frame_color = "#f5c2e7"
-
-    # Size of gap to display between notifications - requires a compositor.
-    # If value is greater than 0, separator_height will be ignored and a border
-    # of size frame_width will be drawn around each notification instead.
-    # Click events on gaps do not currently propagate to applications below.
-    gap_size = 0
-
-    # Define a color for the separator.
-    # possible values are:
-    #  * auto: dunst tries to find a color fitting to the background;
-    #  * foreground: use the same color as the foreground;
-    #  * frame: use the same color as the frame;
-    #  * anything else will be interpreted as a X color.
-    separator_color = frame
-
-    # Sort messages by urgency.
-    sort = yes
-
-    # Don't remove messages, if the user is idle (no mouse or keyboard input)
-    # for longer than idle_threshold seconds.
-    # Set to 0 to disable.
-    # A client can set the 'transient' hint to bypass this. See the rules
-    # section for how to disable this if necessary
-    # idle_threshold = 120
-
-    ### Text ###
-
-    font = JetBrains Mono Nerd Font 12
-
-    # The spacing between lines.  If the height is smaller than the
-    # font height, it will get raised to the font height.
-    line_height = 0
-
-    # Possible values are:
-    # full: Allow a small subset of html markup in notifications:
-    #        <b>bold</b>
-    #        <i>italic</i>
-    #        <s>strikethrough</s>
-    #        <u>underline</u>
-    #
-    #        For a complete reference see
-    #        <https://docs.gtk.org/Pango/pango_markup.html>.
-    #
-    # strip: This setting is provided for compatibility with some broken
-    #        clients that send markup even though it's not enabled on the
-    #        server. Dunst will try to strip the markup but the parsing is
-    #        simplistic so using this option outside of matching rules for
-    #        specific applications *IS GREATLY DISCOURAGED*.
-    #
-    # no:    Disable markup parsing, incoming notifications will be treated as
-    #        plain text. Dunst will not advertise that it has the body-markup
-    #        capability if this is set as a global setting.
-    #
-    # It's important to note that markup inside the format option will be parsed
-    # regardless of what this is set to.
-    markup = full
-
-    # The format of the message.  Possible variables are:
-    #   %a  appname
-    #   %s  summary
-    #   %b  body
-    #   %i  iconname (including its path)
-    #   %I  iconname (without its path)
-    #   %p  progress value if set ([  0%] to [100%]) or nothing
-    #   %n  progress value if set without any extra characters
-    #   %%  Literal %
-    # Markup is allowed
-    format = "<b>%s</b>\n%b"
-
-    # Alignment of message text.
-    # Possible values are "left", "center" and "right".
-    alignment = right
-
-    # Vertical alignment of message text and icon.
-    # Possible values are "top", "center" and "bottom".
-    vertical_alignment = center
-
-    # Show age of message if message is older than show_age_threshold
-    # seconds.
-    # Set to -1 to disable.
-    show_age_threshold = 60
-
-    # Specify where to make an ellipsis in long lines.
-    # Possible values are "start", "middle" and "end".
-    ellipsize = middle
-
-    # Ignore newlines '\n' in notifications.
-    ignore_newline = no
-
-    # Stack together notifications with the same content
-    stack_duplicates = true
-
-    # Hide the count of stacked notifications with the same content
-    hide_duplicate_count = false
-
-    # Display indicators for URLs (U) and actions (A).
-    show_indicators = yes
-
-    ### Icons ###
-
-    # Recursive icon lookup. You can set a single theme, instead of having to
-    # define all lookup paths.
-    enable_recursive_icon_lookup = true
-
-    # Set icon theme (only used for recursive icon lookup)
-    icon_theme = candy-icons
-    # You can also set multiple icon themes, with the leftmost one being used first.
-    # icon_theme = "Adwaita, breeze"
-
-    # Align icons left/right/top/off
-    icon_position = left
-
-    # Scale small icons up to this size, set to 0 to disable. Helpful
-    # for e.g. small files or high-dpi screens. In case of conflict,
-    # max_icon_size takes precedence over this.
-    min_icon_size = 32
-
-    # Scale larger icons down to this size, set to 0 to disable
-    max_icon_size = 64
-
-    # Paths to default icons (only neccesary when not using recursive icon lookup)
-    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
-    ### History ###
-
-    # Should a notification popped up from history be sticky or timeout
-    # as if it would normally do.
-    sticky_history = yes
-
-    # Maximum amount of notifications kept in history
-    history_length = 20
-
-    ### Misc/Advanced ###
-
-    # dmenu path.
-    dmenu = /usr/bin/dmenu -p dunst:
-
-    # Browser for opening urls in context menu.
-    browser = /usr/bin/xdg-open
-
-    # Always run rule-defined scripts, even if the notification is suppressed
-    always_run_script = true
-
-    # Define the title of the windows spawned by dunst
-    title = Dunst
-
-    # Define the class of the windows spawned by dunst
-    class = Dunst
-
-    # Define the corner radius of the notification window
-    # in pixel size. If the radius is 0, you have no rounded
-    # corners.
-    # The radius will be automatically lowered if it exceeds half of the
-    # notification height to avoid clipping text and/or icons.
-    corner_radius = 15
-
-    # Ignore the dbus closeNotification message.
-    # Useful to enforce the timeout set by dunst configuration. Without this
-    # parameter, an application may close the notification sent before the
-    # user defined timeout.
-    ignore_dbusclose = false
-
-    ### Wayland ###
-    # These settings are Wayland-specific. They have no effect when using X11
-
-    # Uncomment this if you want to let notications appear under fullscreen
-    # applications (default: overlay)
-    # layer = top
-
-    # Set this to true to use X11 output on Wayland.
-    force_xwayland = false
-
-    ### Legacy
-
-    # Use the Xinerama extension instead of RandR for multi-monitor support.
-    # This setting is provided for compatibility with older nVidia drivers that
-    # do not support RandR and using it on systems that support RandR is highly
-    # discouraged.
-    #
-    # By enabling this setting dunst will not be able to detect when a monitor
-    # is connected or disconnected which might break follow mode if the screen
-    # layout changes.
-    force_xinerama = false
-
-    ### mouse
-
-    # Defines list of actions for each mouse event
-    # Possible values are:
-    # * none: Don't do anything.
-    # * do_action: Invoke the action determined by the action_name rule. If there is no
-    #              such action, open the context menu.
-    # * open_url: If the notification has exactly one url, open it. If there are multiple
-    #             ones, open the context menu.
-    # * close_current: Close current notification.
-    # * close_all: Close all notifications.
-    # * context: Open context menu for the notification.
-    # * context_all: Open context menu for all notifications.
-    # These values can be strung together for each mouse event, and
-    # will be executed in sequence.
-    mouse_left_click = close_current
-    mouse_middle_click = do_action, close_current
-    mouse_right_click = close_all
-
-# Experimental features that may or may not work correctly. Do not expect them
-# to have a consistent behaviour across releases.
-[experimental]
-    # Calculate the dpi to use on a per-monitor basis.
-    # If this setting is enabled the Xft.dpi value will be ignored and instead
-    # dunst will attempt to calculate an appropriate dpi value for each monitor
-    # using the resolution and physical size. This might be useful in setups
-    # where there are multiple screens with very different dpi values.
-    per_monitor_dpi = false
-
-
-[urgency_low]
-    # IMPORTANT: colors have to be defined in quotation marks.
-    # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#1e1e2e"
-    foreground = "#cdd6f4"
-    frame_color = "#f5c2e7"
-    timeout = 10
-    # Icon for notifications with low urgency, uncomment to enable
-    #default_icon = /path/to/icon
-
-[urgency_normal]
-    background = "#1e1e2e"
-    foreground = "#cdd6f4"
-    frame_color = "#cba6f7"
-    timeout = 10
-    # Icon for notifications with normal urgency, uncomment to enable
-    #default_icon = /path/to/icon
-
-[urgency_critical]
-    background = "#1e1e2e"
-    foreground = "#cdd6f4"
-    frame_color = "#f38ba8"
-    timeout = 0
-    # Icon for notifications with critical urgency, uncomment to enable
-    #default_icon = /path/to/icon
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-#
-# Messages can be matched by
-#    appname (discouraged, see desktop_entry)
-#    body
-#    category
-#    desktop_entry
-#    icon
-#    match_transient
-#    msg_urgency
-#    stack_tag
-#    summary
-#
-# and you can override the
-#    background
-#    foreground
-#    format
-#    frame_color
-#    fullscreen
-#    new_icon
-#    set_stack_tag
-#    set_transient
-#    set_category
-#    timeout
-#    urgency
-#    icon_position
-#    skip_display
-#    history_ignore
-#    action_name
-#    word_wrap
-#    ellipsize
-#    alignment
-#    hide_text
-#
-# Shell-like globbing will get expanded.
-#
-# Instead of the appname filter, it's recommended to use the desktop_entry filter.
-# GLib based applications export their desktop-entry name. In comparison to the appname,
-# the desktop-entry won't get localized.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-#   script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-# Disable the transient hint so that idle_threshold cannot be bypassed from the
-# client
-#[transient_disable]
-#    match_transient = yes
-#    set_transient = no
-#
-# Make the handling of transient notifications more strict by making them not
-# be placed in history.
-#[transient_history_ignore]
-#    match_transient = yes
-#    history_ignore = yes
-
-# fullscreen values
-# show: show the notifications, regardless if there is a fullscreen window opened
-# delay: displays the new notification, if there is no fullscreen window active
-#        If the notification is already drawn, it won't get undrawn.
-# pushback: same as delay, but when switching into fullscreen, the notification will get
-#           withdrawn from screen again and will get delayed like a new notification
-#[fullscreen_delay_everything]
-#    fullscreen = delay
-#[fullscreen_show_critical]
-#    msg_urgency = critical
-#    fullscreen = show
-
-#[espeak]
-#    summary = "*"
-#    script = dunst_espeak.sh
-
-#[script-test]
-#    summary = "*script*"
-#    script = dunst_test.sh
-
-#[ignore]
-#    # This notification will not be displayed
-#    summary = "foobar"
-#    skip_display = true
-
-#[history-ignore]
-#    # This notification will not be saved in history
-#    summary = "foobar"
-#    history_ignore = yes
-
-#[skip-display]
-#    # This notification will not be displayed, but will be included in the history
-#    summary = "foobar"
-#    skip_display = yes
-
-#[signed_on]
-#    appname = Pidgin
-#    summary = "*signed on*"
-#    urgency = low
-#
-#[signed_off]
-#    appname = Pidgin
-#    summary = *signed off*
-#    urgency = low
-#
-#[says]
-#    appname = Pidgin
-#    summary = *says*
-#    urgency = critical
-#
-#[twitter]
-#    appname = Pidgin
-#    summary = *twitter.com*
-#    urgency = normal
-#
-#[stack-volumes]
-#    appname = "some_volume_notifiers"
-#    set_stack_tag = "volume"
-#
-# vim: ft=cfg
--- 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
@@ -0,0 +1,52 @@
+# 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
@@ -13,30 +13,30 @@ OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
 # autogenerated = 1 # remove this line to remove the warning

 # See https://wiki.hyprland.org/Configuring/Monitors/
-#monitor=eDP-1,1920x1080@60,0x1440,1
-#monitor=DP-1,preferred,auto,1
-monitor=DP-2,2560x1440@75,0x0,1
+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 = waybar & hyprpaper & firefox
-exec-once = waybar # status bar
-exec-once = dunst # notification daemon
-exec-once = fcitx --replace -d # input method
-# 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 # hyprland init parameter
-# exec-once = cliphist wipe # clear clipboard
-exec-once = /usr/lib/polkit-kde-authentication-agent-1 # root certifaction
-exec-once = ~/.config/hypr/scripts/bgaction # swww wallpaper
-# exec-once = wl-paste --type text --watch cliphist store
-# exec-once = wl-paste --type image --watch cliphist store
-# exec-once = hyprpaper # wallpaper
-# exec-once = ~/.config/hypr/scripts/launch_bar # status bar 
-# exec-once = nm-applet --indicator # Systray app for Network/Wifi
+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 = $HOME/.local/share/hyprload/hyprload.sh
+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
@@ -46,19 +46,22 @@ env = XCURSOR_SIZE,24

 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
+
    kb_layout = us
    kb_variant =
    kb_model =
-    kb_options =
+    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.3
+        drag_lock = yes
+        scroll_factor = 0.5
    }

    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
@@ -74,6 +77,10 @@ general {
    col.inactive_border = rgba(595959aa)

    layout = dwindle
+    cursor_inactive_timeout = 10
+    resize_on_border = true
+    extend_border_grab_area = 15
+    hover_icon_on_border = true
 }

 misc {
@@ -82,6 +89,12 @@ misc {
    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
 }


@@ -93,15 +106,20 @@ decoration {
    fullscreen_opacity=1.0

    rounding = 5
-    blur = yes
-    blur_size = 5
-    blur_passes = 2
-    blur_new_optimizations = on
+    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 {
@@ -134,76 +152,133 @@ 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 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
-windowrulev2 = opacity 1.0 1.0, class:^(Google-chrome)$
-windowrulev2 = animation popin,class:^(Google-chrome)$
-windowrulev2 = opacity 0.8 0.9,class:^(kitty)$
-windowrulev2 = animation popin,class:^(kitty)$,title:^(update-sys)$
-# windowrulev2 = animation popin,class:^(thunar)$
-# windowrulev2 = opacity 0.8 0.8,class:^(thunar)$
-windowrulev2 = animation slide,class:^(wofi)$
-windowrulev2 = move 100%-433 53,class:^(wofi)$,title:^(clippick)$
-windowrulev2 = opacity 0.8 1.0,class:^(obsidian)$
-windowrulev2 = tile,title:^(微信读书)
-
+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
-# $screen_file=~/.screenshot/screen_shot_$(date + "%Y-%m-%d_%H-%M-%S").png

 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, kitty
-bind = $mainMod, R, exec, pkill wofi; wofi --show drun
-# bind = $mainMod, E, exec, kitty ranger
-bind = $mainMod, E, exec, dolphin
-bind = $mainMod, O, exec, obsidian
-bind = $mainMod, P, exec, logseq
-bind = $mainMod, L, exec, swaylock # Lock the screen
-bind = $mainMod, G, exec, google-chrome-stable
-bind = $mainMod, C, killactive, 
-bind = $mainMod, M, exec, wlogout --protocol layer-shell # show the logout window
-bind = $mainMod, W, exec, google-chrome-stable --profile-directory=Default --app-id=magamgmomalmppfcmkgppgboggkfiphd
-# bind = $mainMod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy
-# bind = $mainMod, U, exec, grim -g "$(slurp)" - | wl-copy
-# bind = $mainMod SHIFT, U, exec, grim $screen_file
-# bind = $mainMod, Y, exec, grim -g "$(slurp)" $screen_file
-# bind = $mainMod SHIFT, Y,  exec, grim - | wl-copy
-bind = $mainMod, F, togglefloating, 
-bind = $mainMod SHIFT, P, pseudo, # dwindle
-bind = $mainMod SHIFT, J, togglesplit, # dwindle
-bind = $mainMod, Space, fullscreen
+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
+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
+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
@@ -218,13 +293,32 @@ 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
+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,       mouse:272, movewindow
+bindm = $mainMod,       mouse:273, resizewindow
+bindm = $mainMod SHIFT, mouse:272, resizewindow

 # Brightness control
-binde = $mainMod SHIFT, P, exec, brightnessctl set 5%+
-binde = $mainMod SHIFT, O, exec, brightnessctl set 5%-
+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,9 +1,10 @@
 plugins = [
-   "horriblename/hyprland-touch-gestures",
-    # Installs the plugin from https://github.com/Duckonaut/split-monitor-workspaces
    "Duckonaut/split-monitor-workspaces",
-    # A more explicit definition of the git install
-    { git = "https://github.com/Duckonaut/split-monitor-workspaces", branch = "main", name = "split-monitor-workspaces" },
-    # Installs the same plugin from a local folder
-    { local = "/home/duckonaut/repos/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
@@ -0,0 +1,145 @@
+#!/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
@@ -0,0 +1,12 @@
+$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,14 +1,17 @@
 #!/usr/bin/bash

 #start swwww
-swww query || swww init
+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 eDP-1 ~/.config/hypr/wallpaper-dark.jpg && swww img -o DP-1 ~/.config/hypr/wallpaper-dark.jpg
-else
-    swww img -o eDP-1 ~/.config/hypr/wallpaper.jpg && swww img -o DP-1 ~/.config/hypr/wallpaper.jpg
-fi
+#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
@@ -0,0 +1,14 @@
+#!/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
@@ -25,6 +25,9 @@ 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/mako/config
+++ b/dotfiles/config/mako/config
@@ -0,0 +1,22 @@
+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
@@ -0,0 +1,50 @@
+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
@@ -5,76 +5,53 @@
    "exclusive": true,
    "passthrough": false,
    "gtk-layer-shell": true,
-    "height": 50,
-    "modules-left": ["custom/launch_wofi","wlr/workspaces","cpu","memory","disk","hyprland/window"],
-    "modules-center": ["custom/lock_screen","custom/updates","clock","custom/power_btn"],
-    "modules-right": ["temperature","custom/power_profile","battery","backlight","pulseaudio","pulseaudio#microphone","tray","custom/weather","custom/light_dark"],
-    
-    "hyprland/window": {
-        "format": "{}"
-    },
+    "height": 30,
+    "modules-left": [
+        "custom/launcher",
+        "wlr/workspaces",
+        "custom/playerctl",
+        "custom/playerlabel"
+    ],
+    "modules-center": [
+        "hyprland/window",
+        "wlr/taskbar"

-    "custom/launch_wofi": {
-        "format": "",
-        "on-click": "pkill wofi; wofi -n",
+    ],
+    "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
    },
-
-    "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
-    },
-
-    "custom/power_btn": {
-        "format": "",
-        "on-click": "sh -c '(sleep 0.5s; wlogout --protocol layer-shell)' & disown",
-        "tooltip": false
-    },
-
-    "cpu": {
-        "interval": 10,
-        "format": " {usage}%",
-        "max-length": 10,
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    },
-
-    "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 btop sh -c 'btop'"
-    },
-
-    "memory": {
-        "interval": 30,
-        "format": " {}%",
-        "max-length": 10,
-        "tooltip": true,
-        "tooltip-format": "Memory - {used:0.1f}GB used",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    },
-
-    "custom/updates": {
-        "format": "{}",
-        "exec": "~/.config/waybar/scripts/update-sys",
-        "on-click": "~/.config/waybar/scripts/update-sys update",
-        "interval": 300,
-        "tooltip": true
-    },
-
    "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": [],
@@ -88,17 +65,61 @@
            "10": []
        }
    },
-    
-    "custom/power_profile": {
-        //shows the current power profile and switches to next on click
-        "exec": "asusctl profile -p | sed s:'Active profile is'::",
-        "interval": 30,
-        "format": "󰈐{}", 
-        "on-click": "asusctl profile -n; pkill -SIGRTMIN+8 waybar",
-        "signal": 8
+    "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/weather": {
+    "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" : "{}",
@@ -106,48 +127,112 @@
        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
        "return-type" : "json"
    },
-
-    "tray": {
-        "icon-size": 18,
-        "spacing": 10
+    // 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
    },
-
-    "clock": {
-        "format": "{:%I:%M %p}",
+    "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": "{: %A, %B %e %Y}"
+        "tooltip-format": "Memory - {used:0.1f}GB used",
+        "on-click": "kitty --start-as=fullscreen --title htop sh -c 'htop'"
    },
-
-    "backlight": {
-        "device": "intel_backlight",
-        "format": "{icon} {percent}%",
-        "format-icons": ["", "", ""],
-        "on-scroll-up": "brightnessctl set 1%+",
-        "on-scroll-down": "brightnessctl set 1%-",
-        "min-length": 6
+    "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'"
    },
-
-    "battery": {
+    "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,
+            // "good": 95,
            "warning": 30,
-            "critical": 20
+            "critical": 15
        },
-        "format": "{icon} {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
-        "format-alt": "{time} {icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", "", "", ""]
+        "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": "pamixer -t",
+        "on-click": "~/.config/waybar/scripts/volume --toggle",
        "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer -i 5",
-        "on-scroll-down": "pamixer -d 5",
-        "scroll-step": 5,
+        "on-scroll-up": "~/.config/waybar/scripts/volume --inc",
+        "on-scroll-down": "~/.config/waybar/scripts/volume --dec",
+        "scroll-step": 1,
        "format-icons": {
            "headphone": "",
            "hands-free": "",
@@ -156,25 +241,61 @@
            "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%"
    },

-    "pulseaudio#microphone": {
-        "format": "{format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "",
-        "on-click": "pamixer --default-source -t",
-        "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer --default-source -i 5",
-        "on-scroll-down": "pamixer --default-source -d 5",
-        "scroll-step": 5
+    "backlight#value" :{
+         "format": "{percent}%",
+         "on-scroll-down": "brightnessctl -c backlight set 1%-",
+         "on-scroll-up": "brightnessctl -c backlight set +1%"
    },
-    
-    "temperature": {
-        "thermal-zone": 1,
-        "format": " {temperatureC}°C",
-        "critical-threshold": 70,
-        "format-critical": " {temperatureF}°F",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
+    "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.jsonc.bak
+++ b/dotfiles/config/waybar/config.jsonc.bak
@@ -1,180 +0,0 @@
-{
-    "layer": "top",
-    "position": "top",
-    "mod": "dock",
-    "exclusive": true,
-    "passthrough": false,
-    "gtk-layer-shell": true,
-    "height": 50,
-    "modules-left": ["custom/launch_wofi","wlr/workspaces","cpu","memory","disk","hyprland/window"],
-    "modules-center": ["custom/lock_screen","custom/updates","clock","custom/power_btn"],
-    "modules-right": ["temperature","custom/power_profile","battery","backlight","pulseaudio","pulseaudio#microphone","tray","custom/weather","custom/light_dark"],
-    
-    "hyprland/window": {
-        "format": "{}"
-    },
-
-    "custom/launch_wofi": {
-        "format": "",
-        "on-click": "pkill wofi; wofi -n",
-        "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
-    },
-
-    "custom/power_btn": {
-        "format": "",
-        "on-click": "sh -c '(sleep 0.5s; wlogout --protocol layer-shell)' & disown",
-        "tooltip": false
-    },
-
-    "cpu": {
-        "interval": 10,
-        "format": " {usage}%",
-        "max-length": 10,
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    },
-
-    "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 btop sh -c 'btop'"
-    },
-
-    "memory": {
-        "interval": 30,
-        "format": " {}%",
-        "max-length": 10,
-        "tooltip": true,
-        "tooltip-format": "Memory - {used:0.1f}GB used",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    },
-
-    "custom/updates": {
-        "format": "{}",
-        "exec": "~/.config/waybar/scripts/update-sys",
-        "on-click": "~/.config/waybar/scripts/update-sys update",
-        "interval": 300,
-        "tooltip": true
-    },
-
-    "wlr/workspaces": {
-        "disable-scroll": true,
-        "all-outputs": true,
-        "on-click": "activate",
-        "persistent_workspaces": {
-            "1": [],
-            "2": [],
-            "3": [],
-            "4": [],
-            "5": [],
-            "6": [],
-            "7": [],
-            "8": [],
-            "9": [],
-            "10": []
-        }
-    },
-    
-    "custom/power_profile": {
-        //shows the current power profile and switches to next on click
-        "exec": "asusctl profile -p | sed s:'Active profile is'::",
-        "interval": 30,
-        "format": "󰈐{}", 
-        "on-click": "asusctl profile -n; pkill -SIGRTMIN+8 waybar",
-        "signal": 8
-    },
-
-   "custom/weather": {
-        //shows the current weather and forecast
-        "tooltip" : true,
-        "format" : "{}",
-        "interval" : 30,
-        "exec" : "~/.config/waybar/scripts/waybar-wttr.py",
-        "return-type" : "json"
-    },
-
-    "tray": {
-        "icon-size": 18,
-        "spacing": 10
-    },
-
-    "clock": {
-        "format": "{:%I:%M %p}",
-        "tooltip": true,
-        "tooltip-format": "{: %A, %B %e %Y}"
-    },
-
-    "backlight": {
-        "device": "intel_backlight",
-        "format": "{icon} {percent}%",
-        "format-icons": ["", "", ""],
-        "on-scroll-up": "brightnessctl set 1%+",
-        "on-scroll-down": "brightnessctl set 1%-",
-        "min-length": 6
-    },
-
-    "battery": {
-        "states": {
-            "good": 95,
-            "warning": 30,
-            "critical": 20
-        },
-        "format": "{icon} {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
-        "format-alt": "{time} {icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", "", "", ""]
-    },
-
-    "pulseaudio": {
-        "format": "{icon} {volume}%",
-        "format-muted": "",
-        "on-click": "pamixer -t",
-        "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer -i 5",
-        "on-scroll-down": "pamixer -d 5",
-        "scroll-step": 5,
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        }
-    },
-
-    "pulseaudio#microphone": {
-        "format": "{format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "",
-        "on-click": "pamixer --default-source -t",
-        "on-click-right": "pavucontrol",
-        "on-scroll-up": "pamixer --default-source -i 5",
-        "on-scroll-down": "pamixer --default-source -d 5",
-        "scroll-step": 5
-    },
-    
-    "temperature": {
-        "thermal-zone": 1,
-        "format": " {temperatureC}°C",
-        "critical-threshold": 70,
-        "format-critical": " {temperatureF}°F",
-        "on-click": "kitty --start-as=fullscreen --title btop sh -c 'btop'"
-    }
-}
--- a/dotfiles/config/waybar/config.sway
+++ b/dotfiles/config/waybar/config.sway
@@ -0,0 +1,218 @@
+// 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
@@ -0,0 +1,25 @@
+{
+    "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
@@ -0,0 +1,21 @@
+
+#!/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
@@ -14,19 +14,27 @@ 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 theme
-xfconf-query -c xsettings -p /Net/ThemeName -s "Adwaita$SWITCHTO"
-xfconf-query -c xsettings -p /Net/IconThemeName -s "Adwaita$SWITCHTO"
-
-#set the GTK theme
-gsettings set org.gnome.desktop.interface gtk-theme "Adwaita$SWITCHTO"
-gsettings set org.gnome.desktop.interface icon-theme "Adwaita$SWITCHTO"
+#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

-#update the sddm image
-ln -sf /usr/share/sddm/themes/sdt/Backgrounds/wallpaper$SWITCHTO.jpg /usr/share/sddm/themes/sdt/wallpaper.jpg
+#reset mako
+sleep 1
+killall -SIGUSR2 dunst
+dunst &

 #restart the waybar
-killall -SIGUSR2 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
@@ -0,0 +1,52 @@
+#!/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
@@ -0,0 +1,2 @@
+#!/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
@@ -0,0 +1,16 @@
+#!/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/volume
+++ b/dotfiles/config/waybar/scripts/volume
@@ -0,0 +1,106 @@
+#!/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/weather.sh
+++ b/dotfiles/config/waybar/scripts/weather.sh
@@ -0,0 +1,13 @@
+#!/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
@@ -9,7 +9,7 @@

 window#waybar {
    background: rgba(21, 18, 27, 0);
-    color: #cdd6f4;
+    color: #f6f7fc;
 }

 tooltip {
@@ -27,22 +27,12 @@ tooltip label{

 #workspaces button {
    padding: 5px;
-    color: #313244;
+    color: #f6f7fc;
    margin-right: 5px;
 }

 #workspaces button.active {
-    color: #a6adc8;
-}
-
-#workspaces button.focused {
-    color: #a6adc8;
-    background: #eba0ac;
-    border-radius: 10px;
-}
-
-#workspaces button.urgent {
-    color: #11111b;
+    color: #000000;
    background: #a6e3a1;
    border-radius: 10px;
 }
@@ -54,11 +44,16 @@ tooltip label{
 }

 #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,
@@ -71,65 +66,43 @@ tooltip label{
 #tray,
 #temperature,
 #workspaces,
+#idle_inhibitor,
 #backlight {
-    background: #1e1e2e;
-    opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
+    background: rgba(21, 18, 27, 0);
+    opacity: 1;
+    padding: 0px 8px;
+    margin: 0px 3px;
    border: 0px;
 }

-#tray, #custom-lock_screen, #temperature, #backlight, #custom-launch_wofi, #cpu {
-    border-radius: 10px 0px 0px 10px;
-}
-
-#custom-light_dark, #custom-power_btn, #workspaces, #pulseaudio.microphone, #battery, #disk {
-    border-radius: 0px 10px 10px 0px;
-    margin-right: 10px;
-}
-
 #temperature.critical {
    color: #e92d4d;
 }

-
 #workspaces {
    padding-right: 0px;
    padding-left: 5px;
 }

-#custom-power_profile {
-    color: #a6e3a1;
-    border-left: 0px;
-    border-right: 0px;
-}
-
 #window {
    border-radius: 10px;
-    margin-left: 20px;
+    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_wofi {
-    color: #89b4fa;
-    margin-left: 10px;
-    border-right: 0px;
+#custom-launch_firefox, 
+#custom-launch_kitty {
+    font-size: 20px;
 }
-
-#pulseaudio {
-    color: #89b4fa;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: #cba6f7;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#battery {
-    color: #a6e3a1;
-    border-left: 0px;
-}
--- a/dotfiles/config/waybar/style/style-dark.css
+++ b/dotfiles/config/waybar/style/style-dark.css
@@ -9,7 +9,7 @@

 window#waybar {
    background: rgba(21, 18, 27, 0);
-    color: #cdd6f4;
+    color: #f6f7fc;
 }

 tooltip {
@@ -27,22 +27,12 @@ tooltip label{

 #workspaces button {
    padding: 5px;
-    color: #313244;
+    color: #f6f7fc;
    margin-right: 5px;
 }

 #workspaces button.active {
-    color: #a6adc8;
-}
-
-#workspaces button.focused {
-    color: #a6adc8;
-    background: #eba0ac;
-    border-radius: 10px;
-}
-
-#workspaces button.urgent {
-    color: #11111b;
+    color: #000000;
    background: #a6e3a1;
    border-radius: 10px;
 }
@@ -54,11 +44,16 @@ tooltip label{
 }

 #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,
@@ -71,65 +66,43 @@ tooltip label{
 #tray,
 #temperature,
 #workspaces,
+#idle_inhibitor,
 #backlight {
-    background: #1e1e2e;
-    opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
+    background: rgba(21, 18, 27, 0);
+    opacity: 1;
+    padding: 0px 8px;
+    margin: 0px 3px;
    border: 0px;
 }

-#tray, #custom-lock_screen, #temperature, #backlight, #custom-launch_wofi, #cpu {
-    border-radius: 10px 0px 0px 10px;
-}
-
-#custom-light_dark, #custom-power_btn, #workspaces, #pulseaudio.microphone, #battery, #disk {
-    border-radius: 0px 10px 10px 0px;
-    margin-right: 10px;
-}
-
 #temperature.critical {
    color: #e92d4d;
 }

-
 #workspaces {
    padding-right: 0px;
    padding-left: 5px;
 }

-#custom-power_profile {
-    color: #a6e3a1;
-    border-left: 0px;
-    border-right: 0px;
-}
-
 #window {
    border-radius: 10px;
-    margin-left: 20px;
+    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_wofi {
-    color: #89b4fa;
-    margin-left: 10px;
-    border-right: 0px;
+#custom-launch_firefox, 
+#custom-launch_kitty {
+    font-size: 20px;
 }
-
-#pulseaudio {
-    color: #89b4fa;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: #cba6f7;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#battery {
-    color: #a6e3a1;
-    border-left: 0px;
-}
--- a/dotfiles/config/waybar/style/style.css
+++ b/dotfiles/config/waybar/style/style.css
@@ -9,11 +9,11 @@

 window#waybar {
    background: rgba(21, 18, 27, 0);
-    color: #2b2b2c;
+    color: #f6f7fc;
 }

 tooltip {
-    background: #e7e7ec;;
+    background: #e7e7ec;
    opacity: 0.8;
    border-radius: 10px;
    border-width: 2px;
@@ -27,22 +27,12 @@ tooltip label{

 #workspaces button {
    padding: 5px;
-    color: #313244;
+    color: #f6f7fc;
    margin-right: 5px;
 }

 #workspaces button.active {
-    color: #a6adc8;
-}
-
-#workspaces button.focused {
-    color: #a6adc8;
-    background: #eba0ac;
-    border-radius: 10px;
-}
-
-#workspaces button.urgent {
-    color: #11111b;
+    color: #000000;
    background: #a6e3a1;
    border-radius: 10px;
 }
@@ -54,11 +44,16 @@ tooltip label{
 }

 #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,
@@ -71,24 +66,15 @@ tooltip label{
 #tray,
 #temperature,
 #workspaces,
+#idle_inhibitor,
 #backlight {
-    background: #e7e7ec;
+    background: rgba(21, 18, 27, 0);
    opacity: 0.8;
-    padding: 0px 10px;
-    margin: 3px 0px;
-    margin-top: 10px;
+    padding: 0px 8px;
+    margin: 0px 3px;
    border: 0px;
 }

-#tray, #custom-lock_screen, #temperature, #backlight, #custom-launch_wofi, #cpu {
-    border-radius: 10px 0px 0px 10px;
-}
-
-#custom-light_dark, #custom-power_btn, #workspaces, #pulseaudio.microphone, #battery, #disk{
-    border-radius: 0px 10px 10px 0px;
-    margin-right: 10px;
-}
-
 #temperature.critical {
    color: #e92d4d;
 }
@@ -99,37 +85,25 @@ tooltip label{
    padding-left: 5px;
 }

-#custom-power_profile {
-    color: #1d7715;
-    border-left: 0px;
-    border-right: 0px;
-}
-
 #window {
    border-radius: 10px;
    margin-left: 20px;
    margin-right: 20px;
 }

-#custom-launch_wofi {
-    color: #407cdd;
-    margin-left: 10px;
+#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;
 }

-#pulseaudio {
-    color: #407cdd;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#pulseaudio.microphone {
-    color: #ad6bfd;
-    border-left: 0px;
-    border-right: 0px;
-}
-
-#battery {
-    color: #1d7715;
-    border-left: 0px;
-}
+#custom-launch_firefox, 
+#custom-launch_kitty {
+    font-size: 20px;
+}
--- a/dotfiles/config/wofi/config-bmenu
+++ b/dotfiles/config/wofi/config-bmenu
@@ -0,0 +1,16 @@
+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
@@ -0,0 +1,26 @@
+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/software.md
+++ b/dotfiles/software.md
@@ -0,0 +1,219 @@
+# the Software of ArchLinux
+
+## install some necessary software
+
+### after arch install finish
+
+1. edit the pacman config file in `/etc/pacman.conf`
+
+```bash
+sudo nano /etc/pacman.conf
+
+# add to the last of the file
+---------------------------------------------------------------
+[archlinuxcn]
+Server = https://mirrors.tuna.tsinghua.edu.cn/archlinuxcn/$arch
+---------------------------------------------------------------
+
+```
+
+2. import GPG key
+
+```bash
+sudo pacman -S archlinuxcn-keyring
+```
+
+3. install yay & paru & other
+
+```bash
+sudo pacman -S yay paru base-devel neovim 
+```
+
+4. clone config file repository
+
+```bash
+git clone https://github.com/IHHII/.dotfiles.git
+git checkout -b altas origin/altas
+```
+
+5. cancel the sudo password and change the environment variable
+
+```bash
+sudo su
+nvim /etc/sudoers.d/10-installer
+
+# change file to this #
+--------------------------------
+%wheel ALL=(ALL) ALL
+%lostecho ALL=(ALL) NOPASSWD:ALL
+--------------------------------
+
+nvim /etc/environment
+
+# change the environment in it #
+--------------------------------
+BROWSER=microsoft-edge-stable 
+EDITOR=nvim
+--------------------------------
+
+```
+
+6. add the alhp source
+
+- check and install keyring & mirrorlist
+
+```bash
+/lib/ld-linux-x86-64.so.2 --help
+yay -S alhp-keyring alhp-mirrorlist
+```
+
+- add following source to `/etc/pacman.conf`
+
+
+```bash
+nvim /etc/pacman.conf
+
+# add before [core] mirror #
+----------------------------------------
+[core-x86-64-v3]
+Include = /etc/pacman.d/alhp-mirrorlist
+
+[extra-x86-64-v3]
+Include = /etc/pacman.d/alhp-mirrorlist
+
+#[community-x86-64-v3]
+#Include = /etc/pacman.d/alhp-mirrorlist
+----------------------------------------
+```
+
+- update software
+
+```bash
+sudo pacman -Syuu
+```
+
+7. oh-my-zsh setup
+
+- use script to install oh-my-zsh
+
+```bash
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+git clone https://github.com/z-shell/F-Sy-H.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/F-Sy-H
+```
+
+- replace `.zshrc` file
+
+```zsh
+yay -S dotdrop 
+dotdrop --cfg=~/.dotfiles/config.yaml install
+source ~/.zshrc
+
+```
+
+### install desktop environment
+
+1. install hyprland
+
+```zsh
+sudo pacman -S \
+hyprland xdg-desktop-portal-hyprland wofi \
+kitty mako swaylock-effects udiskie thunar 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
@@ -0,0 +1,152 @@
+# 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,5 +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:$HOME/.npm/bin"

 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
@@ -73,7 +74,6 @@ ZSH_THEME="zhann"
 plugins=(
 	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/lostecho/.local/bin:/home/lostecho/.cargo/bin:$PATH"

 # You may need to manually set your language environment
 export LANG=en_US.UTF-8
-export EDITOR=vim
-#export all_proxy=http://192.168.31.40:7890
+export EDITOR=nvim
+export BROWSER=microsoft-edge-stable 
 #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,45 +113,69 @@ export EDITOR=vim

 # 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 vhypr="vim ~/.config/hypr/hyprland.conf" # edit hyprland config
-alias vzsh="vim ~/.zshrc" # edit zsh config
+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

-# quick command
-alias pdf="zathura"
-
 # remotedesktop
-alias nuc="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:NUC /f"
-#alias nuc="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:192.168.31.139 /f"
-alias nucs="xfreerdp /u:752549025@qq.com /p:nebkij-xevkec-Zyvha9 /v:rdp.chipdale.top /f"
+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"

-# pacman command
-#alias pins="sudo pacman -S"
-#alias psea="sudo pacman -Ss"
-#alias puni="sudo pacman -Rsn"
-alias yins="yay -S"
-alias ysea="yay -Ss"
-alias yuni="yay -Rsn"
-alias pins="paru -S"
-alias psea="paru -Ss"
-alias puni="paru -Rsn"
-alias psyuu="paru -Syuu"
+# update system
+alias syuu="yay -Syuu"

-# install software
-alias installaur="sudo pacman -S yay paru"
-alias installinput="sudo pacman -S wqy-microhei fcitx5-im fcitx5-chinese-addons fcitx5-material-color && yay -S fcitx5-input-support"
-alias installhyprland="yay -S hyprland-git kitty hyprpaper dunst polkit-kde-agent swww-git wlogout swaylock-effects ranger ttf-jetbrains-mono-nerd noto-fonts-emoji && paru -S waybar-hyprland wofi"
-alias installnotes="yay -S logseq-desktop obsidian-appimage zathura zathura-pdf-mupdf"
-alias installsddm="yay -S sddm sddm-sugar-candy-git"
-alias inatallother="yay -S blueman nm-connection-editor xf86-video-intel 7-zip-full neofetch acpilight google-chrome"
-alias installcode="sudo pacman -S ruby go jdk17-openjdk python-pip npm clang cargo"
+# git alias
+alias gup="git pull --rebase"
+alias gall="git add . && git commit -am 'update' && git push"

-# read books
-alias jvm=""
-alias java8sz=""
-alias postgresql=""
+# 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
Author	SHA1	Message	Date
lostecho	eba81d9d56	update	2023-10-18 14:00:37 +08:00
lostecho	ae9e09ec1e	update	2023-10-11 19:30:11 +08:00
lostecho	dd46377610	update	2023-08-25 09:56:45 +08:00
lostecho	23303fd746	update	2023-08-24 22:30:46 +08:00
lostecho	d4a4ddf595	update	2023-08-24 14:46:14 +08:00
lostecho	761353954e	update	2023-08-24 13:25:57 +08:00
lostecho	7e7071cb8f	update	2023-08-24 12:46:52 +08:00
lostecho	62e409c361	update	2023-08-23 14:02:21 +08:00
lostecho	5cb0511f45	update	2023-08-23 11:32:54 +08:00
lostecho	c2cc261e66	update	2023-08-22 23:02:49 +08:00
Lostecho	d6dccb032f	update config file	2023-07-20 21:19:25 +08:00
Lostecho	66d565bd41	update config file	2023-07-20 18:30:52 +08:00
Lostecho	90c0c86ccf	update config file	2023-07-20 17:18:44 +08:00
lostecho	2b48086b22	update	2023-07-17 16:46:09 +08:00
Lostecho	86f17a0066	update config file	2023-07-16 11:56:08 +08:00
Lostecho	cf582a0709	update config file	2023-07-16 11:10:14 +08:00
lostecho	92d86f879e	update config file	2023-07-15 16:07:30 +08:00
lostecho	454a37131d	update	2023-07-14 20:23:01 +08:00
lostecho	d663ff61d0	update config	2023-07-14 18:15:31 +08:00
lostecho	e63470c4e7	update config	2023-07-13 14:12:12 +08:00
lostecho	90c639eb7e	update config	2023-07-13 11:39:42 +08:00
lostecho	03bf90b561	update config	2023-07-12 21:46:42 +08:00
lostecho	7886b23099	update config	2023-07-12 21:18:59 +08:00
lostecho	ec395e9a08	update config file	2023-07-12 15:41:39 +08:00