finally refactor to lua. Also neat things WIP

.gitignore

@@ -0,0 +1,12 @@
+zsh/.zcompdump*
+FiraCode.zip
+systemd/user/default.target.wants/*
+systemd/user/graphical-session.target.wants/*
+systemd/user/sockets.target.wants/*
+nvim/lazy-lock.json
+gtk-4.0/servers
+pulse/cookie
+kdeconnect
+dconf
+pavucontrol.ini
+waybar/config

btop/btop.conf

@@ -1,18 +1,23 @@
-#? Config file for btop v. 1.4.0
+#? Config file for btop v.1.4.7
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
 color_theme = "/home/ha5pls/.config/btop/themes/catppuccin_macchiato.theme"
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
-theme_background = True
+theme_background = true
 
 #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
-truecolor = True
+truecolor = true
 
 #* Set to true to force tty mode regardless if a real tty has been detected or not.
 #* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
-force_tty = False
+force_tty = false
+
+#* Option to disable presets. Either the default preset, custom presets, or all presets.
+#* "Off" All presets are enabled.
+#* "Default" preset is disabled.#* "Custom" presets are disabled.#* "All" presets are disabled.
+disable_presets = "Off"
 
 #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
 #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
@@ -22,10 +27,16 @@ presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:defaul
 
 #* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
 #* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
-vim_keys = False
+vim_keys = false
+
+#* Disable all mouse events.
+disable_mouse = false
 
 #* Rounded corners on boxes, is ignored if TTY mode is ON.
-rounded_corners = True
+rounded_corners = true
+
+#* Use terminal synchronized output sequences to reduce flickering on supported terminals.
+terminal_sync = true
 
 #* Default symbols to use for graph creation, "braille", "block" or "tty".
 #* "braille" offers the highest resolution but might not be included in all fonts.
@@ -57,40 +68,46 @@ update_ms = 1000
 
 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
 #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "memory"
+proc_sorting = "cpu direct"
 
 #* Reverse sorting order, True or False.
-proc_reversed = False
+proc_reversed = false
 
 #* Show processes as a tree.
-proc_tree = False
+proc_tree = false
 
 #* Use the cpu graph colors in the process list.
-proc_colors = True
+proc_colors = true
 
 #* Use a darkening gradient in the process list.
-proc_gradient = True
+proc_gradient = true
 
 #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = False
+proc_per_core = false
 
 #* Show process memory as bytes instead of percent.
-proc_mem_bytes = True
+proc_mem_bytes = true
 
 #* Show cpu graph for each process.
-proc_cpu_graphs = True
+proc_cpu_graphs = true
 
 #* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
-proc_info_smaps = False
+proc_info_smaps = false
 
 #* Show proc box on left side of screen instead of right.
-proc_left = False
+proc_left = false
 
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
-proc_filter_kernel = False
+proc_filter_kernel = false
+
+#* Should the process list follow the selected process when detailed view is open.
+proc_follow_detailed = true
 
 #* In tree-view, always accumulate child process resources in the parent process.
-proc_aggregate = False
+proc_aggregate = false
+
+#* Should cpu and memory usage display be preserved for dead processes when paused.
+keep_dead_proc_usage = false
 
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
@@ -104,25 +121,28 @@ cpu_graph_lower = "Auto"
 show_gpu_info = "On"
 
 #* Toggles if the lower CPU graph should be inverted.
-cpu_invert_lower = True
+cpu_invert_lower = true
 
 #* Set to True to completely disable the lower CPU graph.
-cpu_single_graph = False
+cpu_single_graph = false
 
 #* Show cpu box at bottom of screen instead of top.
-cpu_bottom = False
+cpu_bottom = false
 
 #* Shows the system uptime in the CPU box.
-show_uptime = True
+show_uptime = true
+
+#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
+show_cpu_watts = true
 
 #* Show cpu temperature.
-check_temp = True
+check_temp = true
 
 #* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
 cpu_sensor = "Auto"
 
 #* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
-show_coretemp = True
+show_coretemp = true
 
 #* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
 #* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
@@ -134,100 +154,118 @@ cpu_core_map = ""
 temp_scale = "celsius"
 
 #* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-base_10_sizes = False
+base_10_sizes = false
 
 #* Show CPU frequency.
-show_cpu_freq = True
+show_cpu_freq = true
+
+#* How to calculate CPU frequency, available values: "first", "range", "lowest", "highest" and "average".
+freq_mode = "first"
 
 #* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
 #* Special formatting: /host = hostname | /user = username | /uptime = system uptime
 clock_format = "%X"
 
 #* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
-background_update = True
+background_update = true
 
 #* Custom cpu model name, empty string to disable.
 custom_cpu_name = ""
 
 #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
-#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user".
+#* Only disks matching the filter will be shown. Prepend exclude= to only show disks not matching the filter. Examples: disk_filter="/boot /home/user", disks_filter="exclude=/boot /home/user"
 disks_filter = ""
 
 #* Show graphs instead of meters for memory values.
-mem_graphs = True
+mem_graphs = true
 
 #* Show mem box below net box instead of above.
-mem_below_net = False
+mem_below_net = false
 
 #* Count ZFS ARC in cached and available memory.
-zfs_arc_cached = True
+zfs_arc_cached = true
 
 #* If swap memory should be shown in memory box.
-show_swap = True
+show_swap = true
 
 #* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-swap_disk = True
+swap_disk = true
 
 #* If mem box should be split to also show disks info.
-show_disks = True
+show_disks = true
 
 #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-only_physical = True
+only_physical = true
 
 #* Read disks list from /etc/fstab. This also disables only_physical.
-use_fstab = True
+use_fstab = true
 
 #* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
-zfs_hide_datasets = False
+zfs_hide_datasets = false
 
 #* Set to true to show available disk space for privileged users.
-disk_free_priv = False
+disk_free_priv = false
 
 #* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
-show_io_stat = True
+show_io_stat = true
 
 #* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-io_mode = True
+io_mode = true
 
 #* Set to True to show combined read/write io graphs in io mode.
-io_graph_combined = False
+io_graph_combined = false
 
 #* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
 #* Example: "/mnt/media:100 /:20 /boot:1".
 io_graph_speeds = ""
 
+#* Swap the positions of the upload and download speed graphs. When true, upload will be on top.
+swap_upload_download = false
+
 #* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False.
 net_download = 100
 
 net_upload = 100
 
 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
-net_auto = True
+net_auto = true
 
 #* Sync the auto scaling for download and upload to whichever currently has the highest scale.
-net_sync = True
+net_sync = true
 
 #* Starts with the Network Interface specified here.
 net_iface = ""
 
+#* "True" shows bitrates in base 10 (Kbps, Mbps). "False" shows bitrates in binary sizes (Kibps, Mibps, etc.). "Auto" uses base_10_sizes.
+base_10_bitrate = "Auto"
+
 #* Show battery stats in top right if battery is present.
-show_battery = True
+show_battery = true
 
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"
 
 #* Show power stats of battery next to charge indicator.
-show_battery_watts = True
+show_battery_watts = true
 
-#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
+#* Set loglevel for "~/.local/state/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
 log_level = "WARNING"
 
+#* Automatically save current settings to config file on exit.
+save_config_on_exit = true
+
 #* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
-nvml_measure_pcie_speeds = True
+nvml_measure_pcie_speeds = true
+
+#* Measure PCIe throughput on AMD cards, may impact performance on certain cards.
+rsmi_measure_pcie_speeds = true
 
 #* Horizontally mirror the GPU graph.
-gpu_mirror_graph = True
+gpu_mirror_graph = true
+
+#* Set which GPU vendors to show. Available values are "nvidia amd intel apple"
+shown_gpus = "nvidia amd intel apple"
 
 #* Custom gpu0 model name, empty string to disable.
 custom_gpu_name0 = ""

dconf-export/gedit.dconf

@@ -12,7 +12,10 @@ statusbar-visible=true
 
 [state/window]
 bottom-panel-size=140
+height=979
+maximized=true
 side-panel-active-page='GeditWindowDocumentsPanel'
 side-panel-size=200
-size=(635, 285)
+size=(950, 975)
 state=43908
+width=956

dconf-export/gtk4.dconf

@@ -1,7 +1,7 @@
 [settings/file-chooser]
 date-format='regular'
 location-mode='path-bar'
-show-hidden=true
+show-hidden=false
 show-size-column=true
 show-type-column=true
 sidebar-width=140

dconf-export/nautilus.dconf

@@ -1,3 +1,6 @@
+[compression]
+default-compression-format='tar.xz'
+
 [icon-view]
 default-zoom-level='small'
 
@@ -6,6 +9,8 @@ default-folder-viewer='icon-view'
 migrated-gtk-settings=true
 search-filter-time-type='last_modified'
 search-view='list-view'
+show-create-link=true
+show-delete-permanently=true
 
 [window-state]
 initial-size=(1280, 720)

fedora.sh

@@ -15,14 +15,6 @@ set_unit () {
     systemctl --user enable --now $*
 }
 
-replace_config_line "/etc/dnf/dnf.conf" "installonly_limit" "3"
-replace_config_line "/etc/dnf/dnf.conf" "best" "False"
-replace_config_line "/etc/dnf/dnf.conf" "skip_unavailable" "True"
-replace_config_line "/etc/dnf/dnf.conf" "fastestmirror" "True"
-replace_config_line "/etc/dnf/dnf.conf" "defaultyes" "True"
-replace_config_line "/etc/dnf/dnf.conf" "keepcache" "True"
-replace_config_line "/etc/dnf/dnf.conf" "max_parallel_downloads" "5"
-
 ensure_installed () {
     for dep in $*; do
         if $(dnf list --installed "$dep" 2>&1 | grep -q "$dep") ; then
@@ -33,9 +25,21 @@ ensure_installed () {
     done
 }
 
+# Select install type
+
+type="${1:-desktop}"
+
+replace_config_line "/etc/dnf/dnf.conf" "installonly_limit" "3"
+replace_config_line "/etc/dnf/dnf.conf" "best" "False"
+replace_config_line "/etc/dnf/dnf.conf" "skip_unavailable" "True"
+replace_config_line "/etc/dnf/dnf.conf" "fastestmirror" "True"
+replace_config_line "/etc/dnf/dnf.conf" "defaultyes" "True"
+replace_config_line "/etc/dnf/dnf.conf" "keepcache" "True"
+replace_config_line "/etc/dnf/dnf.conf" "max_parallel_downloads" "10"
+
 # Enable extra repos
 sudo dnf update
-sudo dnf copr enable solopasha/hyprland
+sudo dnf copr enable lionheartp/Hyprland
 sudo dnf copr enable tofik/sway
 sudo dnf copr enable derisis13/ani-cli
 sudo dnf copr enable rezso/hdl
@@ -56,7 +60,7 @@ mkdir -p ~/.local/state/zsh/
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 mv ~/.oh-my-zsh ~/.local/share/oh-my-zsh/   # TODO: figure out how to contol install location of script above. Maybe reboot/relog after xgd_user_dirs is installed?
 git clone https://github.com/Aloxaf/fzf-tab ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/fzf-tab
-curl -O -fsSL https://github.com/ryanoasis/nerd-fonts/releases/download/v3.3.0/FiraCode.zip && unzip FiraCode.zip *.ttf -d ~/.local/share/fonts/
+curl -O -fsSL https://github.com/ryanoasis/nerd-fonts/releases/download/v3.3.0/FiraCode.zip && unzip FiraCode.zip "*.ttf" -d ~/.local/share/fonts/
 printf "You'll need to relog to have your default shell changed\n"
 
 # Install background and hyprland stuff
@@ -65,10 +69,16 @@ mkdir -p ~/.local/share/backgrounds/
 curl -o ~/.local/share/backgrounds/eKxlw8.jpg -fsSL "https://live.staticflickr.com/5077/5914101671_d80c6591e8_k.jpg"
 set_unit hypridle.service hyprpaper.service hyprpolkitagent.service hyprsunset.service
 set_unit pipewire.service pipewire-pulse.service
+
 # desktop elements that just work
 ensure_installed swaync
 set_unit swaync.service
-ensure_installed waybar fontawesome4-fonts
+ensure_installed waybar fontawesome4-fonts pavucontrol powerprofilesctl blueman
+if [ "$type" = "laptop" ]; then
+    cp ~/.config/waybar/config_laptop.json ~/.config/waybar/config
+else
+    cp ~/.config/waybar/config_desktop.json ~/.config/waybar/config
+fi
 set_unit waybar.service
 ensure_installed cliphist
 set_unit cliphist.service
@@ -76,14 +86,14 @@ set_unit cliphist.service
 # Install ReGreet
 ensure_installed cargo gtk4-devel cairo-gobject-devel pango-devel greetd
 sudo usermod -a -G video greetd
-sudo cp -r ~/.config/regreet/greetd /etc/greetd/
+sudo cp -r ~/.config/regreet/greetd/* /etc/greetd/
 sudo cp ~/.local/share/backgrounds/eKxlw8.jpg /etc/greetd/
 sudo cp ~/.config/gtk-4.0/gtk.css /etc/greetd/regreet.css
 sudo cp ~/.config/regreet/tmpfiles.conf /etc/tmpfiles.d/regreet.conf
-mkdir -p "~/.local/bin/build_stage/"
-git clone https://github.com/rharish101/ReGreet.git "~/.local/bin/build_stage/" &&
+mkdir -p ~/.local/bin/build_stage/
+git clone https://github.com/rharish101/ReGreet.git ~/.local/bin/build_stage/ReGreet &&
     cd ~/.local/bin/build_stage/ReGreet/ &&
-    cargo build -F gtk4_8 --release &&
+    cargo build --release &&
     sudo cp ./target/release/regreet /usr/bin/ &&
     systemctl enable greetd.service
 cd
@@ -107,8 +117,8 @@ dconf load /org/gnome/nautilus/ < ~/.config/dconf-export/nautilus.dconf
 dconf load /org/gnome/gedit/ < ~/.config/dconf-export/gedit.dconf
 
 # rofi & rofi-calc (compilation, because why not)
-ensure_installed rofi-wayland rofi-devel qalculate automake libtool
-git clone https://github.com/svenstaro/rofi-calc "~/.local/bin/build_stage/rofi-calc" && cd "~/.local/bin/build_stage/rofi-calc" && mkdir m4 && autoreconf -i && mkdir build && cd build && ../configure && make && sudo make install 
+ensure_installed rofi-wayland rofi-devel qalculate meson libtool cairo-devel
+git clone https://github.com/svenstaro/rofi-calc ~/.local/bin/build_stage/rofi-calc && cd ~/.local/bin/build_stage/rofi-calc && meson setup build && cd build && meson compile -C build && sudo meson install
 cd
 
 # kdeconnect

gtk-4.0/gtk-dark.css

@@ -0,0 +1 @@
+/usr/share/themes/adw-gtk3-dark/gtk-4.0/gtk-dark.css

hypr/exec.lua

@@ -0,0 +1,3 @@
+hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP DISPLAY")
+hl.exec_cmd("uwsm app udiskie")
+hl.exec_cmd("uwsm app kdeconnect-indicator")

hypr/hyprland.conf

@@ -13,7 +13,8 @@
 #autogenerated = 1 # remove this line to remove the warning
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,auto
+monitor=DP-2,preferred,0x0,1
+monitor=HDMI-A-2,1920x1080,1920x-420,1, transform,1
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -34,7 +35,6 @@ windowrule {
   match:class = ^(Rofi)$
 }
 
-
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
     kb_layout = hu

hypr/hyprland.lua

@@ -0,0 +1,101 @@
+local monitors = {
+    {
+        output="DP-2", -- todo: description as ID
+        mode="preferred",
+        position="0x0",
+        scale=1
+    }, -- desktop horizontal/left
+    {
+        output="HDMI-A-2", -- todo: description as ID
+        mode="1920x1080",
+        position="1920x-420",
+        scale=1,
+        transform=1
+    }, -- desktop vertical/right
+    {
+        output="eDP-1",
+        mode="preferred",
+        position="0x0",
+        scale=1.25,
+    }, -- laptop main
+    { 
+        output = "",
+        mode = "preferred",
+        position = "auto",
+        scale = 1
+    } -- everything else
+}
+
+-- # Catppuccin theme colors
+palette = require "macchiato"
+
+-- Window rules
+hl.window_rule({
+    name = "launcher",
+    center = true,
+    stay_focused = true,
+    match = {class = "^(Rofi)$"},
+})
+
+hl.config({
+    general = {
+        gaps_in = 2,
+        gaps_out = 4,
+        border_size = 2,
+        ["col.active_border"] = palette.blue,
+        ["col.inactive_border"] = palette.overlay0,
+        layout = dwindle,
+    },
+    input = {
+        kb_layout = "hu",
+        kb_variant = "102_qwertz_dot_nodead",
+        kb_options = "grp:menu_toggle",
+        follow_mouse = true,
+        touchpad = { natural_scroll = false, },
+        sensitivity = 0, -- -1.0 .. 1.0, 0 means no modification.
+    },
+    decoration = {
+        rounding = 5,
+        blur = {
+            enabled = true,
+            size = 3,
+            passes = 1,
+        },
+        shadow = {
+          enabled = false,
+          range = 4,
+          render_power = 3,
+          color = 'rgba('..palette.baseAlpha.."ee)",
+        },
+    },
+    xwayland = { force_zero_scaling = true, },
+    misc = {
+        vrr = 1, -- VRR on for every program needing it
+        disable_splash_rendering = true,
+        disable_hyprland_logo = true,
+        --force_hypr_chan = true -- there is suddenly an anime girl on the background :D
+    },
+    debug = { disable_logs = false }
+})
+
+hl.curve("myBezier", {type="bezier", points={{0.05, 0.9}, {0.1, 1.05}}})
+hl.curve("cubic", {type="bezier", points={{0.65, 0}, {0.35, 1}}})
+hl.animation({leaf="windows", enabled=true, speed=7, bezier="myBezier"})
+hl.animation({leaf="windowsOut", enabled=true, speed=7, bezier="default", style="popin 80%"})
+hl.animation({leaf="border", enabled=true, speed=10, bezier="default"})
+hl.animation({leaf="borderangle", enabled=true, speed=8, bezier="default"})
+hl.animation({leaf="fade", enabled=true, speed=7, bezier="default"})
+hl.animation({leaf="workspaces", enabled=true, speed=6, bezier="myBezier", style="slidevert"})
+hl.animation({leaf="specialWorkspace", enabled=true, speed=3, bezier="cubic", style="slide"})
+
+hl.gesture({fingers=4, direction="vertical", action="workspace"}) -- TODO: invert
+-- hl.gesture({fingers=4, direction="horizontal", action="special"}) -- TODO: toggle
+hl.gesture({fingers=3, direction="down", action=function () hl.dsp.exec_cmd("~/.config/rofi/launchers/type-1/launcher.sh") end})
+hl.gesture({fingers=3, direction="up", action=function() hl.dsp.exec_cmd("rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -show calc -modi calc -no-show-match -no-sort -no-persist-history -calc-command \"echo -n '{result}' | wl-copy\"") end})
+hl.gesture({fingers=2, direction="pinch", action="cursor_zoom"})
+-- TODO: two finger left-right for back-forward
+hl.gesture({fingers=5, direction="pinchout", action=function() hl.dsp.exec_cmd("/usr/bin/hyprlock") end})
+hl.gesture({fingers=5, direction="pinchin", action=function() hl.dsp.window.close() end})
+
+require "exec"
+require "keybinds"

hypr/keybinds.conf

@@ -21,8 +21,8 @@ bind = $mainMod SHIFT, PERIOD, pin
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 binde = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-binde = , XF86MonBrightnessUp, exec, brightnessctl set '12.75+'
-binde = , XF86MonBrightnessDown, exec, brightnessctl set '12.75-'
+binde = , XF86MonBrightnessUp, exec, brightnessctl set '242.42+'
+binde = , XF86MonBrightnessDown, exec, brightnessctl set '242.42-'
 binde = , XF86AudioPlay, exec, playerctl play-pause
 binde = , XF86AudioNext, exec, playerctl next
 binde = , XF86AudioPrev, exec, playerctl previous

hypr/keybinds.lua

@@ -0,0 +1,77 @@
+-- Keybinds configuration file
+
+-- local mainMod = "SUPER + "
+
+local execs = {
+    -- Applications
+    F = "uwsm app nautilus",
+    T = "uwsm app kitty",
+    W = "uwsm app io.gitlab.librewolf-community.desktop",
+    SPACE = "~/.config/rofi/launchers/type-1/launcher.sh",
+    -- Launcher
+    ["SHIFT + V"] = "cliphist list | rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -dmenu | cliphist decode | wl-copy",
+    ["SHIFT + CTRL + V"] = "cliphist list | rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -dmenu | cliphist delete",
+    minus = "rofi -theme ~/.config/rofi/launchers/type-1/style-5.rasi -show calc -modi calc -no-show-match -no-sort -no-persist-history -calc-command \"echo -n '{result}' | wl-copy\"",
+    -- System components
+    B = "pkill waybar || uwsm app waybar",
+    N = "swaync-client -t -sw",
+    ["CTRL + BACKSPACE"] = "/usr/bin/hyprlock",
+    -- Screenshot
+    ["SHIFT + S"] = "slurp | grim -g - - | wl-copy && wl-paste > $(xdg-user-dir PICTURES)/screenshots/$(date  + '%Y-%m-%d-%H%M%S_grim.png')",
+    ["SHIFT + CTRL + S"] = "grim - | wl-copy && wl-paste > $(xdg-user-dir PICTURES)/screenshots/$(date  + '%Y-%m-%d-%H%M%S_grim.png')",
+    ["CTRL + C"] = "hyprpicker | wl-copy",
+}
+for key, cmd in pairs(execs) do
+    hl.bind("SUPER + "..key, hl.dsp.exec_cmd(cmd))
+end
+
+-- Move focus with "SUPER + "  +  arrow keys
+for key,dir in pairs({H="left", J="down", K="up", L="left"}) do
+    hl.bind("SUPER + "..key, hl.dsp.focus({direction=dir}))
+    hl.bind("SUPER + ".."SHIFT + "..key, hl.dsp.window.move({direction=dir})) -- will this move workspace up?
+    -- hl.bind("SUPER + ".."SHIFT + "..direction, hl.dsp.window.move(direction=direction))
+end
+
+-- for key,dir in pairs({H={x=-10, y=0}, J={x=0, y=-10}, K={x=0, y=10}, L={x=10, y=0}}) do
+--     hl.bind("SUPER + ".."CTRL + SHIFT + "..key, hl.dsp.window.resize({direction=dir}), {locked=false, repeating=false, ignore_mods=false})
+-- end
+
+for ws = 1,9 do
+    hl.bind("SUPER + ".."CTRL + "..ws, hl.dsp.focus({workspace=ws}), {locked=false, repeating=false, ignore_mods=false})
+    hl.bind("SUPER + ".."SHIFT + "..ws, hl.dsp.window.move({workspace=ws}), {locked=false, repeating=false, ignore_mods=false})
+end
+
+for key,direction in pairs({mouse_down="r+1", mouse_up="r-1", K="r-1", J='r+1', up="r-1", down="r+1", END="empty", HOME="1"}) do
+    hl.bind("SUPER + ".."CTRL + "..key, hl.dsp.focus({workspace=direction}), {locked=false, repeating=false, ignore_mods=false})
+    hl.bind("SUPER + ".."SHIFT + "..key, hl.dsp.window.move({workspace=direction}), {locked=false, repeating=false, ignore_mods=false})
+end
+
+hl.bind("SUPER + ".."BACKSPACE", hl.dsp.window.close(), {locked=false, repeating=false, ignore_mods=false})
+hl.bind("SUPER + ".."CTRL + ALT + BACKSPACE", hl.dsp.exit(), {locked=false, repeating=false, ignore_mods=false}) -- uwsm stop? loginctl?
+hl.bind("SUPER + ".."Y", hl.dsp.window.float("toggle"), {locked=false, repeating=false, ignore_mods=false})
+hl.bind("SUPER + ".."P", hl.dsp.window.pin("toggle"), {locked=false, repeating=false, ignore_mods=false})
+hl.bind("SUPER + ".."E", hl.dsp.window.fullscreen("fullscreen", "toggle"), {locked=false, repeating=false, ignore_mods=false})
+
+hl.bind("SUPER + ".."TAB", hl.dsp.workspace.toggle_special(), {locked=false, repeating=false, ignore_mods=false})
+hl.bind("SUPER + ".."mouse:274", hl.dsp.workspace.toggle_special(), {locked=false, repeating=false, ignore_mods=false})
+-- hl.bind("SUPER + ".."SHIFT + TAB", hl.dsp.window.move({workspace=special}), {locked=false, repeating=false, ignore_mods=false})
+-- hl.bind("SUPER + ".."SHIFT + mouse:274", hl.dsp.window.move({workspace=special}), {locked=false, repeating=false, ignore_mods=false})
+
+hl.bind("SUPER + ".."mouse:272", hl.dsp.window.drag(), {mouse=true, drag=true, locked=false, repeating=false, ignore_mods=false})
+hl.bind("SUPER + ".."SHIFT + mouse:272", hl.dsp.window.resize(), {mouse=true, drag=true, locked=false, repeating=false, ignore_mods=false})
+hl.bind("SUPER + ".."mouse:273", hl.dsp.window.resize(), {mouse=true, drag=true, locked=false, repeating=false, ignore_mods=false})
+
+-- Media keybinds: repeating and allow when locked
+local media_execs = {
+    XF86AudioRaiseVolume="wpclt set-volume @DEFAULT_AUDIO_SINK@ 5% + ",
+    XF86AudioLowerVolume="wpclt set-volume @DEFAULT_AUDIO_SINK@ 5%-",
+    XF86AudioMute="wpclt set-mute @DEFAULT_AUDIO_SINK@ toggle",
+    XF86MonBrightnessUp="brightnessctl set 1% + ",
+    XF86MonBrightnessDown="brightnessctl set 1%-",
+    XF86AudioPlay="playerctl play-pause",
+    XF86AudioNext="playerctl next",
+    XF86AudioPrev="playerctl previous",
+}
+for key,cmd in pairs(media_execs) do
+    hl.bind("SUPER + "..key, hl.dsp.exec_cmd(cmd), {locked=true, repeating=true, ignore_mods=true})
+end

hypr/macchiato.lua

@@ -0,0 +1,81 @@
+local M = {}
+
+M.rosewater = 'rgb(f4dbd6)'
+M.rosewaterAlpha = 'f4dbd6'
+
+M.flamingo = 'rgb(f0c6c6)'
+M.flamingoAlpha = 'f0c6c6'
+
+M.pink = 'rgb(f5bde6)'
+M.pinkAlpha = 'f5bde6'
+
+M.mauve = 'rgb(c6a0f6)'
+M.mauveAlpha = 'c6a0f6'
+
+M.red = 'rgb(ed8796)'
+M.redAlpha = 'ed8796'
+
+M.maroon = 'rgb(ee99a0)'
+M.maroonAlpha = 'ee99a0'
+
+M.peach = 'rgb(f5a97f)'
+M.peachAlpha = 'f5a97f'
+
+M.yellow = 'rgb(eed49f)'
+M.yellowAlpha = 'eed49f'
+
+M.green = 'rgb(a6da95)'
+M.greenAlpha = 'a6da95'
+
+M.teal = 'rgb(8bd5ca)'
+M.tealAlpha = '8bd5ca'
+
+M.sky = 'rgb(91d7e3)'
+M.skyAlpha = '91d7e3'
+
+M.sapphire = 'rgb(7dc4e4)'
+M.sapphireAlpha = '7dc4e4'
+
+M.blue = 'rgb(8aadf4)'
+M.blueAlpha = '8aadf4'
+
+M.lavender = 'rgb(b7bdf8)'
+M.lavenderAlpha = 'b7bdf8'
+
+M.text = 'rgb(cad3f5)'
+M.textAlpha = 'cad3f5'
+
+M.subtext1 = 'rgb(b8c0e0)'
+M.subtext1Alpha = 'b8c0e0'
+
+M.subtext0 = 'rgb(a5adcb)'
+M.subtext0Alpha = 'a5adcb'
+
+M.overlay2 = 'rgb(939ab7)'
+M.overlay2Alpha = '939ab7'
+
+M.overlay1 = 'rgb(8087a2)'
+M.overlay1Alpha = '8087a2'
+
+M.overlay0 = 'rgb(6e738d)'
+M.overlay0Alpha = '6e738d'
+
+M.surface2 = 'rgb(5b6078)'
+M.surface2Alpha = '5b6078'
+
+M.surface1 = 'rgb(494d64)'
+M.surface1Alpha = '494d64'
+
+M.surface0 = 'rgb(363a4f)'
+M.surface0Alpha = '363a4f'
+
+M.base = 'rgb(24273a)'
+M.baseAlpha = '24273a'
+
+M.mantle = 'rgb(1e2030)'
+M.mantleAlpha = '1e2030'
+
+M.crust = 'rgb(181926)'
+M.crustAlpha = '181926'
+
+return M

nvim/lua/chadrc.lua

@@ -1,7 +1,7 @@
 local options = {
 
   base46 = {
-    theme = "chadracula-evondev", -- default theme
+    theme = "eldritch", -- default theme
     hl_add = {},
     hl_override = {},
     integrations = {},
@@ -11,7 +11,7 @@ local options = {
       },
     },
     transparency = true,
-    theme_toggle = { "chadracula-evondev", "one_light" },
+    theme_toggle = { "eldritch", "one_light" },
   },
 
   ui = {

nvim/lua/configs/lspconfig.lua

@@ -2,6 +2,6 @@ local on_attach = require("nvchad.configs.lspconfig").on_attach
 local capabilities = require("nvchad.configs.lspconfig").capabilities
 
 -- if you just want default config for the servers then put them in a table
-local servers = { "hyprls", "lua-language-server", "clangd", "basedpyright", "vhdl_ls" }
+local servers = { "hyprls", "lua-language-server", "clangd", "basedpyright", "vhdl_ls", "verible" }
 
 vim.lsp.enable(servers)

nvim/lua/myinit.lua

@@ -6,21 +6,14 @@ local autocmd = vim.api.nvim_create_autocmd
 --   command = "tabdo wincmd =",
 -- })
 
-autocmd({ "FileType" }, {
-    callback = function()
-
-        -- check if treesitter has parser
-        if require("nvim-treesitter.parsers").has_parser() then
-
-            -- use treesitter folding
-            vim.opt.foldmethod = "expr"
-            vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-        else
-
-            -- use alternative foldmethod
-            vim.opt.foldmethod = "syntax"
-        end
-    end,
+autocmd('FileType', {
+  pattern = { 'lua', 'vhdl', 'python', 'markdown', 'latex', 'c', 'cpp', 'hyprlang', 'html', 'css', 'yaml', 'json' },
+  callback = function()
+    vim.treesitter.start()                                    -- highlighting
+    vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'     -- folds
+    vim.wo.foldmethod = 'expr'
+    -- vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" -- indentation
+  end,
 })
 
 -- disable folding on startup
@@ -63,3 +56,9 @@ local enable_providers = {
     end
 
 vim.g.python3_host_prog = vim.fn.expand(os.getenv("XDG_STATE_HOME") .. "/virtualenvs/neovim/bin/python3")
+
+-- Acu filetype
+autocmd({'BufRead', 'BufNewFile'}, {
+    pattern = '*.acu',
+    command = "set filetype=acu"
+})

nvim/lua/options.lua

@@ -6,6 +6,3 @@ require "nvchad.options"
 -- o.cursorlineopt ='both' -- to enable cursorline!
 
 local o = vim.o
--- Enable treesitter folding
-o.foldmethod = "expr"
-o.foldexpr = "nvim_treesitter#foldexpr()"

regreet/greetd/config.toml

@@ -5,6 +5,6 @@ vt = current
 
 # The default session, also known as the greeter.
 [default_session]
-command = "Hyprland --config /etc/greetd/hyprland.conf"
+command = "dbus-run-session start-hyprland -- -c /etc/greetd/hyprland.lua"
 user = "greetd"
 

regreet/greetd/hyprland.conf

@@ -1,8 +0,0 @@
-exec-once = regreet; hyprctl dispatch exit
-input {
-    kb_layout = hu
-}
-misc {
-    disable_hyprland_logo = true
-    disable_splash_rendering = true
-}

regreet/greetd/hyprland.lua

@@ -0,0 +1,13 @@
+hl.on("hyprland.start", function()
+    hl.exec_cmd("regreet; hyprctl dispatch 'hl.dsp.exit()'")
+end)
+hl.config({
+    misc = {
+        disable_hyprland_logo = true,
+        disable_splash_rendering = true,
+        disable_hyprland_guiutils_check = true,
+    },
+    input = {
+        kb_layout = "hu"
+    }
+})

rofi/applets/bin/ppd.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+## Author  : Aditya Shakya (adi1090x)
+## Github  : @adi1090x
+#
+## Applets : Power Menu
+
+# Import Current Theme
+source "$HOME"/.config/rofi/applets/shared/theme.bash
+theme="$type/$style"
+
+# Theme Elements
+prompt="Select power profile"
+mesg="Current power profile : `powerprofilesctl get`"
+
+if [[ ( "$theme" == *'type-1'* ) || ( "$theme" == *'type-3'* ) || ( "$theme" == *'type-5'* ) ]]; then
+    list_col='1'
+    list_row='3'
+elif [[ ( "$theme" == *'type-2'* ) || ( "$theme" == *'type-4'* ) ]]; then
+    list_col='3'
+    list_row='1'
+fi
+
+# Options
+layout=`cat ${theme} | grep 'USE_ICON' | cut -d'=' -f2`
+if [ "$layout" = 'NO' ]; then
+    option_1="󰡴 Performance"
+    option_2="󰊚 Balanced"
+    option_3="󰡳 Power saver"
+else
+    option_1="󰡴"
+    option_2="󰊚"
+    option_3="󰡳"
+fi
+
+# Rofi CMD
+rofi_cmd() {
+    rofi -theme-str "listview {columns: $list_col; lines: $list_row;}" \
+        -theme-str 'textbox-prompt-colon {str: "";}' \
+        -dmenu \
+        -p "$prompt" \
+        -mesg "$mesg" \
+        -markup-rows \
+        -theme ${theme}
+}
+
+# Pass variables to rofi dmenu
+run_rofi() {
+    echo -e "$option_1\n$option_2\n$option_3" | rofi_cmd
+}
+
+
+# Execute Command
+run_cmd() {
+    if [ "$1" = '--opt1' ]; then
+        powerprofilesctl set performance
+    elif [ "$1" = '--opt2' ]; then
+        powerprofilesctl set balanced
+    elif [ "$1" = '--opt3' ]; then
+        powerprofilesctl set power-saver
+    fi
+}
+
+# Actions
+chosen="$(run_rofi)"
+case ${chosen} in
+    $option_1)
+        run_cmd --opt1
+        ;;
+    $option_2)
+        run_cmd --opt2
+        ;;
+    $option_3)
+        run_cmd --opt3
+        ;;
+esac
+

waybar/config_desktop.json

@@ -0,0 +1,40 @@
+[{
+  "layer": "top",
+  "position": "top",
+  "output": "DP-2",
+  "include": [
+    "~/.config/waybar/modules.jsonc"
+  ],
+  "height": 40,
+  "margin-left": 3, 
+  "margin-right": 3,
+  "margin-top": 3,
+  "margin-bottom": 3,
+  "modules-left": ["custom/junkyard", "hyprland/workspaces"],
+  "modules-center": ["clock"],
+  "modules-right": ["tray", "custom/notification", "pulseaudio", "bluetooth", "network", "memory", "cpu", "group/group-power"],
+  "tray": {
+    "icon-size": 16,
+    "spacing": 10
+  },
+},
+{
+  "layer": "top",
+  "position": "top",
+  "output": "HDMI-A-2",
+  "include": [
+    "~/.config/waybar/modules.jsonc"
+  ],
+	"height": 40,
+  "margin-left": 3, 
+  "margin-right": 3,
+  "margin-top": 3,
+  "margin-bottom": 3,
+  "modules-left": ["custom/junkyard", "hyprland/workspaces"],
+  "modules-center": ["clock"],
+  "modules-right": ["tray", "custom/notification", "pulseaudio", "group/group-power"],
+  "tray": {
+    "icon-size": 16,
+    "spacing": 10
+  },
+}]

waybar/config_laptop.json

@@ -4,14 +4,14 @@
   "include": [
     "~/.config/waybar/modules.jsonc"
   ],
-	"height": 40,
+  "height": 20,
   "margin-left": 3, 
   "margin-right": 3,
   "margin-top": 3,
   "margin-bottom": 3,
   "modules-left": ["custom/junkyard", "hyprland/workspaces"],
   "modules-center": ["clock"],
-  "modules-right": ["tray", "custom/notification", "pulseaudio", "bluetooth", "network", "memory", "cpu", "group/group-power"],
+  "modules-right": ["tray", "custom/notification", "pulseaudio", "backlight", "bluetooth", "network", "battery", "group/group-power" ],
   "tray": {
     "icon-size": 16,
     "spacing": 10

waybar/modules.jsonc

@@ -20,39 +20,39 @@
         // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format": "{:%a, %d %b, %R}",
-				"on-click": ""
+        "on-click": ""
     },
 
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
         //"reverse-scrolling": 1,
-        "format": "{icon} {volume}% {format_source}",
-        "format-bluetooth": "{icon}  {volume}% {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": "婢 {format_source}",
-        "format-source": " {volume}%",
-        "format-source-muted": "",
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": "{volume}% {icon}󰂲 {format_source}",
+        "format-muted": "{volume}% 󰝟 {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "{volume}% ",
         "format-icons": {
             "headphone": "󰋋",
-            "hands-free": "",
+            "hands-free": "󱡒",
             "headset": "󰋎",
             "phone": "",
-            "portable": "",
+            "portable": "󰓃",
             "car": "",
             "default": ["󰸈", "󰕿", "󰖀", "󰕾"]
         },
-        "on-click": "~/.config/rofi/applets/bin/volume.sh",
+        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
         "on-click-right": "uwsm app pavucontrol"
     },
 
-		"bluetooth": {
-			"format": "",
-			"format-disabled": "",
-			"format-connected": " {num_connections}",
-			"tooltip-format-enumerate-connected": "{device_alias}",
-			"tooltip-format-connected": "{device_enumerate}",
-			"on-click": "uwsm app blueman-manager"
-		},
+    "bluetooth": {
+        "format": "",
+        "format-disabled": "",
+        "format-connected": "{num_connections} ",
+        "tooltip-format-enumerate-connected": "{device_alias}",
+        "tooltip-format-connected": "{device_enumerate}",
+        "on-click": "uwsm app blueman-manager"
+    },
 
     "temperature": {
         // "thermal-zone": 2,
@@ -66,6 +66,7 @@
 
     "tray": {
         "icon-size": 13,
+        "show-passive-items": true,
         "spacing": 00
     },
 
@@ -73,14 +74,14 @@
         "tooltip": false,
         "format": "{icon}",
         "format-icons": {
-          "notification": "<span foreground='red'><sup></sup></span>",
-          "none": "",
-          "dnd-notification": "<span foreground='red'><sup></sup></span>",
-          "dnd-none": "",
-          "inhibited-notification": "<span foreground='red'><sup></sup></span>",
-          "inhibited-none": "",
-          "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
-          "dnd-inhibited-none": ""
+            "notification": "<span foreground='red'><sup></sup></span>",
+            "none": "",
+            "dnd-notification": "<span foreground='red'><sup></sup></span>",
+            "dnd-none": "",
+            "inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "inhibited-none": "",
+            "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "dnd-inhibited-none": ""
         },
         "return-type": "json",
         "exec-if": "which swaync-client",
@@ -91,94 +92,99 @@
         "escape": true
     },
 
-  "cpu": {
-    "interval": 1,
-    "format": "  {usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
-    "format-icons": [
-      "<span color='#a6da95'>▁</span>", // green
-      "<span color='#8aadf4'>▂</span>", // blue
-      "<span color='#8aadf4'>▃</span>", // white
-      "<span color='#8aadf4'>▄</span>", // white
-      "<span color='#8aadf4'>▅</span>", // yellow
-      "<span color='#eed49f'>▆</span>", // yellow
-      "<span color='#f5a97f'>▇</span>", // orange
-      "<span color='#ed8796'>█</span>"  // red
-     ]
-  },
+    "cpu": {
+        "interval": 1,
+        "format": "{usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7} ",
+        "format-icons": [
+            "<span color='#a6da95'>▁</span>", // green
+            "<span color='#8aadf4'>▂</span>", // blue
+            "<span color='#8aadf4'>▃</span>", // white
+            "<span color='#8aadf4'>▄</span>", // white
+            "<span color='#8aadf4'>▅</span>", // yellow
+            "<span color='#eed49f'>▆</span>", // yellow
+            "<span color='#f5a97f'>▇</span>", // orange
+            "<span color='#ed8796'>█</span>"  // red
+        ]
+    },
 
-  "memory": {
-      "interval": 5,
-      "format": "󰍛 {percentage}%"
-  },
+    "memory": {
+        "interval": 5,
+        "format": "{percentage}% 󰍛"
+    },
 
-  "group/group-power": {
-      "orientation": "inherit",
-      "drawer": {
-          "transition-duration": 500,
-          "children-class": "not-power",
-          "transition-left-to-right": true
-      },
-      "modules": [
-          "custom/power", // First element is the "group leader" and won't ever be hidden
-          "custom/reboot",
-          "custom/quit",
-          "custom/suspend",
-          "custom/lock"
-      ]
-  },
-  "custom/quit": {
-      "format": " 󰗼 ",
+    "group/group-power": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 500,
+            "children-class": "not-power",
+            "transition-left-to-right": true
+        },
+        "modules": [
+            "custom/power", // First element is the "group leader" and won't ever be hidden
+            "custom/reboot",
+            "custom/quit",
+            "custom/suspend",
+            "custom/lock"
+        ]
+    },
+    "custom/quit": {
+        "format": "󰗼",
+        "tooltip": false,
+        "on-click": "uwsm stop"
+    },
+    "custom/lock": {
+        "format": "󰍁",
+        "tooltip": false,
+        "on-click": "loginctl lock-session"
+    },
+    "custom/suspend": {
+      "format": "󰒲",
       "tooltip": false,
-      "on-click": "uwsm stop"
-  },
-  "custom/lock": {
-      "format": " 󰍁 ",
-      "tooltip": false,
-      "on-click": "loginctl lock-session"
-  },
-  "custom/suspend": {
-    "format": " 󰒲 ",
-    "tooltip": false,
-    "on-click": "systemctl suspend"
-  },
-  "custom/reboot": {
-      "format": " 󰜉 ",
-      "tooltip": false,
-      "on-click": "systemctl reboot"
-  },
-  "custom/power": {
-      "format": "  ",
-      "tooltip": false,
-      "on-click": "systemctl poweroff"
-  },
+      "on-click": "systemctl suspend"
+    },
+    "custom/reboot": {
+        "format": "󰜉",
+        "tooltip": false,
+        "on-click": "systemctl reboot"
+    },
+    "custom/power": {
+        "format": "󰐥",
+        "tooltip": false,
+        "on-click": "systemctl poweroff"
+    },
 
-	"battery": {
-		"states": {
-			"warning": 20,
-			"critical": 5
-		},
-		"format": "{capacity}% {icon}",
-		"format-charging": "{capacity}% 󰂄",
-		"format-plugged": "{capacity}% 󰚥",
-		"format-alt": "{time} {icon}",
-		"format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂁", "󰁹"],
-		"on-click": "~/.config/rofi/applets/bin/powermenu.sh"
-	},
-	"battery#bat0": {
-		"bat": "BAT0"
-	},
+    "battery": {
+        "states": {
+            "warning": 20,
+            "critical": 5
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% 󰂄",
+        "format-plugged": "{capacity}% 󰚥",
+        // "format-alt": "{time} {icon}",
+        "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂁", "󰁹"],
+        "on-click": "~/.config/rofi/applets/bin/ppd.sh"
+    },
+    "battery#bat0": {
+        "bat": "BAT0"
+    },
 
-	"network": {
-		"format-wifi": "{icon}",
-		"format-ethernet": "󰈀",
-		"format-linked": "󰤩",
-		"format-disconnected": "󰤮",
-		"tooltip-format": "{ifname}",
-		"tooltip-format-wifi": "{essid} {signaldBm}dBm | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits}",
-		"tooltip-format-ethernet": "{essid} | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits} | IP: {ipaddr} GW:{gwaddr}",
-		"tooltip-format-disconnected": "Disconnected",
-		"format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
-		"on-click": "~/.config/rofi/applets/bin/rofi-wifi-menu.sh",
-		"on-click-right": "nm-connection-editor"
-	}
+    "backlight": {
+        "format": "{percent}% {icon}",
+        "format-icons": ["󰃞", "󰃟", "󰃠"]
+    },
+
+    "network": {
+        "format-wifi": "{icon}",
+        "format-ethernet": "󰈀",
+        "format-linked": "󰤩",
+        "format-disconnected": "󰤮",
+        "tooltip-format": "{ifname}",
+        "tooltip-format-wifi": "{essid} {signaldBm}dBm | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits}",
+        "tooltip-format-ethernet": "{essid} | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits} | IP: {ipaddr} GW:{gwaddr}",
+        "tooltip-format-disconnected": "Disconnected",
+        "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
+        "on-click": "~/.config/rofi/applets/bin/rofi-wifi-menu.sh",
+        "on-click-right": "nm-connection-editor"
+    }
 }

waybar/style.css

@@ -1,158 +1,166 @@
 @import 'macchiato.css';
 * {
-  font-family: "Roboto";
-  font-size: 16px;
-  min-width: 15px;
+    font-family: "Roboto";
+    font-size: 16px;
+    min-width: 15px;
 }
 
 window#waybar {
-  background-color: transparent;
+    background-color: transparent;
 }
 
 window#waybar.hidden {
-  opacity: 0.5;
+    opacity: 0.5;
 }
 
 button {
-  box-shadow: inset 0 -3px transparent;
-  border: none;
-  border-radius: 10px;
-  color: @text;
+    box-shadow: inset 0 -3px transparent;
+    border: none;
+    border-radius: 10px;
+    color: @text;
 }
 
 
+#workspaces {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 0px 10px 10px 0px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
+}
+
 #workspaces button.active { 
-  background-color:  	@blue;
-  border: 1px solid  	@blue;
-  border-radius: 10px;
-  color: @base;
+    background-color:  	@blue;
+    /* border: 1px solid  	@blue; */
+    border-radius: 10px;
+    color: @base;
+}
+
+#workspaces button:hover {
+    background: @crust;
+    color: @text;
+    border-radius: 10px;
 }
 
 #workspaces button.urgent {
-  background-color: @red;
-  border: 1px solid  	@red;
-  border-radius: 10px;
-  color: @base;
+    background-color: @red;
+    border: 1px solid  	@red;
+    border-radius: 10px;
+    color: @base;
 }
 
-#clock,
-#battery{
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
+#clock {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
 }
 
 #mpd {
-  padding: 0 10px;
-  color: @subtext1;
+    padding: 0 10px;
+    color: @subtext1;
 }
 
 #tray {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px 0px 0px 10px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px 0px 0px 10px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
 }
 
 #custom-notification,
 #pulseaudio,
 #network,
 #memory,
+#backlight,
 #bluetooth {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px; /* Adjust as needed */
-  padding: 3px 7px;
-  color: @text;
-  margin: 0px;
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 0px; /* Adjust as needed */
+    padding: 3px 5px;
+    color: @text;
+    margin: 0px;
 }
 
-#cpu {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-  min-width: 80px;
+#pulseaudio {
+    min-width: 110px
 }
-
 #backlight {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-}
-
-#custom-junkyard {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px 0px 0px 10px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-}
-
-#workspaces {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-}
-
-
-#clock {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px;
-  padding: 3px 10px;
-  color: @text;
-}
-
-#group-power {
-  background-color: @base;
-  border-radius: 10px;
-  padding: 3px 5px;
-  margin-left: 3px;
-  color: @text;
+    min-width: 60px
 }
 
+#cpu,
 #battery {
-  background-color: @base; /* Change this to any gray color you want */
-  color: @text;
-  margin-left: 7px;
+      background-color: @base; /* Change this to any gray color you want */
+      border-radius: 0px 10px 10px 0px; /* Adjust as needed */
+      padding: 3px 10px 3px 5px;
+      color: @text;
 }
 
-#battery.charging, #battery.plugged {
-  color: @base;
-  background-color: @teal;
-  border-radius: 10px;
-  padding: 3px 10px;
-}
-
-@keyframes blink {
-  to {
-    background-color: @subtext1;
-    color: @crust;
-  }
+#battery.charging,
+#battery.plugged {
+    color: @base;
+    background-color: @teal;
 }
 
 #battery.critical:not(.charging) {
-  background-color: @red;
-  color: @subtext1;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-  border-radius: 10px;
-  padding: 3px 10px;
+      background-color: @red;
+      color: @subtext1;
+      animation-name: blink;
+      animation-duration: 0.5s;
+      animation-timing-function: linear;
+      animation-iteration-count: infinite;
+      animation-direction: alternate;
+}
+
+#custom-junkyard {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px 0px 0px 10px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
+}
+
+#clock {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px;
+    padding: 3px 10px;
+    color: @text;
+}
+
+#group-power {
+    background-color: @base;
+    border-radius: 10px;
+    padding: 3px 8px;
+    margin-left: 3px;
+    color: @text;
+}
+
+#custom-quit,
+#custom-lock,
+#custom-suspend,
+#custom-reboot,
+#custom-power {
+    padding: 3px 6px;
+}
+
+#custom-power{
+    font-size: 20px;
+}
+
+@keyframes blink {
+    to {
+        background-color: @subtext1;
+        color: @crust;
+    }
 }
 
 label:focus {
-  background-color: @crust;
+    background-color: @crust;
 }
 
 #tray > .passive {
-  -gtk-icon-effect: dim;
+    -gtk-icon-effect: dim;
 }
 
 #tray > .needs-attention {
-  -gtk-icon-effect: highlight;
-  background-color: @red;
+    -gtk-icon-effect: highlight;
+    background-color: @red;
 }

zsh/zsh_aliases

@@ -1,7 +1,6 @@
 # bash-aliases
 
 # command preferences
-alias sudo="doas"					# less bloated, more secure
 alias cp="cp -i"                                	# confirm before overwriting something
 alias df='df -h'                                	# human-readable sizes
 alias free='free -m'                            	# show sizes in MB
@@ -21,10 +20,10 @@ alias less='less -r' # retain color escapes
 #alias holoware='wine ~/Programs/holoware/Holoware\ v0.2/Holoware.exe'	# Fanmade Wario Ware style game with Hololive characters
 
 # one-liners
-alias bton='doas /etc/init.d/bluetooth start'				# Turn the bluetooth daemon on
-alias btoff='doas /etc/init.d/bluetooth stop'				# Turn the bluetooth daemon off
-alias ani-hist='${EDITOR} "${XDG_CACHE_HOME:-$HOME/.cache}/ani-hsts"'		# Edit the history file of ani-cli
-alias ud="doas dnf upgrade; flatpak update -y;"			# ud for quick update
+alias bton='sudo /etc/init.d/bluetooth start'				# Turn the bluetooth daemon on
+alias btoff='sudo /etc/init.d/bluetooth stop'				# Turn the bluetooth daemon off
+alias ani-hist='${EDITOR} "${XDG_STATE_HOME:-$HOME/.local/state}/ani-cli/ani-hsts"'		# Edit the history file of ani-cli
+alias ud="sudo dnf upgrade; flatpak update -y;"			# ud for quick update
 #alias toolbox='systemctl start iscsid open-iscsi'			# start the iSCSI services 
 cdwork () {
 	lxc list status=running | grep -q quarch || lxc start quarch