From 0eb8525371159d6520c5f47f94fc906450bdc86a Mon Sep 17 00:00:00 2001 From: Lucas Barbieri Date: Tue, 23 Apr 2024 20:51:20 -0300 Subject: [PATCH] Update laptop main configs --- laptop/configs/hypr/binds.conf | 10 +- laptop/configs/hypr/init.conf | 5 +- laptop/configs/hypr/settings.conf | 8 +- .../tmux/plugins/tmux-plugin-playerctl | 1 - laptop/configs/tmux/plugins/tpm | 1 - laptop/configs/tmux/theme.conf | 2 +- laptop/configs/tofi/config | 5 +- laptop/configs/tofi/monochrome.conf | 3 + laptop/configs/tofi/theme.conf | 1 + laptop/configs/tofi/white.conf | 3 + laptop/configs/waybar/config-chinese | 87 ------------ laptop/configs/waybar/config-white.jsonc | 56 ++++++++ laptop/configs/waybar/style-solarized.css | 50 ------- laptop/configs/waybar/style-white.css | 122 +++++++++++++++++ laptop/configs/waybar/style.css.chinese | 128 ------------------ laptop/configs/wezterm/wezterm.lua | 6 +- 16 files changed, 203 insertions(+), 285 deletions(-) delete mode 160000 laptop/configs/tmux/plugins/tmux-plugin-playerctl delete mode 160000 laptop/configs/tmux/plugins/tpm create mode 100644 laptop/configs/tofi/monochrome.conf create mode 120000 laptop/configs/tofi/theme.conf create mode 100644 laptop/configs/tofi/white.conf delete mode 100644 laptop/configs/waybar/config-chinese create mode 100644 laptop/configs/waybar/config-white.jsonc delete mode 100644 laptop/configs/waybar/style-solarized.css create mode 100644 laptop/configs/waybar/style-white.css delete mode 100644 laptop/configs/waybar/style.css.chinese diff --git a/laptop/configs/hypr/binds.conf b/laptop/configs/hypr/binds.conf index 793b82c..5125389 100644 --- a/laptop/configs/hypr/binds.conf +++ b/laptop/configs/hypr/binds.conf @@ -7,14 +7,14 @@ binde = , XF86MonBrightnessUp, exec, brightnessctl s +5% binde = , XF86MonBrightnessDown, exec, brightnessctl s 5%- # app bindings -bind = $mainMod, Return, exec, wezterm-gui +bind = $mainMod, Return, exec, ~/.local/bin/wezterm bind = $mainMod CONTROL, Return, exec, kitty bind = $mainMod, E, exec, thunar bind = $mainMod SHIFT, Return, exec, tofi-drun -bind = , Home, exec, ~/.local/bin/way-print.sh p -bind = SHIFT, Home, exec, ~/.local/bin/way-print.sh s -bind = CONTROL SHIFT, Home, exec, ~/.local/bin/way-print.sh t -bind = CONTROL, Home, exec, ~/.local/bin/way-print.sh m +bind = , Home, exec, ~/scripts/way-print.sh p +bind = SHIFT, Home, exec, ~/scripts/way-print.sh s +bind = CONTROL SHIFT, Home, exec, ~/scripts/way-print.sh t +bind = CONTROL, Home, exec, ~/scripts/way-print.sh m bind = $mainMod, b, exec, firefox # window control diff --git a/laptop/configs/hypr/init.conf b/laptop/configs/hypr/init.conf index 345692b..d47e410 100644 --- a/laptop/configs/hypr/init.conf +++ b/laptop/configs/hypr/init.conf @@ -1,4 +1,4 @@ -exec-once = swww-daemon --format xrgb & +exec-once = ~/scripts/swww.sh exec-once = lxqt-policykit-agent & exec-once = ~/scripts/weechat.sh exec-once = dunst & @@ -9,5 +9,6 @@ exec-once = rm -rf ~/tmp/* exec-once = waybar & exec-once = syncthing --no-browser & exec-once = xremap ~/.config/xremap/config.yml -exec = SWWW_TRANSITION_STEP=90 SWWW_TRANSITION_FPS=30 SWWW_TRANSITION=wipe SWWW_TRANSITION_ANGLE=30 SWWW_TRANSITION_POS=center swww img ~/pics/monochrome-1.png exec-once = nm-applet & +exec-once = emacs --daemon +exec = ~/scripts/hypr.sh diff --git a/laptop/configs/hypr/settings.conf b/laptop/configs/hypr/settings.conf index 91b7043..8e739b1 100644 --- a/laptop/configs/hypr/settings.conf +++ b/laptop/configs/hypr/settings.conf @@ -18,14 +18,14 @@ general { gaps_in = 5 gaps_out = 5 border_size = 2 - col.active_border = rgba(ff0038ee) rgba(33e2c5ee) 45deg - col.inactive_border = rgba(595959aa) + # col.active_border = rgba(ff0038ee) rgba(33e2c5ee) 45deg + # col.inactive_border = rgba(595959aa) no_cursor_warps = false layout = master } decoration { - rounding = 0 + rounding = 10 blur { enabled = true @@ -40,7 +40,7 @@ decoration { } animations { - enabled = false + enabled = true bezier = myBezier, 0.05, 1.2, 0.1, 1.05 diff --git a/laptop/configs/tmux/plugins/tmux-plugin-playerctl b/laptop/configs/tmux/plugins/tmux-plugin-playerctl deleted file mode 160000 index 5e99e7f..0000000 --- a/laptop/configs/tmux/plugins/tmux-plugin-playerctl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5e99e7f28bdc151314ef85266c24947116115538 diff --git a/laptop/configs/tmux/plugins/tpm b/laptop/configs/tmux/plugins/tpm deleted file mode 160000 index 99469c4..0000000 --- a/laptop/configs/tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/laptop/configs/tmux/theme.conf b/laptop/configs/tmux/theme.conf index c7d0e96..33a8146 120000 --- a/laptop/configs/tmux/theme.conf +++ b/laptop/configs/tmux/theme.conf @@ -1 +1 @@ -tmux-monochrome.conf \ No newline at end of file +/home/lucas/.config/tmux/tmux-white.conf \ No newline at end of file diff --git a/laptop/configs/tofi/config b/laptop/configs/tofi/config index 98f3856..12f3466 100644 --- a/laptop/configs/tofi/config +++ b/laptop/configs/tofi/config @@ -11,8 +11,7 @@ padding-left = 35% padding-top = 35% result-spacing = 25 num-results = 5 -background-color = #080808BB -text-color = #c6c6c6 -selection-color = #74b2ff fuzzy-match = true drun-launch = true + +include = theme.conf diff --git a/laptop/configs/tofi/monochrome.conf b/laptop/configs/tofi/monochrome.conf new file mode 100644 index 0000000..fb64bdc --- /dev/null +++ b/laptop/configs/tofi/monochrome.conf @@ -0,0 +1,3 @@ +background-color = #0f1014BB +text-color = #868690 +selection-color = #ccb901 diff --git a/laptop/configs/tofi/theme.conf b/laptop/configs/tofi/theme.conf new file mode 120000 index 0000000..95a66c3 --- /dev/null +++ b/laptop/configs/tofi/theme.conf @@ -0,0 +1 @@ +/home/lucas/.config/tofi/white.conf \ No newline at end of file diff --git a/laptop/configs/tofi/white.conf b/laptop/configs/tofi/white.conf new file mode 100644 index 0000000..00a7322 --- /dev/null +++ b/laptop/configs/tofi/white.conf @@ -0,0 +1,3 @@ +background-color = #eff1f5BB +text-color = #4c4f69 +selection-color = #209fb5 diff --git a/laptop/configs/waybar/config-chinese b/laptop/configs/waybar/config-chinese deleted file mode 100644 index 9b7c3df..0000000 --- a/laptop/configs/waybar/config-chinese +++ /dev/null @@ -1,87 +0,0 @@ -{ - "layer": "top", - "position": "top", - "mod": "dock", - "exclusive": true, - "passtrough": false, - "gtk-layer-shell": true, - "height": 0, - "output": "HDMI-A-1", - - "modules-left": [ - "hyprland/workspaces", - ], - - "modules-center": [ - "hyprland/window" - ], - - "modules-right": [ - "pulseaudio", - "clock", - "tray", - ], - - "hyprland/window": { - "format": "{}" - }, - - "hyprland/workspaces": { - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "all-outputs": true, - "on-click": "activate", - "format": "{icon}", - "format-icons": { - "1": "一", - "2": "二", - "3": "三", - "4": "四", - "5": "五", - "6": "六", - "7": "七", - "8": "八", - "9": "九", - "10": "十", - "11": "十一", - "12": "十二", - "13": "十三" - } - }, - - "tray": { - "icon-size": 20, - "tooltip": false, - "spacing": 10 - }, - - "clock": { - "format": "{:%a %b %d, %H:%M}", - "tooltip-format": "{:%Y %B}\n\n{calendar}" - }, - - "pulseaudio": { - "format": " {volume}%", - "tooltip": false, - "format-muted": " N/A", - "on-click": "pavucontrol &", - "scroll-step": 5 - }, - - "network": { - "format-wifi": " {essid} {signalStrength}%", - "format-ethernet": " {signalStrength}%", - "format-disconnected": " N/A" - }, - - "battery": { - "states": { - "warning": 20, - "critical": 15 - }, - "format": "󰁹 {capacity}%", - "format-charging": "󰂄 {capacity}%", - "format-plugged": "󰂄 {capacity}%" - } -} - diff --git a/laptop/configs/waybar/config-white.jsonc b/laptop/configs/waybar/config-white.jsonc new file mode 100644 index 0000000..9c3a1eb --- /dev/null +++ b/laptop/configs/waybar/config-white.jsonc @@ -0,0 +1,56 @@ +{ + "layer": "top", + "position": "top", + "height": 5, + "margin-top": 0, + // "exclusive": false, + // "mode": "overlay", + "modules-center": ["hyprland/workspaces"], + "modules-right": ["clock", "network", "battery"], + + "hyprland/workspaces": { + "disable-scroll": true, + "on-click": "activate", + "format": "{icon}", + "format-icons": { + "default": " ", + "1": " ", + "2": " ", + "3": " ", + "4": " ", + "5": " ", + "active": " ", + "urgent": " ", + }, + }, + + "clock": { + "format": "{:%H:%M}", + "tooltip": true, + "tooltip-format": "{:%B %d, %Y}", + }, + + "network": { + "format": "{icon}", + "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"], + "format-disconnected": "", + "tooltip-format-wifi": "{essid} ({signalStrength}%) ", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected", + }, + + "battery": { + "format": "{icon}", + "full-at": 95, + "format-icons": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"], + "tooltip": true, + "tooltip-format": "{capacity}%", + "tooltip-format-discharging": "%{capacity}\ndischarging", + "tooltip-format-charging": "%{capacity}\ncharging", + "states": { + "full": 100, + "warning": 50, + "critical": 15, + }, + }, +} diff --git a/laptop/configs/waybar/style-solarized.css b/laptop/configs/waybar/style-solarized.css deleted file mode 100644 index 66c12cc..0000000 --- a/laptop/configs/waybar/style-solarized.css +++ /dev/null @@ -1,50 +0,0 @@ -* { - border: none; - border-radius: 0; - padding: 0; - margin: 0; - font-size: 11px; -} - -window#waybar { - background: #fff; - color: #292828; -} - -#custom-logo { - font-size: 18px; - margin: 0; - margin-left: 7px; - margin-right: 12px; - padding: 0; - font-family: NotoSans Nerd Font Mono; -} - -#workspaces button { - margin-left: 2px; - margin-right: 10px; - color: #292828; -} - -#workspaces button:hover, -#workspaces button:active { - background-color: #fff; - color: #292828; -} - -#workspaces button.focused { - background-color: #383737; -} - -#language { - margin-right: 7px; -} - -#battery { - margin-left: 7px; - margin-right: 3px; -} - -#clock { - margin: 0px 6px; -} diff --git a/laptop/configs/waybar/style-white.css b/laptop/configs/waybar/style-white.css new file mode 100644 index 0000000..18e684d --- /dev/null +++ b/laptop/configs/waybar/style-white.css @@ -0,0 +1,122 @@ +/* Bar */ + +* { + font-family: "CartographCF Nerd Font"; + font-size: 14px; +} + +window#waybar { + background-color: rgba(0, 0, 0, 0.1); +} + +/* Tooltips */ + +tooltip { + /* background: #f7f7f9; */ + background: rgba(242, 244, 247, 0.9); + padding: 0px; + border: 1px solid rgba(168, 176, 185, 0.1); + border-radius: 20px; + box-shadow: 0 1px 3px rgba(140, 149, 159, 0.1); + margin: 0px; +} + +tooltip label { + /* background: #f7f7f9; */ + text-shadow: none; + color: #94949f; + /* color: #53586c; */ + /* color: #f9f9f9; */ + font-weight: bold; + padding: 0px 5px; + min-height: 0; +} + +/* Buttons */ + +@keyframes button_activate { + from { + opacity: 0.1; + } + + to { + opacity: 1; + } +} + +#workspaces { + background: rgba(219, 219, 219, 0.25); + border-radius: 25px; + margin-bottom: 1px; + padding: 4px 2px; +} + +#workspaces button { + color: #727482; + min-height: 3px; + min-width: 15px; + padding: 0px; + padding-left: 3px; + margin: 0px 3px; + border-radius: 25px; + background-color: #f9f9f9; + opacity: 0.35; + transition: all 0.3s ease-in-out; +} + +#workspaces button.active { + color: rgba(0, 0, 0, 0.5); + background-color: #f9f9f9; + border-radius: 16px; + min-width: 35px; + transition: all 0.3s ease-in-out; + opacity: 1; +} + +#workspaces button.urgent { + opacity: 1; +} + +#workspaces button.persistent { + color: rgba(170, 176, 197, 0.3); +} + +#workspaces button:hover { + opacity: 1; +} + +/* Indicators */ + +#battery, +#clock, +#network { + /* color: #f7f7f9; */ + font-weight: bold; + /* color: rgba(128, 142, 194, 0.8); */ + /* color: #53586c; */ + color: #ececf1; + background: transparent; +} + +#clock { + padding: 0px 5px 0 12px; + border-radius: 0% 0% 0% 15%; +} + +#network { + padding: 0px 5px 0px 0px; +} + +#battery { + padding: 0px 12px 0 5px; + border-radius: 0%; + margin-right: 0px; +} + +#battery.warning { + color: #ffffff; +} + +#battery.critical { + color: #e0589a; +} diff --git a/laptop/configs/waybar/style.css.chinese b/laptop/configs/waybar/style.css.chinese deleted file mode 100644 index a18a3d3..0000000 --- a/laptop/configs/waybar/style.css.chinese +++ /dev/null @@ -1,128 +0,0 @@ -* { - border: none; - border-radius: 0; - font-family: "Cartograph CF Nerd Font"; - font-weight: bold; - font-size: 16px; - min-height: 0; - margin: 1px; -} - -window#waybar { - background: rgba(75, 75, 75, 0); - color: #f1f1f1; -} - -tooltip { - background: #595959; - border-radius: 0px; -} - -#workspaces button { - padding: 5px; - color: #f1f1f1; -} - -#workspaces button.active { - background-color: #e16b53; - border-radius: 10px; -} - -#workspaces button.focused { - color: #f1f1f1; - background: #595959; - border-radius: 10px; -} - -#workspaces button.urgent { - color: #f1f1f1; - background: #595959; - border-radius: 10px; -} - -#workspaces button:hover { - background: #f1f1f1; - color: #595959; - border-radius: 10px; -} - -#custom-language, -#custom-updates, -#custom-caffeine, -#custom-weather, -#window, -#clock, -#battery, -#pulseaudio, -#network, -#workspaces, -#tray, -#language, -#backlight { - background: - /*#F6821E*/ - #444444; - padding: 0px 5px; - margin: 0px; - font-weight: 100; -} - -#tray { - margin-right: 0px; - border-radius: 0px 10px 10px 0px; -} - -#workspaces { - color: #f1f1f1; - margin-left: 0px; - padding-right: 0px; - padding-left: 5px; - border-radius: 10px; -} - -#custom-caffeine { - color: #f1f1f1; - border-right: 0px; - margin-left: 10px; -} - -#custom-language { - color: #f1f1f1; - border-left: 0px; - border-right: 0px; -} - -#custom-updates { - color: #f1f1f1; - border-left: 0px; - border-right: 0px; -} - -#window { - color: #f1f1f1; - background-color: #595959; - font-weight: 100; - border-radius: 10px; - margin-left: 0px; - margin-right: 60px; -} - -#clock { - color: #f1f1f1; - margin-left: 0px; - border-right: 0px; - padding: 0px 10px; -} - -#pulseaudio { - color: #f1f1f1; - border-left: 0px; - border-right: 0px; - padding-left: 10px; - border-radius: 10px 0px 0px 10px; -} - -#pulseaudio.microphone { - color: #f1f1f1; - margin-right: 5px; -} diff --git a/laptop/configs/wezterm/wezterm.lua b/laptop/configs/wezterm/wezterm.lua index e0ca9c1..83bf971 100644 --- a/laptop/configs/wezterm/wezterm.lua +++ b/laptop/configs/wezterm/wezterm.lua @@ -56,7 +56,7 @@ return { default_cursor_style = "BlinkingUnderline", -- X11 - enable_wayland = true, + enable_wayland = false, -- Keybinds disable_default_key_bindings = true, @@ -101,12 +101,12 @@ return { -- General automatically_reload_config = true, inactive_pane_hsb = { saturation = 1.0, brightness = 1.0 }, - window_background_opacity = 0.95, + window_background_opacity = 0.85, window_close_confirmation = "NeverPrompt", window_frame = { active_titlebar_bg = "#45475a", font = font_with_fallback(font_name, { bold = true }) }, check_for_updates = false, color_scheme_dirs = { "~/.config/wezterm/colors" }, - color_scheme = "monochrome_glorb" + color_scheme = "catppuccin-latte" }