diff --git a/PKGBUILD b/PKGBUILD index 51d2e0e..8f22981 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Aditya Shakya pkgname=archcraft-berry -pkgver=3.0 -pkgrel=1 +pkgver=4.0 +pkgrel=0 pkgdesc="Berry Configurations for Archcraft" arch=('any') url="https://github.com/archcraft-os/archcraft-berry" diff --git a/archcraft-berry.install b/archcraft-berry.install index bb65aef..66f7f78 100644 --- a/archcraft-berry.install +++ b/archcraft-berry.install @@ -24,7 +24,7 @@ skel_dir='/etc/skel/.config' wm_config='berry' wm_name='Berry' current_config="$config_dir/$wm_config" -updated_config="$config_dir/${wm_config}_pacnew_`date +%d-%m-%y`" +updated_config="$config_dir/${wm_config}_pacnew_`date +%Y-%m-%d`" ## ----------------------------------- diff --git a/build.sh b/build.sh index 6ec8650..8616cf6 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## Script Termination exit_on_signal_SIGINT () { diff --git a/files/alacritty/alacritty.toml b/files/alacritty/alacritty.toml new file mode 100644 index 0000000..f61c2c5 --- /dev/null +++ b/files/alacritty/alacritty.toml @@ -0,0 +1,104 @@ +## Copyright (C) 2020-2024 Aditya Shakya +## +## Configuration for Alacritty, the GPU enhanced terminal emulator. +## It's a very basic and simple config file, for full configuration, Run `man 5 alacritty` + +## GENERAL -------------------------------------------------------- + +## Import additional configuration files. +import = ["~/.config/berry/alacritty/colors.toml", "~/.config/berry/alacritty/fonts.toml"] + +## You can set shell.program to the path of your favorite shell, e.g. /bin/zsh. +## Entries in shell.args are passed as arguments to the shell. +#shell = { program = "/bin/zsh", args = ["--login"] } + +## Directory the shell is started in. When this is unset, or "None", +## the working directory of the parent process will be used. +#working_directory = "None" + +## Live config reload +live_config_reload = true + +## Offer IPC using alacritty msg +ipc_socket = true + +## ENVIRONMENT ---------------------------------------------------- + +## All key-value pairs in the [env] section will be added as environment variables for any process spawned +## by Alacritty, including its shell. Some entries may override variables set by alacritty itself. +[env] +TERM = "alacritty" +WINIT_X11_SCALE_FACTOR = "1.0" + +## WINDOW --------------------------------------------------------- +[window] +position = "None" +dynamic_padding = true +decorations = "full" +opacity = 1.0 +blur = false +startup_mode = "Windowed" +dynamic_title = true +class = { instance = "Alacritty", general = "Alacritty" } +decorations_theme_variant = "None" + +## Number of lines/columns (not pixels) in the terminal. +[window.dimensions] +columns = 82 +lines = 24 + +## Blank space added around the window in pixels. +[window.padding] +x = 25 +y = 25 + +## SCROLLING ------------------------------------------------------ +[scrolling] +history = 10000 +multiplier = 3 + +## BELL ----------------------------------------------------------- +[bell] +animation = "Linear" +duration = 20 +command = { program = "paplay", args = ["/usr/share/sounds/freedesktop/stereo/dialog-error.oga"] } + +## SELECTION ------------------------------------------------------ +[selection] +save_to_clipboard = true + +## CURSOR --------------------------------------------------------- +[cursor] +vi_mode_style = "None" +blink_interval = 750 +blink_timeout = 5 +unfocused_hollow = false +thickness = 0.15 + +[cursor.style] +shape = "Block" +blinking = "On" + +## MOUSE ---------------------------------------------------------- +[mouse] +hide_when_typing = false + +## HINTS ---------------------------------------------------------- +[[hints.enabled]] +command = "xdg-open" +hyperlinks = true +post_processing = true +persist = false +mouse.enabled = true +binding = { key = "U", mods = "Control|Shift" } +regex = "(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file:|git://|ssh:|ftp://)[^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩‘]+" + +## DEBUG ---------------------------------------------------------- +[debug] +render_timer = false +persistent_logging = false +log_level = "Warn" +renderer = "None" +print_events = false +highlight_damage = false +prefer_egl = false diff --git a/files/alacritty/alacritty.yml b/files/alacritty/alacritty.yml deleted file mode 100644 index 297f34b..0000000 --- a/files/alacritty/alacritty.yml +++ /dev/null @@ -1,53 +0,0 @@ -## Copyright (C) 2020-2023 Aditya Shakya -## -## Configuration for Alacritty, the GPU enhanced terminal emulator. -## It's a very basic and simple config file, for full configuration... -## See, /usr/share/doc/alacritty/example/alacritty.yml - -## Import files (Colors, Fonts, Etc) -import: - - ~/.config/berry/alacritty/colors.yml - - ~/.config/berry/alacritty/fonts.yml - -## Set environment variables -env: - TERM: alacritty - WINIT_X11_SCALE_FACTOR: '1.0' - -## Terminal window settings -window: - dimensions: - columns: 82 - lines: 24 - - padding: - x: 25 - y: 25 - - decorations: full - startup_mode: Windowed - dynamic_title: true - -## scrolling - history: 10000 - multiplier: 3 - -## Background opacity - opacity: 1.0 - -## Cursor -cursor: - style: - shape: Block - blinking: On - - unfocused_hollow: false - -## Live config reload -live_config_reload: true - -## Shell -#shell: -# program: /bin/zsh -# args: -# - --login diff --git a/files/alacritty/colors.toml b/files/alacritty/colors.toml new file mode 100644 index 0000000..b258bd7 --- /dev/null +++ b/files/alacritty/colors.toml @@ -0,0 +1,27 @@ +## Copyright (C) 2020-2024 Aditya Shakya +## +## Colors configuration ------------------------------------- + +[colors.primary] +background = "#011826" +foreground = "#EEEEEE" + +[colors.normal] +black = "#152B42" +red = "#D97E96" +green = "#498653" +yellow = "#838649" +blue = "#496886" +magenta = "#A36584" +cyan = "#50A6A8" +white = "#ABB2BF" + +[colors.bright] +black = "#1E3C5A" +red = "#D97E96" +green = "#498653" +yellow = "#838649" +blue = "#496886" +magenta = "#A36584" +cyan = "#50A6A8" +white = "#B5BCC9" diff --git a/files/alacritty/colors.yml b/files/alacritty/colors.yml deleted file mode 100644 index b6f6a22..0000000 --- a/files/alacritty/colors.yml +++ /dev/null @@ -1,31 +0,0 @@ -## Copyright (C) 2020-2023 Aditya Shakya -## -## Colors configuration - -colors: - # Default colors - primary: - background: '#011826' - foreground: '#EEEEEE' - - # Normal colors - normal: - black: '#152B42' - red: '#D97E96' - green: '#498653' - yellow: '#838649' - blue: '#496886' - magenta: '#A36584' - cyan: '#50A6A8' - white: '#ABB2BF' - - # Bright colors - bright: - black: '#1E3C5A' - red: '#D97E96' - green: '#498653' - yellow: '#838649' - blue: '#496886' - magenta: '#A36584' - cyan: '#50A6A8' - white: '#B5BCC9' diff --git a/files/alacritty/fonts.toml b/files/alacritty/fonts.toml new file mode 100644 index 0000000..38a7adf --- /dev/null +++ b/files/alacritty/fonts.toml @@ -0,0 +1,38 @@ +## Copyright (C) 2020-2024 Aditya Shakya +## +## Font configuration --------------------------------------- + +[font] +## Font size in points. +size = 10 + +## When true, Alacritty will use a custom built-in font for box drawing characters and powerline symbols. +builtin_box_drawing = true + +## Normal font family. +[font.normal] +family = "JetBrainsMono Nerd Font" + +## If the family is not specified, it will fall back to the value specified for the normal font. +[font.bold] +family = "JetBrainsMono Nerd Font" + +## If the family is not specified, it will fall back to the value specified for the normal font. +[font.italic] +family = "JetBrainsMono Nerd Font" + +## If the family is not specified, it will fall back to the value specified for the normal font. +[font.bold_italic] +family = "JetBrainsMono Nerd Font" + +## Offset is the extra space around each character. +## 'y' can be thought of as modifying the line spacing, and 'x' as modifying the letter spacing. +[font.offset] +x = 0 +y = 0 + +## Glyph offset determines the locations of the glyphs within their cells with the default being at the bottom. +## Increasing 'x' moves the glyph to the right, increasing 'y' moves the glyph upward. +[font.glyph_offset] +x = 0 +y = 0 diff --git a/files/alacritty/fonts.yml b/files/alacritty/fonts.yml deleted file mode 100644 index dcb2943..0000000 --- a/files/alacritty/fonts.yml +++ /dev/null @@ -1,37 +0,0 @@ -## Copyright (C) 2020-2023 Aditya Shakya -## -## Font configuration - -font: - # Normal (roman) font face - normal: - family: "JetBrainsMono Nerd Font" - #style: Regular - - # Bold font face - bold: - family: "JetBrainsMono Nerd Font" - #style: Bold - - # Italic font face - italic: - family: "JetBrainsMono Nerd Font" - #style: Italic - - # Bold italic font face - bold_italic: - family: "JetBrainsMono Nerd Font" - #style: Bold Italic - - # Point size - size: 10 - - # Offset - #offset: - # x: 0 - # y: 0 - - # Glyph offset - #glyph_offset: - # x: 0 - # y: 0 diff --git a/files/autostart b/files/autostart index 0078a6f..bd26365 100755 --- a/files/autostart +++ b/files/autostart @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## Config file for berry WM diff --git a/files/dunstrc b/files/dunstrc index a4b756a..ed5b875 100644 --- a/files/dunstrc +++ b/files/dunstrc @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya [global] monitor = 0 diff --git a/files/picom.conf b/files/picom.conf index 0ff7616..af5a9b3 100644 --- a/files/picom.conf +++ b/files/picom.conf @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3 ## ## Original Picom's Config File @@ -17,7 +17,7 @@ rounded-corners-exclude = [ # "window_type = 'dock'", "window_type = 'desktop'", # "class_g ?= 'rofi'", -# "class_g ?= 'polybar'", +# "class_g ?= 'Polybar'", "class_g ?= 'tint2'" ]; @@ -73,7 +73,7 @@ shadow-exclude = [ "name ?= 'gnome-pie'", # "class_g = 'Dmenu'", # "class_g ?= 'rofi'", -# "class_g ?= 'polybar'", +# "class_g ?= 'Polybar'", "class_g ?= 'Plank'", "name *= 'recordmydesktop'", "name = 'Notification'", diff --git a/files/scripts/berry_asroot b/files/scripts/berry_asroot index df17cd9..28341c0 100755 --- a/files/scripts/berry_asroot +++ b/files/scripts/berry_asroot @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # berry directory DIR="$HOME/.config/berry" diff --git a/files/scripts/berry_autostart b/files/scripts/berry_autostart index 19fa07f..bfc8e5b 100755 --- a/files/scripts/berry_autostart +++ b/files/scripts/berry_autostart @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## Autostart Programs diff --git a/files/scripts/berry_bar b/files/scripts/berry_bar index 53a4e0b..a858637 100755 --- a/files/scripts/berry_bar +++ b/files/scripts/berry_bar @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # berry directory DIR="$HOME/.config/berry" diff --git a/files/scripts/berry_brightness b/files/scripts/berry_brightness index 0a67988..176f2bd 100755 --- a/files/scripts/berry_brightness +++ b/files/scripts/berry_brightness @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## Script to manage brightness on Archcraft. diff --git a/files/scripts/berry_colorpicker b/files/scripts/berry_colorpicker index 20a73b6..3a92c95 100755 --- a/files/scripts/berry_colorpicker +++ b/files/scripts/berry_colorpicker @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## Simple script to pick color quickly. diff --git a/files/scripts/berry_comp b/files/scripts/berry_comp index 502e50f..4f338a0 100755 --- a/files/scripts/berry_comp +++ b/files/scripts/berry_comp @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # berry directory DIR="$HOME/.config/berry" diff --git a/files/scripts/berry_dunst b/files/scripts/berry_dunst index fc2c0aa..ebcf176 100755 --- a/files/scripts/berry_dunst +++ b/files/scripts/berry_dunst @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # berry directory DIR="$HOME/.config/berry" diff --git a/files/scripts/berry_music b/files/scripts/berry_music index b4eb560..e53eb17 100755 --- a/files/scripts/berry_music +++ b/files/scripts/berry_music @@ -1,15 +1,14 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## Run ncmpcpp with alternate config # berry directory DIR="$HOME/.config/berry" -CONFIG="$DIR/alacritty/alacritty.yml" +CONFIG="$DIR/alacritty/alacritty.toml" alacritty --class 'Music,Music' --config-file "$CONFIG" \ - -o window.dimensions.columns=109 window.dimensions.lines=22 \ + -o window.dimensions.columns=105 window.dimensions.lines=22 \ -e ~/.ncmpcpp/scripts/ncmpcpp-art - diff --git a/files/scripts/berry_screenshot b/files/scripts/berry_screenshot index 622cb09..49675e1 100755 --- a/files/scripts/berry_screenshot +++ b/files/scripts/berry_screenshot @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## Script to take screenshots on Archcraft. diff --git a/files/scripts/berry_term b/files/scripts/berry_term index 91f0638..f85a3f1 100755 --- a/files/scripts/berry_term +++ b/files/scripts/berry_term @@ -1,18 +1,18 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## launch alacritty with berry config # berry directory DIR="$HOME/.config/berry" -CONFIG="$DIR/alacritty/alacritty.yml" +CONFIG="$DIR/alacritty/alacritty.toml" if [ "$1" == "--float" ]; then alacritty --class 'alacritty-float,alacritty-float' --config-file "$CONFIG" elif [ "$1" == "--full" ]; then - alacritty --class 'Fullscreen,Fullscreen' --config-file "$CONFIG" \ - -o window.startup_mode=fullscreen \ + alacritty --class 'alacritty-fullscreen,alacritty-fullscreen' --config-file "$CONFIG" \ + -o window.startup_mode="'Fullscreen'" \ window.padding.x=30 window.padding.y=30 \ window.opacity=0.95 font.size=14 else diff --git a/files/scripts/berry_volume b/files/scripts/berry_volume index 795ed6e..1f040b6 100755 --- a/files/scripts/berry_volume +++ b/files/scripts/berry_volume @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## ## Script to manage speaker volume on Archcraft. diff --git a/files/scripts/rofi_askpass b/files/scripts/rofi_askpass index a8b1cc7..22b7c9d 100755 --- a/files/scripts/rofi_askpass +++ b/files/scripts/rofi_askpass @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" diff --git a/files/scripts/rofi_asroot b/files/scripts/rofi_asroot index c3bdd04..8c015b2 100755 --- a/files/scripts/rofi_asroot +++ b/files/scripts/rofi_asroot @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" @@ -10,7 +10,7 @@ ASROOT="$DIR/scripts/berry_asroot" # Theme Elements prompt='Root' mesg="Run Applications As Root" -term='alacritty --class alacritty-float,alacritty-float --config-file /root/.config/berry/alacritty/alacritty.yml' +term='alacritty --class alacritty-float,alacritty-float --config-file /root/.config/berry/alacritty/alacritty.toml' # Options layout=`cat ${RASI} | grep 'USE_ICON' | cut -d'=' -f2` diff --git a/files/scripts/rofi_launcher b/files/scripts/rofi_launcher index 7f975a9..40eede9 100755 --- a/files/scripts/rofi_launcher +++ b/files/scripts/rofi_launcher @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" diff --git a/files/scripts/rofi_music b/files/scripts/rofi_music index 4f68e6c..95923f2 100755 --- a/files/scripts/rofi_music +++ b/files/scripts/rofi_music @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" diff --git a/files/scripts/rofi_powermenu b/files/scripts/rofi_powermenu index f45a994..aeb80ef 100755 --- a/files/scripts/rofi_powermenu +++ b/files/scripts/rofi_powermenu @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" diff --git a/files/scripts/rofi_runner b/files/scripts/rofi_runner index ae03497..1a92669 100755 --- a/files/scripts/rofi_runner +++ b/files/scripts/rofi_runner @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" diff --git a/files/scripts/rofi_screenshot b/files/scripts/rofi_screenshot index 92324fe..e33711f 100755 --- a/files/scripts/rofi_screenshot +++ b/files/scripts/rofi_screenshot @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" diff --git a/files/scripts/rofi_windows b/files/scripts/rofi_windows index 04abbdb..d1a9aa6 100755 --- a/files/scripts/rofi_windows +++ b/files/scripts/rofi_windows @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Import Current Theme DIR="$HOME/.config/berry" diff --git a/files/sxhkdrc b/files/sxhkdrc index 7d7305e..8199697 100644 --- a/files/sxhkdrc +++ b/files/sxhkdrc @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ##---------- Keybindings for berry ----------## @@ -36,7 +36,7 @@ super + {f,w,e} # Terminal Apps ctrl + alt + {v,r,h} - alacritty --config-file ~/.config/berry/alacritty/alacritty.yml -e {vim,ranger,htop} + alacritty --config-file ~/.config/berry/alacritty/alacritty.toml -e {vim,ranger,htop} # Lockscreen ctrl + alt + l diff --git a/files/theme/networkmenu_config.ini b/files/theme/networkmenu_config.ini index e7891a7..db783de 100644 --- a/files/theme/networkmenu_config.ini +++ b/files/theme/networkmenu_config.ini @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya [dmenu] dmenu_command = rofi -dmenu -theme ~/.config/berry/theme/rofi/networkmenu.rasi diff --git a/files/theme/polybar.sh b/files/theme/polybar.sh index 26b56ac..b3aaf80 100755 --- a/files/theme/polybar.sh +++ b/files/theme/polybar.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ## Files and Directories DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" diff --git a/files/theme/polybar/colors.ini b/files/theme/polybar/colors.ini index d2630ef..0cd2f92 100644 --- a/files/theme/polybar/colors.ini +++ b/files/theme/polybar/colors.ini @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ diff --git a/files/theme/polybar/config.ini b/files/theme/polybar/config.ini index 8c4dc1a..5028282 100644 --- a/files/theme/polybar/config.ini +++ b/files/theme/polybar/config.ini @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ @@ -127,11 +127,11 @@ module-margin-right = 1 ; text font-0 = "JetBrains Mono:size=10;4" ; icons -font-1 = "Iosevka Nerd Font:size=12;4" +font-1 = "Symbols Nerd Font:size=12;4" ; glyphs -font-2 = "Iosevka Nerd Font:size=22;5" +font-2 = "Symbols Nerd Font:size=22;5" ; dot -font-3 = "Iosevka Nerd Font:size=10;4" +font-3 = "Symbols Nerd Font:size=10;4" ; clock & mpd font-4 = "Iosevka:style=bold:size=12;4" ; Archcraft @@ -145,7 +145,7 @@ font-5 = "archcraft:size=12;3" # Default modules-left = date dot mpd modules-center = berrywm -modules-right = volume backlight bluetooth network battery dot sysmenu +modules-right = volume backlight bluetooth network battery dot sysmenu tray # Alternate ;modules-left = openbox 2LD cpu 3LD memory 4LD filesystem 5LD @@ -172,46 +172,6 @@ wm-name = ; Expects a valid libc locale, for example: sv_SE.UTF-8 locale = -; Position of the system tray window -; If empty or undefined, tray support will be disabled -; NOTE: A center aligned tray will cover center aligned modules -; -; Available positions: -; left -; center -; right -; none -tray-position = right - -; If true, the bar will not shift its -; contents when the tray changes -tray-detached = false - -; Tray icon max size -tray-maxsize = 16 - -; DEPRECATED! Since 3.3.0 the tray always uses pseudo-transparency -; Enable pseudo transparency -; Will automatically be enabled if a fully transparent -; background color is defined using `tray-background` -; tray-transparent = false - -; Background color for the tray container -; ARGB color (e.g. #f00, #ff992a, #ddff1023) -; By default the tray container will use the bar -; background color. -tray-background = ${color.BG} - -; Tray offset defined as pixel value (e.g. 35) or percentage (e.g. 50%) -tray-offset-x = 10 -tray-offset-y = 0 - -; Pad the sides of each tray icon -tray-padding = 0 - -; Scale factor for tray clients -tray-scale = 1.0 - ; Restack the bar window and put it above the ; selected window manager's root ; diff --git a/files/theme/polybar/decor.ini b/files/theme/polybar/decor.ini index b1acdf6..500a23a 100644 --- a/files/theme/polybar/decor.ini +++ b/files/theme/polybar/decor.ini @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ;; DECOR _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ diff --git a/files/theme/polybar/launch.sh b/files/theme/polybar/launch.sh index 2da7b23..adedac3 100755 --- a/files/theme/polybar/launch.sh +++ b/files/theme/polybar/launch.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)" diff --git a/files/theme/polybar/modules.ini b/files/theme/polybar/modules.ini index 8e0ca08..c56da02 100644 --- a/files/theme/polybar/modules.ini +++ b/files/theme/polybar/modules.ini @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ @@ -1053,6 +1053,18 @@ content-padding = 0 click-left = ~/.config/berry/scripts/rofi_powermenu +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ + +[module/tray] +type = internal/tray + +format = +format-background = ${color.BG} +tray-background = ${color.BG} +tray-foreground = ${color.FG} +tray-spacing = 10px +tray-size = 50% + ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ;; __________ ______ ;; / ____/ __ \/ ____/ diff --git a/files/theme/polybar/scripts/bluetooth.sh b/files/theme/polybar/scripts/bluetooth.sh index de303e7..92e1453 100755 --- a/files/theme/polybar/scripts/bluetooth.sh +++ b/files/theme/polybar/scripts/bluetooth.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya # Colors DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" diff --git a/files/theme/rofi/askpass.rasi b/files/theme/rofi/askpass.rasi index 625fc46..3835353 100644 --- a/files/theme/rofi/askpass.rasi +++ b/files/theme/rofi/askpass.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Global Properties -----*****/ diff --git a/files/theme/rofi/asroot.rasi b/files/theme/rofi/asroot.rasi index 5bd0c46..06f4f7d 100644 --- a/files/theme/rofi/asroot.rasi +++ b/files/theme/rofi/asroot.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/bluetooth.rasi b/files/theme/rofi/bluetooth.rasi index b9b30a2..e8131e1 100644 --- a/files/theme/rofi/bluetooth.rasi +++ b/files/theme/rofi/bluetooth.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/confirm.rasi b/files/theme/rofi/confirm.rasi index f63308d..1b84d13 100644 --- a/files/theme/rofi/confirm.rasi +++ b/files/theme/rofi/confirm.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/launcher.rasi b/files/theme/rofi/launcher.rasi index a39f78b..1fcdfb2 100644 --- a/files/theme/rofi/launcher.rasi +++ b/files/theme/rofi/launcher.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/music.rasi b/files/theme/rofi/music.rasi index 7d5a7ab..4d87c99 100644 --- a/files/theme/rofi/music.rasi +++ b/files/theme/rofi/music.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/networkmenu.rasi b/files/theme/rofi/networkmenu.rasi index f0b0466..9420a9f 100644 --- a/files/theme/rofi/networkmenu.rasi +++ b/files/theme/rofi/networkmenu.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/powermenu.rasi b/files/theme/rofi/powermenu.rasi index 5766805..786042c 100644 --- a/files/theme/rofi/powermenu.rasi +++ b/files/theme/rofi/powermenu.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/runner.rasi b/files/theme/rofi/runner.rasi index f78f1ad..f71c58b 100644 --- a/files/theme/rofi/runner.rasi +++ b/files/theme/rofi/runner.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/screenshot.rasi b/files/theme/rofi/screenshot.rasi index 97a7aa5..2507df8 100644 --- a/files/theme/rofi/screenshot.rasi +++ b/files/theme/rofi/screenshot.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/rofi/shared/colors.rasi b/files/theme/rofi/shared/colors.rasi index c193a48..2487a68 100644 --- a/files/theme/rofi/shared/colors.rasi +++ b/files/theme/rofi/shared/colors.rasi @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2023 Aditya Shakya */ +/* Copyright (C) 2020-2024 Aditya Shakya */ /* Colors */ diff --git a/files/theme/rofi/shared/fonts.rasi b/files/theme/rofi/shared/fonts.rasi index 6a25ffe..f1c9028 100644 --- a/files/theme/rofi/shared/fonts.rasi +++ b/files/theme/rofi/shared/fonts.rasi @@ -1,4 +1,4 @@ -/* Copyright (C) 2020-2023 Aditya Shakya */ +/* Copyright (C) 2020-2024 Aditya Shakya */ /* Text Font */ diff --git a/files/theme/rofi/windows.rasi b/files/theme/rofi/windows.rasi index c476cd7..1c4bd22 100644 --- a/files/theme/rofi/windows.rasi +++ b/files/theme/rofi/windows.rasi @@ -1,5 +1,5 @@ /** - * Copyright (C) 2020-2023 Aditya Shakya + * Copyright (C) 2020-2024 Aditya Shakya **/ /*****----- Configuration -----*****/ diff --git a/files/theme/system.ini b/files/theme/system.ini index d76edd2..9d046a7 100644 --- a/files/theme/system.ini +++ b/files/theme/system.ini @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ;; ;; System Variables (Edit according to your system) @@ -20,7 +20,7 @@ [system] sys_adapter = ACAD sys_battery = BAT1 -sys_graphics_card = amdgpu_bl0 +sys_graphics_card = amdgpu_bl1 sys_network_interface = wlan0 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ diff --git a/files/xsettingsd b/files/xsettingsd index 36fbf3f..1bb2f8e 100644 --- a/files/xsettingsd +++ b/files/xsettingsd @@ -1,4 +1,4 @@ -## Copyright (C) 2020-2023 Aditya Shakya +## Copyright (C) 2020-2024 Aditya Shakya Net/ThemeName "Catppuccin-Mocha" Net/IconThemeName "Luv-Folders-Dark"