merge latest

README.md

@@ -19,9 +19,9 @@ This is basically per user!
 
 ```bash
 $ sudo pacman -Syu git
-$ git clone --depth 1 https://gitea.nevaforget.de/dom/monarchos ~/.monarchos
+$ git clone --depth 1 https://gitea.moonarch.de/nevaforget/hyprmoonarch ~/.monarchos
 $ cd ~/.monarchos
-$ ./setup.sh
+$ ./stower.sh
 ```
 
 ## Installation Stages

TODO.md

@@ -1,2 +1,5 @@
 - move volnote / capsnote to usr
 - move rofi from ~/.config/rofi to /usr/share/rofi
+
+- https://wiki.archlinux.de/title/Cpupower
+	- load kernel modul based on architecture

home/.zshrc

@@ -1,47 +1,86 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Lines configured by zsh-newuser-install
-# Initialization code that may require console input (password prompts, [y/n]
+HISTFILE=~/.histfile
-# confirmations, etc.) must go above this block; everything else may go below.
+HISTSIZE=1000
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+SAVEHIST=1000
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+setopt autocd nomatch notify appendhistory sharehistory hist_ignore_space hist_ignore_all_dups hist_save_no_dups hist_find_no_dups
-fi
+unsetopt beep extendedglob
+bindkey -e
+# End of lines configured by zsh-newuser-install
+# The following lines were added by compinstall
+zstyle :compinstall filename '/home/dom/.zshrc'
 
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+autoload -Uz compinit
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+compinit
+# End of lines added by compinstall
+
+parse_git_branch() {
+  local branch=""
+  branch=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
+  local git_status=$(git status --porcelain 2>/dev/null)
+  local color=green
+  if echo "$git_status" | grep -q "^ M"; then
+    color=yellow
+    branch="${branch}*"
+  fi
+  if echo "$git_status" | grep -qE "^ A|^\?\?"; then
+    color=yellow
+    branch="${branch}+"
+  fi
+  if echo "$git_status" | grep -q "^ D"; then
+    color=yellow
+    branch="${branch}-"
+  fi
+
+  if [[ -n "$branch" ]]; then
+    branch=[%F{${color}}${branch}%F{reset}]
+  fi
+  echo " $branch"
+}
+
+precmd() { 
+  print "" 
+  print -rP "%F{#b4befe}%B%n@%m%b %2~%F{#f5e0dc}$(parse_git_branch)%f" 
+}
+# PS1="%F{#008000}%B%n@%m%b %K{#3a3a3a}%1~%k:%f"
+PROMPT="%B%F{#b4befe}$%f%b "
+RPROMPT="%F{241}%B%T%b%f"
 
 # set PATH so it includes user's private ~/.local/bin if it exists
 if [ -d "$HOME/.local/bin" ] ; then
     PATH="$HOME/.local/bin:$PATH"
 fi
 
-HISTFILE=~/.histfile
+# Key bindings
-HISTSIZE=1000
-SAVEHIST=1000
-
-TERM_ID=(ps -o 'ppid=' -p $$)
-TERM_NAME=(ps -o 'cmd=' -p $TERM_ID)
-if [[ "$TERM_NAME" = "kitty" ]]; then
-    alias ssh="kitty +kitten ssh"
-else
-    alias ssh="TERM=xterm-256color ssh"
-fi
-alias fl='lsd -l -h -1 --group-dirs first -X --config-file ~/.config/lsd/config.yaml'
-alias orphans='[[ -n $(pacman -Qdt) ]] && sudo pacman -Rs $(pacman -Qdtq) || echo "no orphans to remove"'
-
 bindkey  "^[[3~"  delete-char
 bindkey  "^[[H"   beginning-of-line
 bindkey  "^[[F"   end-of-line
 bindkey "^[[1;5C" forward-word
 bindkey "^[[1;5D" backward-word
 
-plugins=(zsh-interactive-cd git aliases docker archlinux sudo vscode)
+# Aliases
+alias ssh="TERM=xterm-256color ssh"
+#alias fl='lsd -l -h -1 --group-dirs first -X --config-file ~/.config/lsd/config.yaml'
+alias orphans='[[ -n $(pacman -Qdt) ]] && sudo pacman -Rs $(pacman -Qdtq) || echo "no orphans to remove"'
+alias ls='exa --icons --color=always --group-directories-first'
+alias ll='exa -alF --icons --color=always --group-directories-first'
+alias la='exa -a --icons --color=always --group-directories-first'
+alias l='exa -F --icons --color=always --group-directories-first'
 
-export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+# FZF
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+eval "$(fzf --zsh)"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+export FZF_DEFAULT_COMMAND="fd --hidden --strip-cwd-prefix --exclude .git"
+export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
+export FZF_ALT_C_COMMAND="fd --type=d --hidden --strip-cwd-prefix --exclude .git"
+export FZF_DEFAULT_OPTS="--height 50% --layout=default --border --color=hl:#2dd4bf"
 
-source /usr/share/oh-my-zsh/oh-my-zsh.sh
+# FZF Previews
-source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/powerlevel10k/powerlevel10k.zsh-theme
+export FZF_CTRL_T_OPTS="--preview 'bat --color=always -n --line-range :500 {}'"
+export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'"
+
+# Plugins
 source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
-eval "$(fzf --zsh)"
+export SUDOEDITOR="vim"
+export EDITOR="vim"

home/config/gtk-3.0/settings.ini

@@ -1,6 +1,6 @@
 [Settings]
 gtk-theme-name=catppuccin-mocha-lavender-standard+default
-gtk-icon-theme-name=Tela-circle-purple-dark
+gtk-icon-theme-name=Newaita-reborn-dracula-dark
 gtk-font-name=Hack Nerd Font 11
 gtk-cursor-theme-name=Sweet-cursors
 gtk-cursor-theme-size=24

home/config/hypr/hl-autostart.conf

@@ -4,7 +4,7 @@
 
 # Execute your favorite apps at launch
 #exec-once = hyprctl plugin load /usr/lib/libhycov.so
-exec-once = hyprpm reload -n
+#exec-once = hyprpm reload -n
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = ~/.config/hypr/xdg-portal-hyprland
@@ -27,4 +27,6 @@ exec-once = hypridle
 exec = hyprshade off
 
 # exec-once = sway-audio-idle-inhibit
-#exec-once = xdg-mime default pcmanfm.desktop inode/directory
+exec-once = xdg-mime default pcmanfm.desktop inode/directory
+
+exec-once = hyprctl setcursor Sweet-cursors 24

home/config/hypr/hl-decoration.conf

@@ -19,10 +19,10 @@ decoration {
     active_opacity=1.00
     inactive_opacity=1.00
 
-    drop_shadow = true
+    #drop_shadow = true
-    shadow_range = 10
+    #shadow_range = 10
-    shadow_render_power = 3
+    #shadow_render_power = 3
-    col.shadow = rgba(18182540)
+    #col.shadow = rgba(18182540)
 
     dim_inactive = true
     dim_strength = 0.2

home/config/hypr/hl-input.conf

@@ -21,7 +21,7 @@ input {
 
 gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = false
+   # workspace_swipe = false
 }
 
 # Example per-device config

home/config/hypr/hl-keybindings.conf

@@ -2,7 +2,7 @@
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-#bind = $mainMod, RETURN, exec, kitty
+#bind = $mainMod, RETURN, exec, alacritty
 bind = $mainMod, RETURN, exec, $terminal
 #bind = $mainMod, TAB, cyclenext
 bind = $mainMod SHIFT, TAB, cyclenext, prev

home/config/hypr/hl-layout.conf

@@ -2,10 +2,10 @@ dwindle {
     # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
     pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = true # you probably want this
-    no_gaps_when_only = 0 # monocle layout
+    #no_gaps_when_only = 0 # monocle layout
 }
 
 master {
     # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
+    #new_is_master = true
 }

home/config/hypr/hl-windowrules.conf

@@ -5,10 +5,10 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 
 windowrulev2 = noshadow, floating:0
-windowrule = dimaround,^(polkit)$
+windowrule = dimaround,class:^(polkit)$
 
-windowrule = idleinhibit fullscreen,^(.*)$
+windowrule = idleinhibit fullscreen,class:^(.*)$
-windowrule = idleinhibit focus, mpv
+windowrule = idleinhibit focus, class:mpv
 windowrule = idleinhibit focus, class:^(.*celluloid.*)$
 
 # firefox Picture-in-Picture
@@ -39,27 +39,28 @@ windowrule = float,title:^(galculator)$
 windowrule = float,title:^(Dateien entpacken)$
 windowrulev2 = float,class:^(nm-connection-editor)$
 windowrulev2 = float,class:^(sddm-conf)$
-windowrule = float, mpv
+windowrule = float, class:mpv
-windowrule = float, Vlc
+windowrule = float, class:Vlc
-windowrule = float, file_progress
+windowrule = float, class:file_progress
-windowrule = float, confirm
+windowrule = float, class:confirm
-windowrule = float, dialog
+windowrule = float, class:dialog
-windowrule = float, download
+windowrule = float, class:download
-windowrule = float, notification
+windowrule = float, class:notification
-windowrule = float, error
+windowrule = float, class:error
-windowrule = float, splash
+windowrule = float, class:splash
-windowrule = float, confirmreset
+windowrule = float, class:confirmreset
 windowrule = float, title:Open File
 windowrule = float, title:branchdialog
-windowrule = float, Lxappearance
+windowrule = float, class:Lxappearance
-windowrule = float, Resources
+windowrule = float, class:Resources
-windowrule = float, Rofi
+windowrule = float, class:Rofi
 windowrule = float, class:Viewnior
-windowrule = float,feh
+windowrule = float, class:feh
-windowrule = float, pavucontrol-qt
+windowrule = float, class:pavucontrol-qt
-windowrule = float, pavucontrol
+windowrule = float, class:pavucontrol
-windowrule = float, file-roller
+windowrule = float, class:file-roller
-windowrule = float, xarchiver
+windowrule = float, class:xarchiver
+windowrule = float, class:mpv
 windowrulev2 = stayfocused, class:^(pinentry-) # fix pinentry losing focus
 
 windowrule = float, title:^(Media viewer)$
@@ -88,13 +89,13 @@ windowrulev2 = pin,class:^(Conky)$
 windowrulev2 = move 100 100,class:^(Conky)$
 
 # Audio Mixer
-windowrule = float,pavucontrol
+windowrule = float,class:pavucontrol
-windowrule = center,pavucontrol
+windowrule = center,class:pavucontrol
 windowrule = float,title:^(NoiseTorch)$
 windowrule = float,title:^(Waydroid)$
 
 # Nemo File Roller
-windowrule = float,file-roller
+windowrule = float,class:file-roller
 windowrule = float,title:(Properties)$
 
 # VPN Connection Dialog

home/config/hypr/hyprland.conf

@@ -1,5 +1,5 @@
 # Set programs that you use
-$terminal = kitty
+$terminal = alacritty
 
 
 

home/config/niri/config.kdl

@@ -0,0 +1,643 @@
+// https://yalter.github.io/niri/Configuration:-Introduction
+
+cursor {
+    xcursor-theme "Sweet-cursors"
+    hide-when-typing
+    hide-after-inactive-ms 1000
+}
+
+// https://yalter.github.io/niri/Configuration:-Input
+input {
+    mod-key "Super"
+    keyboard {
+        xkb {
+            // You can set rules, model, layout, variant and options.
+            // For more information, see xkeyboard-config(7).
+
+            // For example:
+            // layout "de"
+            // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
+
+            // If this section is empty, niri will fetch xkb settings
+            // from org.freedesktop.locale1. You can control these using
+            // localectl set-x11-keymap.
+        }
+
+        // Enable numlock on startup, omitting this setting disables it.
+        numlock
+    }
+
+    // Next sections include libinput settings.
+    // Omitting settings disables them, or leaves them at their default values.
+    // All commented-out settings here are examples, not defaults.
+    touchpad {
+        off
+        tap
+        // dwta
+        // dwtp
+        // drag false
+        // drag-lock
+        natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "two-finger"
+        // disabled-on-external-mouse
+    }
+
+    mouse {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        accel-profile "flat"
+        // scroll-method "no-scroll"
+    }
+
+    trackpoint {
+        off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "on-button-down"
+        // scroll-button 273
+        // scroll-button-lock
+        // middle-emulation
+    }
+
+    // Uncomment this to make the mouse warp to the center of newly focused windows.
+    // warp-mouse-to-focus
+
+    // Focus windows and outputs automatically when moving the mouse into them.
+    // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
+    focus-follows-mouse max-scroll-amount="0%"
+}
+
+// You can configure outputs by their name, which you can find
+// by running `niri msg outputs` while inside a niri instance.
+// The built-in laptop monitor is usually called "eDP-1".
+// Find more information on the wiki:
+// https://yalter.github.io/niri/Configuration:-Outputs
+// Remember to uncomment the node by removing "/-"!
+/-output "eDP-1" {
+    // Uncomment this line to disable this output.
+    // off
+
+    // Resolution and, optionally, refresh rate of the output.
+    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // If the refresh rate is omitted, niri will pick the highest refresh rate
+    // for the resolution.
+    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
+    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    mode "1920x1080@120.030"
+
+    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
+    scale 2
+
+    // Transform allows to rotate the output counter-clockwise, valid values are:
+    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
+    transform "normal"
+
+    // Position of the output in the global coordinate space.
+    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    // The cursor can only move between directly adjacent outputs.
+    // Output scale and rotation has to be taken into account for positioning:
+    // outputs are sized in logical, or scaled, pixels.
+    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    // so to put another output directly adjacent to it on the right, set its x to 1920.
+    // If the position is unset or results in an overlap, the output is instead placed
+    // automatically.
+    position x=1280 y=0
+}
+output "HDMI-A-1" {
+    mode "2560x1440@119.998"
+}
+
+// Settings that influence how windows are positioned and sized.
+// Find more information on the wiki:
+// https://yalter.github.io/niri/Configuration:-Layout
+layout {
+    // Set gaps around windows in logical pixels.
+    gaps 8
+
+    // When to center a column when changing focus, options are:
+    // - "never", default behavior, focusing an off-screen column will keep at the left
+    //   or right edge of the screen.
+    // - "always", the focused column will always be centered.
+    // - "on-overflow", focusing a column will center it if it doesn't fit
+    //   together with the previously focused column.
+    center-focused-column "never"
+
+    // always-center-single-column
+
+    // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
+    preset-column-widths {
+        // Proportion sets the width as a fraction of the output width, taking gaps into account.
+        // For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
+        // The default preset widths are 1/3, 1/2 and 2/3 of the output.
+        proportion 0.33333
+        proportion 0.5
+        proportion 0.66667
+
+        // Fixed sets the width in logical pixels exactly.
+        // fixed 1920
+    }
+
+    // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between.
+    // preset-window-heights { }
+
+    // You can change the default width of the new windows.
+    default-column-width { proportion 0.5; }
+    // If you leave the brackets empty, the windows themselves will decide their initial width.
+    // default-column-width {}
+
+    // By default focus ring and border are rendered as a solid background rectangle
+    // behind windows. That is, they will show up through semitransparent windows.
+    // This is because windows using client-side decorations can have an arbitrary shape.
+    //
+    // If you don't like that, you should uncomment `prefer-no-csd` below.
+    // Niri will draw focus ring and border *around* windows that agree to omit their
+    // client-side decorations.
+    //
+    // Alternatively, you can override it with a window rule called
+    // `draw-border-with-background`.
+
+    // You can change how the focus ring looks.
+    focus-ring {
+        // Uncomment this line to disable the focus ring.
+        // off
+
+        // How many logical pixels the ring extends out from the windows.
+        width 1
+
+        // Colors can be set in a variety of ways:
+        // - CSS named colors: "red"
+        // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa"
+        // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
+
+        // Color of the ring on the active monitor.
+        active-color "#7f849c80"
+
+        // Color of the ring on inactive monitors.
+        //
+        // The focus ring only draws around the active window, so the only place
+        // where you can see its inactive-color is on other monitors.
+        inactive-color "#1e1e2e80"
+
+        // You can also use gradients. They take precedence over solid colors.
+        // Gradients are rendered the same as CSS linear-gradient(angle, from, to).
+        // The angle is the same as in linear-gradient, and is optional,
+        // defaulting to 180 (top-to-bottom gradient).
+        // You can use any CSS linear-gradient tool on the web to set these up.
+        // Changing the color space is also supported, check the wiki for more info.
+        //
+        // active-gradient from="#80c8ff" to="#c7ff7f" angle=45
+
+        // You can also color the gradient relative to the entire view
+        // of the workspace, rather than relative to just the window itself.
+        // To do that, set relative-to="workspace-view".
+        //
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can also add a border. It's similar to the focus ring, but always visible.
+    border {
+        // The settings are the same as for the focus ring.
+        // If you enable the border, you probably want to disable the focus ring.
+        off
+
+        width 2
+        active-color "#ffc87f"
+        inactive-color "#505050"
+
+        // Color of the border around windows that request your attention.
+        urgent-color "#9b0000"
+
+        // Gradients can use a few different interpolation color spaces.
+        // For example, this is a pastel rainbow gradient via in="oklch longer hue".
+        //
+        // active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue"
+
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can enable drop shadows for windows.
+    shadow {
+        // Uncomment the next line to enable shadows.
+        // on
+
+        // By default, the shadow draws only around its window, and not behind it.
+        // Uncomment this setting to make the shadow draw behind its window.
+        //
+        // Note that niri has no way of knowing about the CSD window corner
+        // radius. It has to assume that windows have square corners, leading to
+        // shadow artifacts inside the CSD rounded corners. This setting fixes
+        // those artifacts.
+        //
+        // However, instead you may want to set prefer-no-csd and/or
+        // geometry-corner-radius. Then, niri will know the corner radius and
+        // draw the shadow correctly, without having to draw it behind the
+        // window. These will also remove client-side shadows if the window
+        // draws any.
+        //
+        // draw-behind-window true
+
+        // You can change how shadows look. The values below are in logical
+        // pixels and match the CSS box-shadow properties.
+
+        // Softness controls the shadow blur radius.
+        softness 30
+
+        // Spread expands the shadow.
+        spread 2
+
+        // Offset moves the shadow relative to the window.
+        offset x=0 y=5
+
+        // You can also change the shadow color and opacity.
+        color "#0007"
+    }
+
+    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+    // You can think of them as a kind of outer gaps. They are set in logical pixels.
+    // Left and right struts will cause the next window to the side to always be visible.
+    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
+    // layer-shell panels and regular gaps.
+    struts {
+        // left 64
+        // right 64
+        // top 64
+        // bottom 64
+    }
+}
+
+// Add lines like this to spawn processes at startup.
+// Note that running niri as a session supports xdg-desktop-autostart,
+// which may be more convenient to use.
+// See the binds section below for more spawn examples.
+
+// This line starts waybar, a commonly used bar for Wayland compositors.
+spawn-at-startup "waybar"
+spawn-at-startup "xwayland-satellite"
+spawn-at-startup "dunst"
+spawn-sh-at-startup "waypaper --restore"
+spawn-sh-at-startup "foot --server"
+spawn-sh-at-startup "wl-paste --watch cliphist store"
+spawn-sh-at-startup "wl-paste --type image --watch cliphist store"
+spawn-at-startup "niri-switch-daemon"
+
+// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
+// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
+
+hotkey-overlay {
+    // Uncomment this line to disable the "Important Hotkeys" pop-up at startup.
+    // skip-at-startup
+    hide-not-bound
+}
+
+// Uncomment this line to ask the clients to omit their client-side decorations if possible.
+// If the client will specifically ask for CSD, the request will be honored.
+// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
+// This option will also fix border/focus ring drawing behind some semitransparent windows.
+// After enabling or disabling this, you need to restart the apps for this to take effect.
+prefer-no-csd
+
+// You can change the path where screenshots are saved.
+// A ~ at the front will be expanded to the home directory.
+// The path is formatted with strftime(3) to give you the screenshot date and time.
+screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+
+// You can also set this to null to disable saving screenshots to disk.
+// screenshot-path null
+
+// Animation settings.
+// The wiki explains how to configure individual animations:
+// https://yalter.github.io/niri/Configuration:-Animations
+animations {
+    // Uncomment to turn off all animations.
+    // off
+
+    // Slow down all animations by this factor. Values below 1 speed them up instead.
+    // slowdown 3.0
+}
+
+// Window rules let you adjust behavior for individual windows.
+// Find more information on the wiki:
+// https://yalter.github.io/niri/Configuration:-Window-Rules
+
+// Work around WezTerm's initial configure bug
+// by setting an empty default-column-width.
+window-rule {
+    // This regular expression is intentionally made as specific as possible,
+    // since this is the default config, and we want no false positives.
+    // You can get away with just app-id="wezterm" if you want.
+    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    default-column-width {}
+}
+
+// Open the Firefox picture-in-picture player as floating by default.
+window-rule {
+    // This app-id regular expression will work for both:
+    // - host Firefox (app-id is "firefox")
+    // - Flatpak Firefox (app-id is "org.mozilla.firefox")
+    match app-id=r#"firefox$"# title="^Picture-in-Picture$"
+    open-floating true
+}
+
+// Example: block out two password managers from screen capture.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+
+    block-out-from "screen-capture"
+
+    // Use this instead if you want them visible on third-party screenshot tools.
+    // block-out-from "screencast"
+}
+
+// Example: enable rounded corners for all windows.
+// (This example rule is commented out with a "/-" in front.)
+window-rule {
+    geometry-corner-radius 4
+    clip-to-geometry true
+}
+
+binds {
+    // Keys consist of modifiers separated by + signs, followed by an XKB key name
+    // in the end. To find an XKB name for a particular key, you may use a program
+    // like wev.
+    //
+    // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
+    // when running as a winit window.
+    //
+    // Most actions that you can bind here can also be invoked programmatically with
+    // `niri msg action do-something`.
+
+    // Mod-Shift-/, which is usually the same as Mod-?,
+    // shows a list of important hotkeys.
+    Mod+Shift+Slash { show-hotkey-overlay; }
+
+    Mod+C hotkey-overlay-title=null { spawn-sh "cliphist list | rofi -dmenu | cliphist decode | wl-copy"; } 
+
+    Alt+W { spawn-sh "killall waybar && waybar &"; }
+
+    Mod+A { spawn-sh "pkill rofi || ~/.config/rofi/volume/volume.sh"; }
+
+    Mod+E { spawn-sh "xdg-open ~"; }
+
+    Mod+T { spawn-sh "pkill rofi || rofi -show fb -modes \"fb:~/.config/rofi/settings-menu/setmen.sh\" -theme $HOME/.config/rofi/settings-menu/settings-menu.rasi"; }
+
+    Mod+Tab { spawn "niri-switch"; }
+    Mod+Shift+Tab { spawn "niri-switch" "--previous"; }
+
+    Mod+Return hotkey-overlay-title="Open a Terminal: foot" { spawn "foot"; }
+    Mod+Space hotkey-overlay-title="Run an Application: rofi" { spawn-sh "pkill rofi || ~/.config/rofi/launcher/launcher.sh"; }
+    Mod+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn-sh "wlogout -P 1 -s -r 10 -c 10"; }
+
+    // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc.
+    // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`.
+    // For example, this is a standard bind to toggle the screen reader (orca).
+    // Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; }
+
+    // Example volume keys mappings for PipeWire & WirePlumber.
+    // The allow-when-locked=true property makes them work even when the session is locked.
+    // Using spawn-sh allows to pass multiple arguments together with the command.
+    XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; }
+    XF86AudioMute        allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; }
+    XF86AudioMicMute     allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; }
+
+    // Example brightness key mappings for brightnessctl.
+    // You can use regular spawn with multiple arguments too (to avoid going through "sh"),
+    // but you need to manually put each argument in separate "" quotes.
+    XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; }
+
+    // Open/close the Overview: a zoomed-out view of workspaces and windows.
+    // You can also move the mouse into the top-left hot corner,
+    // or do a four-finger swipe up on a touchpad.
+    Mod+O repeat=false { toggle-overview; }
+    // Mod+Tab repeat=false { toggle-overview; }
+
+    Mod+Q repeat=false { close-window; }
+
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    Mod+Ctrl+Left  { move-column-left; }
+    Mod+Ctrl+Down  { move-window-down; }
+    Mod+Ctrl+Up    { move-window-up; }
+    Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down; }
+    Mod+Ctrl+K     { move-window-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    // Alternative commands that move across workspaces when reaching
+    // the first or last window in a column.
+    // Mod+J     { focus-window-or-workspace-down; }
+    // Mod+K     { focus-window-or-workspace-up; }
+    // Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+    // Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Shift+Ctrl+Left  { move-window-to-monitor-left; }
+    // ...
+
+    // And you can also move a whole workspace to another monitor:
+    // Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+    // ...
+
+    Mod+Page_Down      { focus-workspace-down; }
+    Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    Mod+I              { focus-workspace-up; }
+    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
+    // ...
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    Mod+Shift+I         { move-workspace-up; }
+
+    // You can bind mouse wheel scroll ticks using the following syntax.
+    // These binds will change direction based on the natural-scroll setting.
+    //
+    // To avoid scrolling through workspaces really fast, you can use
+    // the cooldown-ms property. The bind will be rate-limited to this value.
+    // You can set a cooldown on any bind, but it's most useful for the wheel.
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    // Usually scrolling up and down with Shift in applications results in
+    // horizontal scrolling; these binds replicate that.
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    // Similarly, you can bind touchpad scroll "ticks".
+    // Touchpad scrolling is continuous, so for these binds it is split into
+    // discrete intervals.
+    // These binds are also affected by touchpad's natural-scroll, so these
+    // example binds are "inverted", since we have natural-scroll enabled for
+    // touchpads by default.
+    // Mod+TouchpadScrollDown { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-"; }
+
+    // You can refer to workspaces by index. However, keep in mind that
+    // niri is a dynamic workspace system, so these commands are kind of
+    // "best effort". Trying to refer to a workspace index bigger than
+    // the current workspace count will instead refer to the bottommost
+    // (empty) workspace.
+    //
+    // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+    // will all refer to the 3rd workspace.
+    Mod+1 { focus-workspace 1; }
+    Mod+2 { focus-workspace 2; }
+    Mod+3 { focus-workspace 3; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+1 { move-window-to-workspace 1; }
+
+    // Switches focus between the current and the previous workspace.
+    // Mod+Tab { focus-workspace-previous; }
+
+    // The following binds move the focused window in and out of a column.
+    // If the window is alone, they will consume it into the nearby column to the side.
+    // If the window is already in a column, they will expel it out.
+    Mod+BracketLeft  { consume-or-expel-window-left; }
+    Mod+BracketRight { consume-or-expel-window-right; }
+
+    // Consume one window from the right to the bottom of the focused column.
+    Mod+Comma  { consume-window-into-column; }
+    // Expel the bottom window from the focused column to the right.
+    Mod+Period { expel-window-from-column; }
+
+    Mod+R { switch-preset-column-width; }
+    // Cycling through the presets in reverse order is also possible.
+    // Mod+R { switch-preset-column-width-back; }
+    Mod+Shift+R { switch-preset-window-height; }
+    Mod+Ctrl+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+
+    // Expand the focused column to space not taken up by other fully visible columns.
+    // Makes the column "fill the rest of the space".
+    Mod+Ctrl+F { expand-column-to-available-width; }
+
+    // Mod+C { center-column; }
+
+    // Center all fully visible columns on screen.
+    Mod+Ctrl+C { center-visible-columns; }
+
+    // Finer width adjustments.
+    // This command can also:
+    // * set width in pixels: "1000"
+    // * adjust width in pixels: "-5" or "+5"
+    // * set width as a percentage of screen width: "25%"
+    // * adjust width as a percentage of screen width: "-10%" or "+10%"
+    // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+    // set-column-width "100" will make the column occupy 200 physical screen pixels.
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+
+    // Finer height adjustments when in column with other windows.
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+
+    // Move the focused window between the floating and the tiling layout.
+    Mod+V       { toggle-window-floating; }
+    Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+
+    // Toggle tabbed column display mode.
+    // Windows in this column will appear as vertical tabs,
+    // rather than stacked on top of each other.
+    Mod+W { toggle-column-tabbed-display; }
+
+    // Actions to switch layouts.
+    // Note: if you uncomment these, make sure you do NOT have
+    // a matching layout switch hotkey configured in xkb options above.
+    // Having both at once on the same hotkey will break the switching,
+    // since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
+    // Mod+Space       { switch-layout "next"; }
+    // Mod+Shift+Space { switch-layout "prev"; }
+
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+
+    // Applications such as remote-desktop clients and software KVM switches may
+    // request that niri stops processing the keyboard shortcuts defined here
+    // so they may, for example, forward the key presses as-is to a remote machine.
+    // It's a good idea to bind an escape hatch to toggle the inhibitor,
+    // so a buggy application can't hold your session hostage.
+    //
+    // The allow-inhibiting=false property can be applied to other binds as well,
+    // which ensures niri always processes them, even when an inhibitor is active.
+    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
+
+    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+E { quit; }
+    Ctrl+Alt+Delete { quit; }
+
+    // Powers off the monitors. To turn them back on, do any input like
+    // moving the mouse or pressing any other key.
+    Mod+Shift+P { power-off-monitors; }
+}

home/config/waybar/config

@@ -4,18 +4,20 @@
     "spacing": 5,
     "modules-left": [
         "group/sys",
-        "hyprland/workspaces",
+        "niri/workspaces",
-        "tray"       
+        "tray",
+
+        "wlr/taskbar",
+        "niri/window"
     ],
     "modules-center": [
-        "mpris",
+        
-        "wlr/taskbar"
     ],
     "modules-right": [
+        "mpris",
         "custom/cpugov",
         "group/net",
         "group/sound",
-        "cava",
         "group/indicators"
     ],
     "group/indicators": {
@@ -25,7 +27,6 @@
             "custom/updates",
             "idle_inhibitor",
             "custom/screenshader",
-            "custom/dnd",
             "privacy"
         ]
     },
@@ -197,7 +198,7 @@
     },
     "wlr/taskbar": {
         "markup": true,
-        "format": "{icon} {title:.10}",
+        "format": "{icon}",
         "icon-size": 20,
         "tooltip-format": "{title:.100}",
         // "sort-by-app-id": true,
@@ -272,14 +273,10 @@
         "sort-by-number": true
     },
     "hyprland/window": {
-        "format": "{}",
+        "format": "{title}",
-        "rewrite": {
+        "icon": false,
-            "(.*) — firefox": "🌎 $1",
+        "icon-size": 16,
-            "(.*) - zsh": "> [$1]",
+        "separate-outputs": true
-            "(.*) - kitty": "> [$1]",
-            "(.*) - alacritty": "> [$1]"
-        },
-        "separate-outputs": false
     },
     "custom/updates": {
         "format": "{icon}",
@@ -304,9 +301,9 @@
         "menu": "on-click",
         "menu-file": "~/.config/waybar/screenshader.xml",
         "menu-actions": {
-            "blue-light-heavy": "hyprshade on blue-light-filter",
+            "blue-light-heavy": "hyprctl hyprsunset temperature 5000",
-            "blue-light-soft": "hyprshade on blue-light-alt",
+            "blue-light-soft": "hyprctl hyprsunset temperature 5500",
-            "off": "hyprshade off"
+            "off": "hyprctl hyprsunset identity"
         },
         "exec-if": "hyprshade",
         "exec": "hyprshade-waybar",
@@ -327,7 +324,7 @@
             "dnd-inhibited-none": "󰂛"
         },
         "return-type": "json",
-        "exec-if": "which swaync-client",
+        "exec-if": "which sync-client",
         "exec": "swaync-client -swb",
         "on-click": "sh -c 'sleep 0.1s; swaync-client -t -sw; sleep 0.1s'",
         "on-click-right": "swaync-client -d -sw",
@@ -489,5 +486,26 @@
         "format": "{}",
         "tooltip": true,
         "interval": 3600
+    },
+    "niri/workspaces": {
+        "format": "{icon}",
+        "format-icons": {
+            // Named workspaces
+            // (you need to configure them in niri)
+            "browser": "",
+            "discord": "",
+            "chat": "<b></b>",
+
+            // Icons by state
+            "active": "",
+            "default": ""
+        }
+    },
+    "niri/window": {
+        "format": "{}",
+        "rewrite": {
+            "(.*) - Mozilla Firefox": "🌎 $1",
+            "(.*) - zsh": "> [$1]"
+        }
     }
 }

home/config/waybar/style.css

@@ -1,25 +1,29 @@
 * {
     border: none;
-    font-family: "JetBrainsMono Nerd Font", sans-serif;
+    font-family: "Ubuntu Nerd Font", sans-serif;
     font-size: 13px;
-    color:alpha(@theme_text_color, 0.8);
+    color: alpha(@theme_text_color, 0.8);
 }
-window#waybar {
-    background: transparent;
 
+window#waybar {
+    /*background: transparent;*/
+    background: alpha(@theme_selected_fg_color, 0.2);
 }
+
 /*-----main groups----*/
 .modules-right {
     margin: 0;
-    padding-left:5px;
+    padding-left: 5px;
-    padding-right:0;
+    padding-right: 0;
     border-radius: 0;
 
 }
+
 .modules-center {
     margin: 0;
     border-radius: 0;
 }
+
 .modules-left {
     margin: 0 0 0 5px;
     /* background-color:alpha(@theme_selected_bg_color, 0.15);
@@ -57,16 +61,21 @@ window#waybar {
 #custom-vpn.connected,
 #power-profiles-daemon,
 #privacy,
-#gamemode{
+#gamemode,
-    padding:0px 10px;
+#taskbar,
+#window {
+    padding: 0px 10px;
 }
 
 /**
 * GROUPS
 **/
-#sys, #stats, #net, #sound {
+#sys,
+#stats,
+#net,
+#sound {
     margin: 0;
-    color:alpha(@theme_text_color, 0.5);
+    color: alpha(@theme_text_color, 0.5);
 }
 
 
@@ -74,17 +83,20 @@ window#waybar {
 * SYS
 **/
 #sys {
-    padding:0 0px 0 10px;
+    padding: 0 0px 0 10px;
 }
+
 #custom-power {
-    margin-left:0;
+    margin-left: 0;
-    margin-right:0;
+    margin-right: 0;
-    padding-left:0;
+    padding-left: 0;
 }
+
 #user {
-    padding-left:0;
+    padding-left: 0;
-    font-weight:bold;
+    font-weight: bold;
 }
+
 #custom-weather {
     padding-left: 5px;
 }
@@ -99,11 +111,11 @@ window#waybar {
     border-radius: 4px;
     padding: 0px 8px 0px 8px;
     margin: 8px 0px 8px 0px;
-    background-color:alpha(@theme_selected_bg_color, 0.1);
+    background-color: alpha(@theme_selected_bg_color, 0.1);
 }
 
 #custom-notification {
-    padding-right:0
+    padding-right: 0
 }
 
 /**
@@ -114,10 +126,12 @@ window#waybar {
     background-color: transparent;
     padding-left: 0;
 }
+
 #pulseaudio-slider {
     padding-left: 10px;
     padding-right: 10px;
 }
+
 #pulseaudio-slider slider {
     min-height: 0px;
     min-width: 0px;
@@ -126,14 +140,16 @@ window#waybar {
     border: none;
     box-shadow: none;
     background-color: @insensitive_bg_color;
-    border:1px solid alpha(@theme_selected_bg_color, 0.1);
+    border: 1px solid alpha(@theme_selected_bg_color, 0.1);
 }
+
 #pulseaudio-slider trough {
     min-height: 4px;
     min-width: 80px;
     border-radius: 5px;
     background-color: alpha(@theme_selected_bg_color, 0.3);
 }
+
 #pulseaudio-slider highlight {
 
     min-width: 5px;
@@ -142,7 +158,7 @@ window#waybar {
 }
 
 #custom-updates {
-    padding-right:5px;
+    padding-right: 5px;
     padding-left: 5px;
 }
 
@@ -151,45 +167,91 @@ window#waybar {
 * MISC
 **/
 #mpris {
-    border-radius:0;
+    border-radius: 0;
     margin: 8px 10px 8px 0px;
-    padding:0 10px;
+    padding: 0 10px;
 }
 
 /**
 * WORKSPACES
 **/
-#workspaces {
+/*#workspaces {
-    padding:0;
+    padding: 0;
     border-radius: 0
 }
+
 #workspaces button {
     padding: 0px 10px 0px 8px;
     margin: 8px 2px 8px 0px;
-    outline:none;
+    outline: none;
     border-radius: 4px;
-    background-color:alpha(@theme_selected_bg_color, 0.05);
+    background-color: alpha(@theme_selected_bg_color, 0.05);
 }
+
 #workspaces button:last-child {
     margin-right: 0;
 }
-#workspaces button.empty, #workspaces button.active.empty  {
+
-    color:inherit;
+#workspaces button.empty,
+#workspaces button.active.empty {
+    color: inherit;
     padding: 0px 0px 0px 8px;
 }
+
 #workspaces button.active {
     background-color: transparent;
     padding: 0px 10px 0px 8px;
 }
 
 #workspaces button.visible {
-    background-color:alpha(@theme_selected_bg_color, 0.1);
+    background-color: alpha(@theme_selected_bg_color, 0.1);
 }
+
 #workspaces button.urgent {
     color: #cc3436;
 }
+
 #workspaces button:hover {
-    background-color:alpha(@theme_selected_bg_color, 0.05);
+    background-color: alpha(@theme_selected_bg_color, 0.05);
+    box-shadow: inherit;
+    text-shadow: inherit;
+}*/
+
+#workspaces {
+    padding: 0;
+    border-radius: 0;
+
+}
+
+#workspaces button {
+    margin: 8px 2px 8px 0px;
+    padding: 0;
+    outline: none;
+    border-radius: 4px;
+    background-color: alpha(@theme_selected_bg_color, 0.05);
+}
+
+#workspaces button:last-child {
+    margin-right: 0;
+}
+
+#workspaces button.empty,
+#workspaces button.active.empty {
+    color: inherit;
+}
+
+#workspaces button.active {}
+
+#workspaces button.visible {
+    background-color: alpha(@theme_selected_bg_color, 0.1);
+}
+
+#workspaces button.urgent {
+    color: #cc3436;
+}
+
+#workspaces button:hover {
+    background-color: alpha(@theme_selected_bg_color, 0.05);
     box-shadow: inherit;
     text-shadow: inherit;
 }
@@ -201,27 +263,31 @@ window#waybar {
 #pulseaudio.muted {
     color: #cc3436;
 }
+
 #battery.charging {
     color: #2dcc36;
 }
+
 #battery.warning:not(.charging) {
     color: #e6e600;
 }
+
 #battery.critical:not(.charging) {
     color: #cc3436;
 }
+
 #temperature.critical {
     color: #cc3436;
 }
 
 #idle_inhibitor.activated {
-    color:alpha(@theme_selected_bg_color, 0.9);
+    color: alpha(@theme_selected_bg_color, 0.9);
 }
 
 #indicators {
-    padding-right:5px;
+    padding-right: 5px;
-    padding-left:5px;
+    padding-left: 5px;
-    border-radius:0;
+    border-radius: 0;
 }
 
 
@@ -229,43 +295,54 @@ window#waybar {
 * TASKBAR
 **/
 #taskbar {
-    font-size:8px;
+    font-size: 8px;
-    margin:0;
+    margin: 0 0 0 5px;
     opacity: 1;
-    padding:0;
+    padding: 0;
     border-radius: 0;
 }
+
 #taskbar.empty {
-    opacity:0;
+    opacity: 0;
 }
+
 #taskbar button {
-    padding:3px 10px 3px 10px;
+    padding: 3px 10px 3px 10px;
-    transition:100ms border ease-in-out;
+    transition: 100ms border ease-in-out;
     border-radius: 0;
-    font-size:8px;
+    font-size: 8px;
 }
 
 #taskbar button:not(:first-child) {
-    border-radius:0px;
+    border-radius: 0px;
 }
-#taskbar button:first-child {
 
-}
+#taskbar button:first-child {}
-#taskbar button:last-child {
 
-}
+#taskbar button:last-child {}
-#taskbar button:last-child:first-child {
+
+#taskbar button:last-child:first-child {}
 
-}
 #taskbar button.empty {
-    opacity:0;
+    opacity: 0;
 }
 
 #taskbar button:hover {
 
-    background-color:alpha(@theme_selected_bg_color, 0.1);
+    background-color: alpha(@theme_selected_bg_color, 0.1);
 }
+
 #taskbar button.active {
-    background-color:alpha(@theme_selected_bg_color, 0.05);
+    background-color: alpha(@theme_selected_bg_color, 0.05);
-    opacity:1;
+    opacity: 1;
+}
+
+
+menu {
+    border-radius: 4px;
+}
+
+menuitem {
+    border-radius: 4px;
+
 }

stower.sh

@@ -38,13 +38,11 @@ function inst_paru {
         echo "${BOLD}paru ${NORMAL}already installed. Skipping..."
     else
         echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
-        read confirm_paru 2>&1 | tee -a $LOG
+        read confirm_paru
         if [[ $confirm_paru == "Y" ]]; 
         then
             sudo pacman -Syu --needed base-devel 2>&1 | tee -a $LOG
-            sudo pacman -Syu rustup 2>&1 | tee -a $LOG
+            sudo pacman -Syu rust 2>&1 | tee -a $LOG
-            rustup default stable 2>&1 | tee -a $LOG
-            rustup update
 
             rm -rf $HYPRMOONARCH_DIR/.cache/paru-git
             git clone https://aur.archlinux.org/paru.git $HYPRMOONARCH_DIR/.cache/paru-git
@@ -73,6 +71,8 @@ function inst_sddm {
     do
         pkg_inst $key
     done
+    sddm --example-config > $HYPRMOONARCH_DIR/.cache/sddm.conf
+    sudo mv $HYPRMOONARCH_DIR/.cache/sddm.conf /etc/sddm.conf
 
     echo "set default user image"
     sudo cp -f $HYPRMOONARCH_DIR/usr/share/sddm/faces/.face /usr/share/sddm/faces/.face
@@ -81,12 +81,13 @@ function inst_sddm {
     cd $HYPRMOONARCH_DIR/.cache
     # wget --unlink https://github.com/catppuccin/sddm/releases/download/v1.0.0/catppuccin-mocha.zip
     # sudo unzip catppuccin-mocha.zip -d /usr/share/sddm/themes/
+    rm -rf moonarch-sddm
     git clone https://gitea.moonarch.de/nevaforget/moonarch-sddm.git
-    cp -R moonarch-sddm /usr/share/sddm/themes/
+    sudo cp -Rf moonarch-sddm /usr/share/sddm/themes/
     sudo rm -rf /usr/share/sddm/themes/moonarch-sddm/.git
     sudo sed -i "s/^Current=.*/Current=moonarch-sddm/g" /etc/sddm.conf
 
-    sudo systemctl disable display-manager
+    #sudo systemctl disable display-manager
     sudo systemctl enable sddm
 
     cd $HYPRMOONARCH_DIR
@@ -102,17 +103,20 @@ function inst_pkgs {
     if [[ $confirm_basics == "Y" ]]; 
     then
 
-        declare -a pkg_list=(jq network-manager-applet alarm-clock-applet man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop powertop polkit polkit-gnome timeshift timeshift-autosnap pcmanfm librewolf-bin fzf unzip wayland hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar-cava-git nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst)
+        declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet xarchiver man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop timeshift timeshift-autosnap newaita-reborn-icons-git waterfox fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates-git ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi cmake meson cpio pkg-config ttf-ubuntu-nerd ttf-hack-nerd ttf-jetbrains-mono-nerd hyprsysteminfo qt5-styleplugins qt6gtk2 qt5gtk2 hyprpolkitagent hyprshade cpupower fd)
 
         for key in "${pkg_list[@]}"
         do
             pkg_inst $key
         done
 
-        sudo cp $HYPRMOONARCH_DIR/usr/local/bin/{*} /usr/local/bin/
+        sudo cp -Rf $HYPRMOONARCH_DIR/usr/local/bin/* /usr/local/bin/
 
-        paru -S informant
+        pkg_inst "informant"
         sudo informant read --all
+        #$(getent group informant) ] || groupadd informant
+        #sudo usermod -a -G informant $USER
+
     fi
 
     cd $HYPRMOONARCH_DIR
@@ -138,9 +142,29 @@ function inst_bluet {
     cd $HYPRMOONARCH_DIR
 }
 
+function inst_filemanager {
+    echo "-"
+    echo "Installing ${BOLD}File-Manager${NORMAL} (PCManFM)"
+    echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
+    read confirm_filemanager
+    if [[ $confirm_filemanager == "Y" ]];
+    then
+        declare -a pkg_list=(pcmanfm-gtk3 evince ffmpegthumbnailer libgsf)
+        for key in "${pkg_list[@]}"
+        do
+            pkg_inst $key
+        done
+
+        $(getent group storage) ] || groupadd storage
+        sudo usermod -a -G storage $USER
+    fi
+
+    cd $HYPRMOONARCH_DIR
+}
+
 function inst_davfs {
     echo "-"
-    echo "Installing ${BOLD}WebDAV / davfs2${NORMAL} support, including pcmanfm support"
+    echo "Installing ${BOLD}WebDAV / davfs2${NORMAL} support, including file-manager support"
     echo -n "${BOLD}Continue?${NORMAL} (Y/N) "
     read confirm_davfs
     if [[ $confirm_davfs == "Y" ]]; 
@@ -151,8 +175,10 @@ function inst_davfs {
             pkg_inst $key
         done
 
+        if [ $(getent group admin) ]; then
           sudo usermod -a -G davfs2 $USER
         fi
+    fi
 
     cd $HYPRMOONARCH_DIR
 }
@@ -200,10 +226,13 @@ function rebooter {
 function setup {
     # ZSH
     log "Cloning ZSH Plugins..."
+    sudo rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
     sudo git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
     log "Done... zsh-autosuggestions"
+    sudo rm -rf ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
     sudo git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
     log "Done... zsh-syntax-highlighting"
+    sudo rm -rf ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
     sudo git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
     log "Done... powerlevel10k"
     chsh -s /usr/bin/zsh
@@ -212,48 +241,69 @@ function setup {
     # GUI
     log "Set up GUI Themes" 
     gsettings set org.gnome.desktop.interface gtk-theme "Catppuccin-Mocha-Standard-Lavender-Dark"
+    log "Setting cursor theme"
+    
+    hyprctl setcursor Sweet-cursors-hyprcursor 32
     log "Done... Window decorations"
+    
     gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
     log "Done... Set color-scheme to prefer-dark"
+
+    rm -rf $HYPRMOONARCH_DIR/.cache/Sweet-cursors
+    git clone https://gitea.moonarch.de/nevaforget/Sweet-cursors $HYPRMOONARCH_DIR/.cache/Sweet-cursors
+    cp -R $HYPRMOONARCH_DIR/.cache/Sweet-cursors /usr/share/icons/Sweet-cursors
     gsettings set org.gnome.desktop.interface cursor-theme Sweet-cursors
     log "Done... Set a sweet cursor"
 
-    hyprpm update
-    hyprpm add https://github.com/DreamMaoMao/hycov
-    hyprpm enable hycov
-
 	# Extra Font
+	log "Installing extra fonts"
     sudo mkdir -p /usr/local/share/fonts/
     sudo install -C $HYPRMOONARCH_DIR/usr/local/share/fonts/MonarchOS.ttf /usr/local/share/fonts/MonarchOS.ttf
     sudo install -C $HYPRMOONARCH_DIR/usr/local/share/fonts/Icomoon-Feather.ttf /usr/local/share/fonts/Icomoon-Feather.ttf
     sudo install -C $HYPRMOONARCH_DIR/etc/fonts/local.conf /etc/fonts/local.conf
     fc-cache -f
 
+    # Shared things
+    cp -R $HYPRMOONARCH_DIR/usr/share/* /usr/share/
+    cp -R $HYPRMOONARCH_DIR/usr/local/* /usr/local/
+
     # Wallpaper
+    log "Installing wallpapers"
     WALLPAPER_DIR=$HOME/Pictures/Wallpaper
     if [ ! -d "$WALLPAPER_DIR" ]; then
         mkdir -p $WALLPAPER_DIR
     fi
-    install -C $HYPRMOONARCH_DIR/home/Pictures/Wallpaper/MonarchOS.png $WALLPAPER_DIR/MonarchOS.png
+    cp -Rf $HYPRMOONARCH_DIR/home/Pictures/Wallpaper/* $WALLPAPER_DIR/
+
+    log "Set up default wallpaper"
+    #waypaper --wallpaper $WALLPAPER_DIR/1586853771_daniel-leone-v7datklzzaw-unsplash-modded.jpg
+    swww img $WALLPAPER_DIR/1586853771_daniel-leone-v7datklzzaw-unsplash-modded.jpg 
 
     # dotfiles
-    log "Time stow things up"
+    log "Time to stow things up... Installing dotfiles"
+    rm -rf $HOME/.config/hypr
     cp -R $HYPRMOONARCH_DIR/home/config/ $HOME/.hyprm/.config/
     cp -R $HYPRMOONARCH_DIR/home/.bashrc $HOME/.hyprm/.bashrc
     cp -R $HYPRMOONARCH_DIR/home/.zshrc $HOME/.hyprm/.zshrc
     cp -R $HYPRMOONARCH_DIR/home/.p10k.zsh $HOME/.hyprm/.p10k.zsh
     cd $HOME/.hyprm/
-    stow .
+    stow --adopt .
 
     cd $HYPRMOONARCH_DIR
 }
 
+function log () {
+    ts=$(date +"%H:%M:%S")
+
+    printf "$ts $1\n" | tee -a $LOG
+}
+
 function init {
 
     rm -f $LOG
 
-    mkdir $HYPRMOONARCH_DIR/.cache
+    mkdir -p $HYPRMOONARCH_DIR/.cache
-    mkdir $HOME/.hyprm
+    mkdir -p $HOME/.hyprm
 
     log "Installation start\n"
 
@@ -270,6 +320,8 @@ function init {
     inst_clamav
     inst_davfs
 
+    sudo gtk-update-icon-cache -f -t /usr/share/icons
+
     rebooter
 }
 

usr/local/bin/btnote

@@ -4,7 +4,7 @@
 ## date 2024-08-16
 ## loop battery devices and send notification on low percentage
 
-NOTIFY_AT_PERCENTAGE=70
+NOTIFY_AT_PERCENTAGE=20
 
 ICON="/usr/share/icons/Tela-purple-dark/symbolic/status/battery-empty-symbolic.svg"
 

usr/local/bin/fzf-git

@@ -0,0 +1,343 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2024 Junegunn Choi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# shellcheck disable=SC2039
+[[ $0 = - ]] && return
+
+__fzf_git_color() {
+  if [[ -n $NO_COLOR ]]; then
+    echo never
+  elif [[ $# -gt 0 ]] && [[ -n $FZF_GIT_PREVIEW_COLOR ]]; then
+    echo "$FZF_GIT_PREVIEW_COLOR"
+  else
+    echo "${FZF_GIT_COLOR:-always}"
+  fi
+}
+
+__fzf_git_cat() {
+  if [[ -n $FZF_GIT_CAT ]]; then
+    echo "$FZF_GIT_CAT"
+    return
+  fi
+
+  # Sometimes bat is installed as batcat
+  _fzf_git_bat_options="--style='${BAT_STYLE:-full}' --color=$(__fzf_git_color .) --pager=never"
+  if command -v batcat > /dev/null; then
+    echo "batcat $_fzf_git_bat_options"
+  elif command -v bat > /dev/null; then
+    echo "bat $_fzf_git_bat_options"
+  else
+    echo cat
+  fi
+}
+
+__fzf_git_pager() {
+  local pager
+  pager="${FZF_GIT_PAGER:-${GIT_PAGER:-$(git config --get core.pager 2>/dev/null)}}"
+  echo "${pager:-cat}"
+}
+
+if [[ $1 = --list ]]; then
+  shift
+  if [[ $# -eq 1 ]]; then
+    branches() {
+      git branch "$@" --sort=-committerdate --sort=-HEAD --format=$'%(HEAD) %(color:yellow)%(refname:short) %(color:green)(%(committerdate:relative))\t%(color:blue)%(subject)%(color:reset)' --color=$(__fzf_git_color) | column -ts$'\t'
+    }
+    refs() {
+      git for-each-ref "$@" --sort=-creatordate --sort=-HEAD --color=$(__fzf_git_color) --format=$'%(if:equals=refs/remotes)%(refname:rstrip=-2)%(then)%(color:magenta)remote-branch%(else)%(if:equals=refs/heads)%(refname:rstrip=-2)%(then)%(color:brightgreen)branch%(else)%(if:equals=refs/tags)%(refname:rstrip=-2)%(then)%(color:brightcyan)tag%(else)%(if:equals=refs/stash)%(refname:rstrip=-2)%(then)%(color:brightred)stash%(else)%(color:white)%(refname:rstrip=-2)%(end)%(end)%(end)%(end)\t%(color:yellow)%(refname:short) %(color:green)(%(creatordate:relative))\t%(color:blue)%(subject)%(color:reset)' | column -ts$'\t'
+    }
+    hashes() {
+      git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=$(__fzf_git_color) "$@" $LIST_OPTS
+    }
+    case "$1" in
+      branches)
+        echo 'CTRL-O (open in browser) ╱ ALT-A (show all branches)'
+        echo 'ALT-H (list commit hashes)'
+        branches
+        ;;
+      all-branches)
+        echo 'CTRL-O (open in browser)'
+        branches -a
+        ;;
+      hashes)
+        echo 'CTRL-O (open in browser) ╱ CTRL-D (diff)'
+        echo 'CTRL-S (toggle sort) ╱ ALT-A (show all hashes)'
+        hashes
+        ;;
+      all-hashes)
+        echo 'CTRL-O (open in browser) ╱ CTRL-D (diff)'
+        echo 'CTRL-S (toggle sort)'
+        hashes --all
+        ;;
+      refs)
+        echo 'CTRL-O (open in browser) ╱ ALT-E (examine in editor) ╱ ALT-A (show all refs)'
+        refs --exclude='refs/remotes'
+        ;;
+      all-refs)
+        echo 'CTRL-O (open in browser) ╱ ALT-E (examine in editor)'
+        refs
+        ;;
+      *) exit 1 ;;
+    esac
+  elif [[ $# -gt 1 ]]; then
+    set -e
+
+    branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
+    if [[ $branch = HEAD ]]; then
+      branch=$(git describe --exact-match --tags 2> /dev/null || git rev-parse --short HEAD)
+    fi
+
+    # Only supports GitHub for now
+    case "$1" in
+      commit)
+        hash=$(grep -o "[a-f0-9]\{7,\}" <<< "$2")
+        path=/commit/$hash
+        ;;
+      branch|remote-branch)
+        branch=$(sed 's/^[* ]*//' <<< "$2" | cut -d' ' -f1)
+        remote=$(git config branch."${branch}".remote || echo 'origin')
+        branch=${branch#$remote/}
+        path=/tree/$branch
+        ;;
+      remote)
+        remote=$2
+        path=/tree/$branch
+        ;;
+      file) path=/blob/$branch/$(git rev-parse --show-prefix)$2 ;;
+      tag)  path=/releases/tag/$2 ;;
+      *)    exit 1 ;;
+    esac
+
+    remote=${remote:-$(git config branch."${branch}".remote || echo 'origin')}
+    remote_url=$(git remote get-url "$remote" 2> /dev/null || echo "$remote")
+
+    if [[ $remote_url =~ ^git@ ]]; then
+      url=${remote_url%.git}
+      url=${url#git@}
+      url=https://${url/://}
+    elif [[ $remote_url =~ ^http ]]; then
+      url=${remote_url%.git}
+    fi
+
+    case "$(uname -s)" in
+      Darwin) open "$url$path"     ;;
+      *)      xdg-open "$url$path" ;;
+    esac
+    exit 0
+  fi
+fi
+
+if [[ $- =~ i ]] || [[ $1 = --run ]]; then # ----------------------------------
+
+# Redefine this function to change the options
+_fzf_git_fzf() {
+  fzf --height 50% --tmux 90%,70% \
+    --layout reverse --multi --min-height 20+ --border \
+    --no-separator --header-border horizontal \
+    --border-label-pos 2 \
+    --color 'label:blue' \
+    --preview-window 'right,50%' --preview-border line \
+    --bind 'ctrl-/:change-preview-window(down,50%|hidden|)' "$@"
+}
+
+_fzf_git_check() {
+  git rev-parse HEAD > /dev/null 2>&1 && return
+
+  [[ -n $TMUX ]] && tmux display-message "Not in a git repository"
+  return 1
+}
+
+__fzf_git=${BASH_SOURCE[0]:-${(%):-%x}}
+__fzf_git=$(readlink -f "$__fzf_git" 2> /dev/null || /usr/bin/ruby --disable-gems -e 'puts File.expand_path(ARGV.first)' "$__fzf_git" 2> /dev/null)
+
+_fzf_git_files() {
+  _fzf_git_check || return
+  local root query
+  root=$(git rev-parse --show-toplevel)
+  [[ $root != "$PWD" ]] && query='!../ '
+
+  (git -c color.status=$(__fzf_git_color) status --short --no-branch
+   git ls-files "$root" | grep -vxFf <(git status -s | grep '^[^?]' | cut -c4-; echo :) | sed 's/^/   /') |
+  _fzf_git_fzf -m --ansi --nth 2..,.. \
+    --border-label '📁 Files ' \
+    --header 'CTRL-O (open in browser) ╱ ALT-E (open in editor)' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list file {-1}" \
+    --bind "alt-e:execute:${EDITOR:-vim} {-1} > /dev/tty" \
+    --query "$query" \
+    --preview "git diff --no-ext-diff --color=$(__fzf_git_color .) -- {-1} | $(__fzf_git_pager); $(__fzf_git_cat) {-1}" "$@" |
+  cut -c4- | sed 's/.* -> //'
+}
+
+_fzf_git_branches() {
+  _fzf_git_check || return
+  bash "$__fzf_git" --list branches |
+  _fzf_git_fzf --ansi \
+    --border-label '🌲 Branches ' \
+    --header-lines 2 \
+    --tiebreak begin \
+    --preview-window down,border-top,40% \
+    --color hl:underline,hl+:underline \
+    --no-hscroll \
+    --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list branch {}" \
+    --bind "alt-a:change-border-label(🌳 All branches)+reload:bash \"$__fzf_git\" --list all-branches" \
+    --bind "alt-h:become:LIST_OPTS=\$(cut -c3- <<< {} | cut -d' ' -f1) bash \"$__fzf_git\" --run hashes" \
+    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' \$(cut -c3- <<< {} | cut -d' ' -f1) --" "$@" |
+  sed 's/^\* //' | awk '{print $1}' # Slightly modified to work with hashes as well
+}
+
+_fzf_git_tags() {
+  _fzf_git_check || return
+  git tag --sort -version:refname |
+  _fzf_git_fzf --preview-window right,70% \
+    --border-label '📛 Tags ' \
+    --header 'CTRL-O (open in browser)' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list tag {}" \
+    --preview "git show --color=$(__fzf_git_color .) {} | $(__fzf_git_pager)" "$@"
+}
+
+_fzf_git_hashes() {
+  _fzf_git_check || return
+  bash "$__fzf_git" --list hashes |
+  _fzf_git_fzf --ansi --no-sort --bind 'ctrl-s:toggle-sort' \
+    --border-label '🍡 Hashes ' \
+    --header-lines 2 \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list commit {}" \
+    --bind "ctrl-d:execute:grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git diff --color=$(__fzf_git_color) > /dev/tty" \
+    --bind "alt-a:change-border-label(🍇 All hashes)+reload:bash \"$__fzf_git\" --list all-hashes" \
+    --color hl:underline,hl+:underline \
+    --preview "grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git show --color=$(__fzf_git_color .) | $(__fzf_git_pager)" "$@" |
+  awk 'match($0, /[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*/) { print substr($0, RSTART, RLENGTH) }'
+}
+
+_fzf_git_remotes() {
+  _fzf_git_check || return
+  git remote -v | awk '{print $1 "\t" $2}' | uniq |
+  _fzf_git_fzf --tac \
+    --border-label '📡 Remotes ' \
+    --header 'CTRL-O (open in browser)' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list remote {1}" \
+    --preview-window right,70% \
+    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' '{1}/$(git rev-parse --abbrev-ref HEAD)' --" "$@" |
+  cut -d$'\t' -f1
+}
+
+_fzf_git_stashes() {
+  _fzf_git_check || return
+  git stash list | _fzf_git_fzf \
+    --border-label '🥡 Stashes ' \
+    --header 'CTRL-X (drop stash)' \
+    --bind 'ctrl-x:reload(git stash drop -q {1}; git stash list)' \
+    -d: --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" |
+  cut -d: -f1
+}
+
+_fzf_git_lreflogs() {
+  _fzf_git_check || return
+  git reflog --color=$(__fzf_git_color) --format="%C(blue)%gD %C(yellow)%h%C(auto)%d %gs" | _fzf_git_fzf --ansi \
+    --border-label '📒 Reflogs ' \
+    --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" |
+  awk '{print $1}'
+}
+
+_fzf_git_each_ref() {
+  _fzf_git_check || return
+  bash "$__fzf_git" --list refs | _fzf_git_fzf --ansi \
+    --nth 2,2.. \
+    --tiebreak begin \
+    --border-label '☘️  Each ref ' \
+    --header-lines 1 \
+    --preview-window down,border-top,40% \
+    --color hl:underline,hl+:underline \
+    --no-hscroll \
+    --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list {1} {2}" \
+    --bind "alt-e:execute:${EDITOR:-vim} <(git show {2}) > /dev/tty" \
+    --bind "alt-a:change-border-label(🍀 Every ref)+reload:bash \"$__fzf_git\" --list all-refs" \
+    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} --" "$@" |
+  awk '{print $2}'
+}
+
+_fzf_git_worktrees() {
+  _fzf_git_check || return
+  git worktree list | _fzf_git_fzf \
+    --border-label '🌴 Worktrees ' \
+    --header 'CTRL-X (remove worktree)' \
+    --bind 'ctrl-x:reload(git worktree remove {1} > /dev/null; git worktree list)' \
+    --preview "
+      git -c color.status=$(__fzf_git_color .) -C {1} status --short --branch
+      echo
+      git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} --
+    " "$@" |
+  awk '{print $1}'
+}
+fi # --------------------------------------------------------------------------
+
+if [[ $1 = --run ]]; then
+  shift
+  type=$1
+  shift
+  eval "_fzf_git_$type" "$@"
+
+elif [[ $- =~ i ]]; then # ------------------------------------------------------
+if [[ -n "${BASH_VERSION:-}" ]]; then
+  __fzf_git_init() {
+    bind -m emacs-standard '"\er":  redraw-current-line'
+    bind -m emacs-standard '"\C-z": vi-editing-mode'
+    bind -m vi-command     '"\C-z": emacs-editing-mode'
+    bind -m vi-insert      '"\C-z": emacs-editing-mode'
+
+    local o c
+    for o in "$@"; do
+      c=${o:0:1}
+      bind -m emacs-standard '"\C-g\C-'$c'": " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
+      bind -m vi-command     '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"'
+      bind -m vi-insert      '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"'
+      bind -m emacs-standard '"\C-g'$c'":    " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
+      bind -m vi-command     '"\C-g'$c'":    "\C-z\C-g'$c'\C-z"'
+      bind -m vi-insert      '"\C-g'$c'":    "\C-z\C-g'$c'\C-z"'
+    done
+  }
+elif [[ -n "${ZSH_VERSION:-}" ]]; then
+  __fzf_git_join() {
+    local item
+    while read item; do
+      echo -n "${(q)item} "
+    done
+  }
+
+  __fzf_git_init() {
+    local m o
+    for o in "$@"; do
+      eval "fzf-git-$o-widget() { local result=\$(_fzf_git_$o | __fzf_git_join); zle reset-prompt; LBUFFER+=\$result }"
+      eval "zle -N fzf-git-$o-widget"
+      for m in emacs vicmd viins; do
+        eval "bindkey -M $m '^g^${o[1]}' fzf-git-$o-widget"
+        eval "bindkey -M $m '^g${o[1]}' fzf-git-$o-widget"
+      done
+    done
+  }
+fi
+__fzf_git_init files branches tags remotes hashes stashes lreflogs each_ref worktrees
+
+fi # --------------------------------------------------------------------------
+

usr/local/bin/set-cursor

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    echo usage: $(basename $0) icon-name
+    exit 0
+fi
+
+THEME=${1}
+SIZE=24
+
+echo Setting for GNOME ...
+
+gsettings set org.gnome.desktop.interface cursor-theme "${THEME}"
+gsettings set org.gnome.desktop.interface cursor-size ${SIZE}
+
+## Only for Deepin Linux
+cat /etc/lsb-release | grep -i Deepin 2>/dev/null 1>&2
+if [ $? -eq 0 ]; then
+    gsettings set com.deepin.wrap.gnome.desktop.interface cursor-size ${SIZE}
+    gsettings set com.deepin.xsettings gtk-cursor-theme-size ${SIZE}
+
+    gsettings set com.deepin.wrap.gnome.desktop.interface cursor-theme ${THEME}
+    gsettings set com.deepin.xsettings gtk-cursor-theme-name ${THEME}
+    gsettings set com.deepin.dde.appearance cursor-theme ${THEME}
+fi
+
+if [ -f ~/.icons/default/index.theme ]; then
+	rm ~/.icons/default/index.theme
+fi
+
+if [ ! -d ~/.icons/default ]; then
+	mkdir -p ~/.icons/default
+fi
+
+echo \[icon theme\] >> ~/.icons/default/index.theme
+echo Inherits=${THEME} >> ~/.icons/default/index.theme
+
+echo Setting for GTK-3.0 ...
+if [ -f ~/.config/gtk-3.0/settings.ini ]; then
+	rm ~/.config/gtk-3.0/settings.ini
+fi
+
+if [ ! -d ~/.config/gtk-3.0 ]; then
+	mkdir ~/.config/gtk-3.0
+fi
+
+echo \[Settings\] >> ~/.config/gtk-3.0/settings.ini
+echo gtk-cursor-theme-name=${THEME} >> ~/.config/gtk-3.0/settings.ini
+
+echo Setting for Legacy X ...
+if [ -f ~/.xinitrc ]; then
+    sed -i '/.*XCURSOR_THEME.*/Id' ~/.xinitrc
+    sed -i '/.*XCURSOR_SIZE.*/Id' ~/.xinitrc
+fi
+echo XCURSOR_SIZE=${SIZE} >> ~/.xinitrc
+echo XCURSOR_THEME=${THEME} >> ~/.xinitrc
+
+if [ -f ~/.Xresources ]; then
+    sed -i '/.*xcursor.size.*/Id' ~/.Xresources
+    sed -i '/.*xcursor.theme.*/Id' ~/.Xresources
+fi
+echo Xcursor.size=${SIZE} >> ~/.Xresources
+echo Xcursor.theme=${THEME} >> ~/.Xresources

usr/local/bin/volnote

@@ -20,20 +20,20 @@ function send_notification {
     # https://en.wikipedia.org/wiki/Box-drawing_character
 #bar=$(seq -s "─" $(($volume/5)) | sed 's/[0-9]//g')
 if [ "$volume" = "0" ]; then
-        icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-off.svg"
+        icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-off.svg"
 dunstify "$volume""      " -i "$icon_name" -t 2000 -h int:value:"$volume" -h string:synchronous:"─" --replace=555
     else
 	if [  "$volume" -lt "10" ]; then
-	     icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-low.svg"
+	     icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-low.svg"
 dunstify "$volume""     " -i "$icon_name" --replace=555 -t 2000
     else
         if [ "$volume" -lt "30" ]; then
-            icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-low.svg"
+            icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-low.svg"
         else
             if [ "$volume" -lt "70" ]; then
-                icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-medium.svg"
+                icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-medium.svg"
             else
-                icon_name="/usr/share/icons/zafiro-dark/panel/16/audio-volume-high.svg"
+                icon_name="/usr/share/icons/Newaita-reborn/panel/16/audio-volume-high.svg"
             fi
         fi
     fi
@@ -41,7 +41,6 @@ fi
 bar=$(seq -s "─" $(($volume/5)) | sed 's/[0-9]//g')
 # Send the notification
 dunstify "$volume""     ""$bar" -i "$icon_name" -t 2000 -h int:value:"$volume" -h string:synchronous:"$bar" --replace=555
-
 }
 
 case $1 in
@@ -58,7 +57,7 @@ case $1 in
 	send_notification
 	;;
     toggle)
-    dunstify --replace 554 -i "/usr/share/icons/zafiro-dark/actions/16-Dark/media-album-track.svg" "Player Control" "Media $(playerctl status)" 
+    dunstify --replace 554 -i "/usr/share/icons/Newaita-reborn/actions/16-Dark/media-album-track.svg" "Player Control" "Media $(playerctl status)" 
     playerctl play-pause
     ;;
     mute)
@@ -66,7 +65,7 @@ case $1 in
 	amixer -D pulse set Master 1+ toggle > /dev/null
 	if is_mute ; then
     DIR=`dirname "$0"`
-    dunstify -i "/usr/share/icons/zafiro-dark/panel/16/audio-volume-off.svg" --replace=555 -u normal "Mute" -t 2000
+    dunstify -i "/usr/share/icons/Newaita-reborn/panel/16/audio-volume-off.svg" --replace=555 -u normal "Mute" -t 2000
 	else
 	    send_notification
 	fi

usr/share/icons/default/index.theme

@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=Sweet-cursors