diff --git a/assets/google-sans/ProductSans-Black.ttf b/assets/google-sans/ProductSans-Black.ttf deleted file mode 100755 index 5864e269..00000000 Binary files a/assets/google-sans/ProductSans-Black.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-BlackItalic.ttf b/assets/google-sans/ProductSans-BlackItalic.ttf deleted file mode 100755 index 869037b7..00000000 Binary files a/assets/google-sans/ProductSans-BlackItalic.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-Bold.ttf b/assets/google-sans/ProductSans-Bold.ttf deleted file mode 100755 index 96619df9..00000000 Binary files a/assets/google-sans/ProductSans-Bold.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-BoldItalic.ttf b/assets/google-sans/ProductSans-BoldItalic.ttf deleted file mode 100755 index bdd22b04..00000000 Binary files a/assets/google-sans/ProductSans-BoldItalic.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-Italic.ttf b/assets/google-sans/ProductSans-Italic.ttf deleted file mode 100755 index 5b44037b..00000000 Binary files a/assets/google-sans/ProductSans-Italic.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-Light.ttf b/assets/google-sans/ProductSans-Light.ttf deleted file mode 100755 index 33de1c39..00000000 Binary files a/assets/google-sans/ProductSans-Light.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-LightItalic.ttf b/assets/google-sans/ProductSans-LightItalic.ttf deleted file mode 100755 index 00c76b8e..00000000 Binary files a/assets/google-sans/ProductSans-LightItalic.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-Medium.ttf b/assets/google-sans/ProductSans-Medium.ttf deleted file mode 100755 index fd818d6f..00000000 Binary files a/assets/google-sans/ProductSans-Medium.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-MediumItalic.ttf b/assets/google-sans/ProductSans-MediumItalic.ttf deleted file mode 100755 index ec70cd38..00000000 Binary files a/assets/google-sans/ProductSans-MediumItalic.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-Regular.ttf b/assets/google-sans/ProductSans-Regular.ttf deleted file mode 100755 index e2c69c3f..00000000 Binary files a/assets/google-sans/ProductSans-Regular.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-Thin.ttf b/assets/google-sans/ProductSans-Thin.ttf deleted file mode 100755 index 5e046b53..00000000 Binary files a/assets/google-sans/ProductSans-Thin.ttf and /dev/null differ diff --git a/assets/google-sans/ProductSans-ThinItalic.ttf b/assets/google-sans/ProductSans-ThinItalic.ttf deleted file mode 100755 index 7b049551..00000000 Binary files a/assets/google-sans/ProductSans-ThinItalic.ttf and /dev/null differ diff --git a/assets/rice.png b/assets/rice.png index adf6bd86..c0a08c5a 100644 Binary files a/assets/rice.png and b/assets/rice.png differ diff --git a/config/btop/btop.conf b/config/btop/btop.conf index f8b4c9eb..2377efa3 100644 --- a/config/btop/btop.conf +++ b/config/btop/btop.conf @@ -1,8 +1,8 @@ -#? Config file for btop v. 1.3.2 +#? Config file for btop v. 1.4.5 #* 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/adriano/.config/btop/themes/paradax.theme" +color_theme = "TTY" #* If the theme set background should be shown, set to False if you want terminal background transparency. theme_background = False @@ -22,7 +22,7 @@ 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 = True #* Rounded corners on boxes, is ignored if TTY mode is ON. rounded_corners = True @@ -50,7 +50,7 @@ graph_symbol_net = "default" graph_symbol_proc = "default" #* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. -shown_boxes = "cpu mem net proc" +shown_boxes = "proc mem cpu net" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. update_ms = 1000 @@ -115,6 +115,9 @@ cpu_bottom = False #* Shows the system uptime in the CPU box. 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 @@ -150,7 +153,7 @@ background_update = True 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. @@ -202,7 +205,7 @@ 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 = False #* Sync the auto scaling for download and upload to whichever currently has the highest scale. net_sync = False @@ -210,6 +213,9 @@ net_sync = False #* 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 @@ -226,6 +232,9 @@ log_level = "WARNING" #* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards. 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 diff --git a/config/btop/themes/matugen.theme b/config/btop/themes/matugen.theme new file mode 100644 index 00000000..8e6a15a5 --- /dev/null +++ b/config/btop/themes/matugen.theme @@ -0,0 +1,89 @@ +# Matugen template for btop + + +# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255" +# example for white: "#ffffff", "#ff" or "255 255 255". + +# All graphs and meters can be gradients +# For single color graphs leave "mid" and "end" variable empty. +# Use "start" and "end" variables for two color gradient +# Use "start", "mid" and "end" for three color gradient + +# Main background, empty for terminal default, need to be empty if you want transparent background +theme[main_bg]="" + +# Main text color +theme[main_fg]="#dee3e6" + +# Title color for boxes +theme[title]="#88d1ec" + +# Highlight color for keyboard shortcuts +theme[hi_fg]="#b3cad4" + +# Background color of selected item in processes box +theme[selected_bg]="#88d1ec" + +# Foreground color of selected item in processes box +theme[selected_fg]="#003544" + +# Color of inactive/disabled text +theme[inactive_fg]="#bfc8cc" + +# Misc colors for processes box including mini cpu graphs, details memory graph and details status text +theme[proc_misc]="#c3c3eb" + +# Cpu box outline color +theme[cpu_box]="#8a9296" + +# Memory/disks box outline color +theme[mem_box]="#8a9296" + +# Net up/down box outline color +theme[net_box]="#8a9296" + +# Processes box outline color +theme[proc_box]="#8a9296" + +# Box divider line and small boxes line color +theme[div_line]="#40484c" + +# Temperature graph colors +theme[temp_start]="#b3cad4" +theme[temp_mid]="#88d1ec" +theme[temp_end]="#ffb4ab" + +# CPU graph colors +theme[cpu_start]="#b3cad4" +theme[cpu_mid]="#88d1ec" +theme[cpu_end]="#ffb4ab" + +# Mem/Disk free meter +theme[free_start]="#b3cad4" +theme[free_mid]="" +theme[free_end]="#344a52" + +# Mem/Disk cached meter +theme[cached_start]="#c3c3eb" +theme[cached_mid]="" +theme[cached_end]="#434465" + +# Mem/Disk available meter +theme[available_start]="#88d1ec" +theme[available_mid]="" +theme[available_end]="#004d61" + +# Mem/Disk used meter +theme[used_start]="#ffb4ab" +theme[used_mid]="" +theme[used_end]="#93000a" + +# Download graph colors +theme[download_start]="#b3cad4" +theme[download_mid]="#88d1ec" +theme[download_end]="#c3c3eb" + +# Upload graph colors +theme[upload_start]="#b3cad4" +theme[upload_mid]="#88d1ec" +theme[upload_end]="#c3c3eb" diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf index 1ca42838..ef0f1f74 100644 --- a/config/hypr/UserConfigs/ENVariables.conf +++ b/config/hypr/UserConfigs/ENVariables.conf @@ -2,7 +2,7 @@ #environment-variables env = CLUTTER_BACKEND,wayland -env = GDK_BACKEND,wayland +env = GDK_BACKEND,wayland,x11 env = QT_AUTO_SCREEN_SCALE_FACTOR,1 env = QT_QPA_PLATFORM,wayland;xcb env = QT_QPA_PLATFORMTHEME,qt5ct @@ -17,7 +17,6 @@ env = SDL_VIDEODRIVEVER,wayland env = GDK_SCALE,1 -env = GTK_THEME,adw-gtk3-dark # firefox env = MOZ_ENABLE_WAYLAND,1 firefox diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf index cc44f76f..9a9a108f 100644 --- a/config/hypr/UserConfigs/Startup_Apps.conf +++ b/config/hypr/UserConfigs/Startup_Apps.conf @@ -1,7 +1,3 @@ -#Commands & Apps to be executed at launch - -$scriptsDir = $HOME/.config/hypr/scripts - # Startup exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP @@ -16,6 +12,6 @@ exec-once = uwsm-app /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = uwsm-app udiskie # startup apps -exec-once = hyprctl setcursor Bibata-Original-Classic 6 +exec-once = hyprctl setcursor Bibata-Modern-Ice 6 diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index a930b7e4..4b22873f 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -1,13 +1,10 @@ - # See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables # See also Laptops.conf for laptops keybinds # SUPER KEY $mainMod = SUPER -$scriptsDir = $HOME/dotfiles/hypr/scripts - $terminal = kitty $filemanager = thunar $telegram = materialgram @@ -17,21 +14,20 @@ $browser = zen-browser bind = Alt, f12, exec, notify-send 'Test notification' "Here's a really long message to test truncation and wrapping\nYou can middle click or flick this notification to dismiss it!" -a 'terminal' -A "Test1=I got it!" -A "Test2=Another action" bind = Alt, Equal, exec, notify-send 'hmm' ${SLURP_ARGS} -bind = $mainMod, space, exec, uwsm app -- fabric-cli exec modus1 "launcher.toggle()" bind = $mainMod, R, exec, uwsm app -- fabric-cli exec fabrika-shell "launcher.toggle()" +bind = $mainMod, D, exec, uwsm app -- fabric-cli exec modus "launcher.show_launcher()" # Applications -# bind = ALT SHIFT,Return, exec, uwsm app -- $terminal --title Kitty --single-instance +bind = ALT SHIFT,Return, exec, uwsm app -- $terminal --title Kitty --single-instance bind = $mainMod, Return, exec, uwsm app -- $terminal -bind = ALT SHIFT,Return, exec, [float] uwsm app -- $terminal -1 +# bind = ALT SHIFT,Return, exec, [float] uwsm app -- $terminal -1 bind = ALT, E, exec, uwsm app -- $filemanager bind = $mainMod, B, exec, uwsm app -- $browser bind = ALT, T, exec, uwsm app -- $telegram bind = $mainMod SHIFT, S, exec, hyprshot -z -m region --clipboard-only -bind = $mainMod, S, exec, fabric-cli execute modus "launcher.show_launcher('sc ss', external=True)" + # Actions -bind = $mainMod, F3, exec, $scriptsDir/kb_changer bind = $mainMod CTRL, L, exec, pidof hyprlock || hyprlock -q bind = $mainMod CTRL, P, exec, systemctl poweroff bind = $mainMod CTRL, R, exec, systemctl reboot diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index c3390110..b2d96aad 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -1,5 +1,4 @@ - # User Settings # refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables dwindle { diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index a72f0448..33b7ea14 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -107,7 +107,7 @@ windowrule = size 70% 60%, initialTitle:(Open Files) # Kitty windowrulev2 = float,class:^(kitty)$,title:^(Kitty)$ -windowrulev2 = size 800 500, class^(kitty)$, title:^(Kitty)$ +windowrulev2 = size 850 550, class^(kitty)$, title:^(Kitty)$ windowrulev2 = move center, class^(kitty)$, title:^(Kitty)$ windowrulev2 = animation slide, class:^(kitty)$, title:^(Kitty)$ windowrulev2 = float, class:^(kitty)$, title:^(Kitty)$ diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index a8807d68..708fbb1c 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -1,4 +1,3 @@ - # See https://wiki.hyprland.org/Configuring/Keywords/ for more settings and variables # See also Laptops.conf for laptops keybinds diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 76fa2cf5..135cc616 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -22,7 +22,9 @@ source = $UserConfigs/WorkspaceRules.conf # Modus -source = ~/.config/Modus/config/hypr/modus.conf - +# source = ~/.config/Modus/config/hypr/modus.conf +source = ~/mine/config/hypr/modus.conf +# exec-once = cd ~/mine && .venv/bin/python main.py +exec-once = uwsm-app $(python /home/sankalp/Modus/main.py) diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 50adaafe..859a925c 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -1,4 +1,4 @@ -source = ~/.config/Ax-Shell/config/hypr/colors.conf +source = ~/.config/Modus/config/hypr/colors.conf # BACKGROUND background { @@ -14,7 +14,7 @@ background { # GENERAL general { - grace = 0 + # grace = 0 hide_cursor = true } diff --git a/config/hypr/scripts/kb_changer.sh b/config/hypr/scripts/kb_changer.sh deleted file mode 100755 index bb63eef5..00000000 --- a/config/hypr/scripts/kb_changer.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -layout_f="$HOME/.cache/kb_layout" -settings_file="$HOME/dotfiles/hypr/UserConfigs/UserSettings.conf" -current_layout=$(cat "$layout_f") - -[ -f "$settings_file" ] && IFS=',' read -ra layout_mapping <<<"$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2)" - -for i in "${!layout_mapping[@]}"; do - [ "$current_layout" == "${layout_mapping[i]}" ] && new_layout="${layout_mapping[((i + 1) % ${#layout_mapping[@]})]}" && break -done - -hyprctl switchxkblayout "at-translated-set-2-keyboard" "$new_layout" && echo "$new_layout" >"$layout_f" - -hyprctl devices -j | jq -r '.keyboards[].name' | while read -r name; do - hyprctl switchxkblayout "$name" next || { - notify-send -u low -t 2000 'Keyboard layout' 'Error: Layout change failed' - exit 1 - } -done - -notify-send -u low "Kb_layout" "Changed" diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index b638fa21..f7d8376a 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,3 +1,4 @@ + # ┌──────────────────────────────┐ # │ │ # │ ░█░█░▀█▀░▀█▀░▀█▀░█░█ │ @@ -10,7 +11,7 @@ include ./colors.conf # background_opacity 0.95 -font_family Iosevka Nerd Font +font_family Monaspace Radon font_size 11 bold_font auto italic_font auto diff --git a/config/matugen/config.toml b/config/matugen/config.toml index 290f0366..ae1f7394 100644 --- a/config/matugen/config.toml +++ b/config/matugen/config.toml @@ -10,13 +10,9 @@ command = "swww" arguments = [ "img", "-t", "fade", "--transition-duration", "0.5", "--transition-step", "255", "--transition-fps", "60", "-f", "Nearest",] set = true -[templates.pywal] -input_path = "~/.config/matugen/templates/pywal-colors" -output_path = "~/.cache/wal/colors" - -[templates.nvim] -input_path = "~/.config/nvim/pywal/matugen.lua" -output_path = "~/.cache/wal/base46-dark.lua" +[templates.btop] +input_path = "~/.config/matugen/templates/btop.theme" +output_path = "~/.config/btop/themes/matugen.theme" [templates.gtk3] input_path = "~/.config/matugen/templates/gtk.css" @@ -35,19 +31,14 @@ input_path = "~/.config/matugen/templates/qtct-colors.conf" output_path = "~/.config/qt6ct/colors/matugen.conf" [templates.hyprland] -input_path = "~/.config/Modus/config/matugen/templates/hyprland-colors.conf" -output_path = "~/.config/Modus/config/hypr/colors.conf" +input_path = "~/mine/config/matugen/templates/hyprland-colors.conf" +output_path = "~/mine/config/hypr/colors.conf" [templates.kitty] input_path = "~/.config/matugen/templates/kitty-colors.conf" output_path = "~/.config/kitty/colors.conf" post_hook = "killall -SIGUSR1 kitty &" -# [templates.starship] -# input_path = "~/.config/matugen/templates/starship-colors.toml" -# output_path = "~/.config/starship.toml" -# post_hook = "starship init zsh > ~/.zshrc" - [templates.Telegram] input_path = "~/.config/matugen/templates/telegram-colors.tdesktop-theme" output_path = "~/.config/telegram-desktop/themes/material-you.tdesktop-theme" @@ -73,25 +64,10 @@ input_path = "~/.config/Modus/config/matugen/templates/modus.css" output_path = "~/.config/Modus/styles/colors.css" post_hook = "fabric-cli exec modus 'app.set_css()' &" -[templates.ax-shell] -input_path = "~/.config/Ax-Shell/config/matugen/templates/ax-shell.css" -output_path = "~/.config/Ax-Shell/styles/colors.css" -post_hook = "fabric-cli exec ax-shell 'app.set_css()' &" - -[templates.modusv1] -input_path = "~/Modus/config/matugen/templates/modusv1.css" -output_path = "~/Modus/styles/colors.css" -post_hook = "fabric-cli exec modusv1 'app.set_css()' &" - -[templates.hyprfabricated] -input_path = "~/.config/hyprfabricated/config/matugen/templates/hyprfabricated.css" -output_path = "~/.config/hyprfabricated/styles/colors.css" -post_hook = "fabric-cli exec hyprfabricated 'app.set_css()' &" - -[templates.yz-shell] -input_path = "~/.config/YZ-Shell/config/matugen/templates/yz-shell.css" -output_path = "~/.config/YZ-Shell/styles/colors.css" -post_hook = "fabric-cli exec yz-shell 'app.set_css()' &" +[templates.modus1] +input_path = "~/mine/config/matugen/templates/modus.css" +output_path = "~/mine/styles/colors.css" +post_hook = "fabric-cli exec modus1 'app.set_css()' &" [config.custom_colors.red] color = "#FF0000" diff --git a/config/matugen/config.toml.bak b/config/matugen/config.toml.bak index 51cbd2d4..2e8480c6 100644 --- a/config/matugen/config.toml.bak +++ b/config/matugen/config.toml.bak @@ -7,9 +7,17 @@ gtk_theme = true [config.wallpaper] command = "swww" -arguments = [ "img", "-t", "outer", "--transition-duration", "1.5", "--transition-step", "255", "--transition-fps", "60", "-f", "Nearest",] +arguments = [ "img", "-t", "fade", "--transition-duration", "0.5", "--transition-step", "255", "--transition-fps", "60", "-f", "Nearest",] set = true +[templates.pywal] +input_path = "~/.config/matugen/templates/pywal-colors" +output_path = "~/.cache/wal/colors" + +[templates.nvim] +input_path = "~/.config/nvim/pywal/matugen.lua" +output_path = "~/.cache/wal/base46-dark.lua" + [templates.gtk3] input_path = "~/.config/matugen/templates/gtk.css" output_path = "~/.config/gtk-3.0/gtk.css" @@ -27,19 +35,14 @@ input_path = "~/.config/matugen/templates/qtct-colors.conf" output_path = "~/.config/qt6ct/colors/matugen.conf" [templates.hyprland] -input_path = "~/.config/Modus/config/matugen/templates/hyprland-colors.conf" -output_path = "~/.config/Modus/config/hypr/colors.conf" +input_path = "~/.config/Ax-Shell/config/matugen/templates/hyprland-colors.conf" +output_path = "~/.config/Ax-Shell/config/hypr/colors.conf" [templates.kitty] input_path = "~/.config/matugen/templates/kitty-colors.conf" output_path = "~/.config/kitty/colors.conf" post_hook = "killall -SIGUSR1 kitty &" -[templates.starship] -input_path = "~/.config/matugen/templates/starship-colors.toml" -output_path = "~/.config/starship.toml" -post_hook = "starship init zsh > ~/.zshrc" - [templates.Telegram] input_path = "~/.config/matugen/templates/telegram-colors.tdesktop-theme" output_path = "~/.config/telegram-desktop/themes/material-you.tdesktop-theme" @@ -65,25 +68,20 @@ input_path = "~/.config/Modus/config/matugen/templates/modus.css" output_path = "~/.config/Modus/styles/colors.css" post_hook = "fabric-cli exec modus 'app.set_css()' &" +[templates.modus1] +input_path = "~/mine/config/matugen/templates/modus.css" +output_path = "~/mine/styles/colors.css" +post_hook = "fabric-cli exec modus1 'app.set_css()' &" + [templates.ax-shell] input_path = "~/.config/Ax-Shell/config/matugen/templates/ax-shell.css" output_path = "~/.config/Ax-Shell/styles/colors.css" post_hook = "fabric-cli exec ax-shell 'app.set_css()' &" -[templates.modusv1] -input_path = "~/Modus/config/matugen/templates/modusv1.css" -output_path = "~/Modus/styles/colors.css" -post_hook = "fabric-cli exec modusv1 'app.set_css()' &" - -[templates.hyprfabricated] -input_path = "~/.config/hyprfabricated/config/matugen/templates/hyprfabricated.css" -output_path = "~/.config/hyprfabricated/styles/colors.css" -post_hook = "fabric-cli exec hyprfabricated 'app.set_css()' &" - -[templates.yz-shell] -input_path = "~/.config/YZ-Shell/config/matugen/templates/yz-shell.css" -output_path = "~/.config/YZ-Shell/styles/colors.css" -post_hook = "fabric-cli exec yz-shell 'app.set_css()' &" +[templates.macos] +input_path = "~/Macos/config/matugen/templates/macos.css" +output_path = "~/Macos/styles/colors.css" +post_hook = "fabric-cli exec macos 'app.set_css()' &" [config.custom_colors.red] color = "#FF0000" diff --git a/config/matugen/templates/base46.lua b/config/matugen/templates/base46.lua deleted file mode 100644 index 2999f52b..00000000 --- a/config/matugen/templates/base46.lua +++ /dev/null @@ -1,81 +0,0 @@ -local M = {} - -local lighten = require("base46.colors").change_hex_lightness - -M.base_30 = { - white = "{{colors.on_background.default.hex}}", - black = "{{colors.background.default.hex}}", - darker_black = lighten("{{colors.background.default.hex}}", -3), - black2 = lighten("{{colors.background.default.hex}}", 6), - one_bg = lighten("{{colors.background.default.hex}}", 10), - one_bg2 = lighten("{{colors.background.default.hex}}", 16), - one_bg3 = lighten("{{colors.background.default.hex}}", 22), - grey = "{{colors.surface_variant.default.hex}}", - grey_fg = lighten("{{colors.surface_variant.default.hex}}", -10), - grey_fg2 = lighten("{{colors.surface_variant.default.hex}}", -20), - light_grey = "{{colors.outline.default.hex}}", - red = "{{colors.red.default.hex}}", - baby_pink = lighten("{{colors.red.default.hex}}", 10), - pink = "{{colors.tertiary.default.hex}}", -- conservado, no es rojo puro - line = "{{colors.outline.default.hex}}", - green = "{{colors.green.default.hex}}", - vibrant_green = lighten("{{colors.green.default.hex}}", 10), - blue = "{{colors.blue.default.hex}}", - nord_blue = lighten("{{colors.blue.default.hex}}", 10), - yellow = "{{colors.yellow.default.hex}}", - sun = lighten("{{colors.yellow.default.hex}}", 10), - purple = "{{colors.tertiary.default.hex}}", -- conservado - dark_purple = lighten("{{colors.tertiary.default.hex}}", -10), - teal = "{{colors.secondary_container.default.hex}}", - orange = "{{colors.red.default.hex}}", -- sigue dependiendo de error - cyan = "{{colors.cyan.default.hex}}", - statusline_bg = lighten("{{colors.background.default.hex}}", 6), - pmenu_bg = "{{colors.surface_variant.default.hex}}", - folder_bg = lighten("{{colors.primary_fixed_dim.default.hex}}", 0), - lightbg = lighten("{{colors.background.default.hex}}", 10), -} - -M.base_16 = { - base00 = "{{colors.surface.default.hex}}", - base01 = lighten("{{colors.surface_variant.default.hex}}", 0), - base02 = lighten("{{colors.surface_variant.default.hex}}", 3), - base03 = lighten("{{colors.outline.default.hex}}", 0), - base04 = lighten("{{colors.on_surface_variant.default.hex}}", 0), - base05 = "{{colors.on_surface.default.hex}}", - base06 = lighten("{{colors.on_surface.default.hex}}", 0), - base07 = "{{colors.surface.default.hex}}", - base08 = "{{colors.red.default.hex}}", - base09 = "{{colors.yellow.default.hex}}", - base0A = "{{colors.blue.default.hex}}", - base0B = "{{colors.green.default.hex}}", - base0C = "{{colors.cyan.default.hex}}", - base0D = lighten("{{colors.blue.default.hex}}", 20), - base0E = "{{colors.tertiary.default.hex}}", - base0F = "{{colors.inverse_surface.default.hex}}", -} - -M.type = "dark" - -M.polish_hl = { - defaults = { - Comment = { - italic = true, - fg = M.base_16.base03, - }, - }, - Syntax = { - String = { - fg = "{{colors.tertiary.default.hex}}", - }, - }, - treesitter = { - ["@comment"] = { - fg = M.base_16.base03, - }, - ["@string"] = { - fg = "{{colors.tertiary.default.hex}}", - }, - }, -} - -return M diff --git a/config/matugen/templates/btop.theme b/config/matugen/templates/btop.theme new file mode 100644 index 00000000..8fc94f61 --- /dev/null +++ b/config/matugen/templates/btop.theme @@ -0,0 +1,89 @@ +# Matugen template for btop + + +# Colors should be in 6 or 2 character hexadecimal or single spaced rgb decimal: "#RRGGBB", "#BW" or "0-255 0-255 0-255" +# example for white: "#ffffff", "#ff" or "255 255 255". + +# All graphs and meters can be gradients +# For single color graphs leave "mid" and "end" variable empty. +# Use "start" and "end" variables for two color gradient +# Use "start", "mid" and "end" for three color gradient + +# Main background, empty for terminal default, need to be empty if you want transparent background +theme[main_bg]="" + +# Main text color +theme[main_fg]="{{colors.on_surface.default.hex}}" + +# Title color for boxes +theme[title]="{{colors.primary.default.hex}}" + +# Highlight color for keyboard shortcuts +theme[hi_fg]="{{colors.secondary.default.hex}}" + +# Background color of selected item in processes box +theme[selected_bg]="{{colors.primary.default.hex}}" + +# Foreground color of selected item in processes box +theme[selected_fg]="{{colors.on_primary.default.hex}}" + +# Color of inactive/disabled text +theme[inactive_fg]="{{colors.on_surface_variant.default.hex}}" + +# Misc colors for processes box including mini cpu graphs, details memory graph and details status text +theme[proc_misc]="{{colors.tertiary.default.hex}}" + +# Cpu box outline color +theme[cpu_box]="{{colors.outline.default.hex}}" + +# Memory/disks box outline color +theme[mem_box]="{{colors.outline.default.hex}}" + +# Net up/down box outline color +theme[net_box]="{{colors.outline.default.hex}}" + +# Processes box outline color +theme[proc_box]="{{colors.outline.default.hex}}" + +# Box divider line and small boxes line color +theme[div_line]="{{colors.outline_variant.default.hex}}" + +# Temperature graph colors +theme[temp_start]="{{colors.secondary.default.hex}}" +theme[temp_mid]="{{colors.primary.default.hex}}" +theme[temp_end]="{{colors.error.default.hex}}" + +# CPU graph colors +theme[cpu_start]="{{colors.secondary.default.hex}}" +theme[cpu_mid]="{{colors.primary.default.hex}}" +theme[cpu_end]="{{colors.error.default.hex}}" + +# Mem/Disk free meter +theme[free_start]="{{colors.secondary.default.hex}}" +theme[free_mid]="" +theme[free_end]="{{colors.secondary_container.default.hex}}" + +# Mem/Disk cached meter +theme[cached_start]="{{colors.tertiary.default.hex}}" +theme[cached_mid]="" +theme[cached_end]="{{colors.tertiary_container.default.hex}}" + +# Mem/Disk available meter +theme[available_start]="{{colors.primary.default.hex}}" +theme[available_mid]="" +theme[available_end]="{{colors.primary_container.default.hex}}" + +# Mem/Disk used meter +theme[used_start]="{{colors.error.default.hex}}" +theme[used_mid]="" +theme[used_end]="{{colors.error_container.default.hex}}" + +# Download graph colors +theme[download_start]="{{colors.secondary.default.hex}}" +theme[download_mid]="{{colors.primary.default.hex}}" +theme[download_end]="{{colors.tertiary.default.hex}}" + +# Upload graph colors +theme[upload_start]="{{colors.secondary.default.hex}}" +theme[upload_mid]="{{colors.primary.default.hex}}" +theme[upload_end]="{{colors.tertiary.default.hex}}" diff --git a/config/matugen/templates/ghostty.conf b/config/matugen/templates/ghostty.conf index 7b817e3a..4b5775a9 100644 --- a/config/matugen/templates/ghostty.conf +++ b/config/matugen/templates/ghostty.conf @@ -20,4 +20,4 @@ foreground = {{colors.on_surface.default.hex}} cursor-color = {{colors.primary.default.hex}} # cursor-text-color = {{colors.on_primary.default.hex}} selection-background = {{colors.surface.default.hex}} -selection-foreground = {{colors.on_surface.default.hex}} \ No newline at end of file +selection-foreground = {{colors.on_surface.default.hex}} diff --git a/package b/package index b71cb845..bae09bc0 100644 --- a/package +++ b/package @@ -1,4 +1,5 @@ adw-gtk-theme +just brightnessctl btop bat @@ -49,7 +50,6 @@ gh-dash-bin mpv python-fabric-git fabric-cli-git -glace-git github-cli otf-monaspace ttf-jetbrains-mono-nerd