Compare commits

...

No commits in common. "main" and "nabu" have entirely different histories.
main ... nabu

30 changed files with 439 additions and 364 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
tmux/plugins
components/tmux/plugins

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 MiB

After

Width:  |  Height:  |  Size: 4.2 MiB

23
bin/batmon Executable file
View file

@ -0,0 +1,23 @@
#!/usr/bin/env bash
monitor() {
cap=$(cat /sys/class/power_supply/bms/capacity)
fcs=$(cat /sys/class/power_supply/ln8000-charger/status)
scs=$(cat /sys/class/power_supply/pm8150b-charger/status)
[ "$fcs" == "Charging" ] && {
echo -ne "${cap}%++\n"
return 0
}
[ "$scs" == "Charging" ] && {
echo -ne "${cap}%+\n"
return 0
}
echo -ne "${cap}%\n"
return 0
}
while true; do
monitor
sleep 10
done

21
bin/dimscreen Executable file
View file

@ -0,0 +1,21 @@
#!/usr/bin/env bash
dim() {
brightnessctl -s
brightnessctl s 45%
}
restore() {
brightnessctl -r
}
case "$1" in
"d")
dim
;;
"r")
restore
;;
*)
return 1
esac

View file

@ -13,8 +13,8 @@ TERM = "xterm-256color"
padding = { x = 10, y = 10 }
dynamic_padding = true
decorations = "Full"
opacity = 0.95
opacity = 0.80
[font]
normal = { family = "JetBrainsMono Nerd Font Mono", style = "Regular" }
size = 14
normal = { family = "BigBlueTermPlus Nerd Font Mono", style = "Regular" }
size = 12

View file

@ -1,48 +1,48 @@
[colors.primary]
background = '#0e1513'
foreground = '#dde4e1'
background = '#19120d'
foreground = '#f0dfd6'
[colors.cursor]
text = '#dde4e1'
cursor = '#bec9c6'
text = '#f0dfd6'
cursor = '#d6c3b7'
[colors.vi_mode_cursor]
text = '#0e1513'
cursor = '#82d5c8'
text = '#19120d'
cursor = '#ffb781'
[colors.search.matches]
foreground = '#3f4947'
background = '#adcae6'
foreground = '#52443b'
background = '#c7ca95'
[colors.search.focused_match]
foreground = '#3f4947'
background = '#82d5c8'
foreground = '#52443b'
background = '#ffb781'
[colors.footer_bar]
foreground = '#3f4947'
background = '#dde4e1'
foreground = '#52443b'
background = '#f0dfd6'
[colors.hints.start]
foreground = '#3f4947'
background = '#b1ccc6'
foreground = '#52443b'
background = '#e4bfa7'
[colors.hints.end]
foreground = '#3f4947'
background = '#b1ccc6'
foreground = '#52443b'
background = '#e4bfa7'
[colors.selection]
text = '#0e1513'
background = '#82d5c8'
text = '#19120d'
background = '#ffb781'
[colors.normal]
black = '#181818'
red = '#ffb4ab'
green = '#82d5c8'
yellow = '#006a60'
blue = '#82d5c8'
magenta = '#adcae6'
cyan = '#b1ccc6'
green = '#ffb781'
yellow = '#895020'
blue = '#ffb781'
magenta = '#c7ca95'
cyan = '#e4bfa7'
white = '#BAC2DE'

View file

@ -31,25 +31,21 @@ if [ "$TERM" = "foot" ] || [ "$TERM" = "xterm-kitty" ]
end
if status is-interactive
bind \cl 'clear; _fetch; commandline -f repaint'
bind \cb btop
bind \cs 'source ~/.config/fish/config.fish'
bind \cl 'clear; _fetch; commandline -f repaint'
bind \cb btop
bind \cs 'source ~/.config/fish/config.fish'
if which eza > /dev/null 2>&1
alias ls="eza --icons=auto"
else if which exa > /dev/null 2>&1
alias ls="exa --icons=auto"
end
if which eza > /dev/null 2>&1
alias ls="eza --icons=auto"
else
alias ls="exa --icons=auto"
end
if which bat > /dev/null 2>&1
alias cat="bat"
if which bat > /dev/null 2>&1
alias cat="bat"
else if which batcat > /dev/null 2>&1
alias cat="batcat"
end
if which distrobox-enter > /dev/null 2>&1
alias denter=distrobox-enter
end
alias cat="batcat"
end
if which nvim > /dev/null 2>&1
alias v="nvim"
@ -58,17 +54,15 @@ if status is-interactive
alias V="sudoedit"
export EDITOR=nvim
end
if which zoxide > /dev/null 2>&1
zoxide init --cmd cd fish | source
end
alias cdt="cd (mktemp -d)"
alias ":q"=exit
if which zoxide > /dev/null 2>&1
zoxide init --cmd cd fish | source
end
if [ "$reload" = "" ]
if [ "$reload" = "" ]
_fetch
end
set reload "done"
end
alias :q="exit"
set reload "done"
end

View file

@ -1,7 +1,6 @@
# This file contains fish universal variable definitions.
# VERSION: 3.0
SETUVAR __fish_initialized:3400
SETUVAR _fisher_upgraded_to_4_4:\x1d
SETUVAR fish_color_autosuggestion:brblack
SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:blue
@ -30,7 +29,7 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_pager_color_selected_background:\x2dr
SETUVAR fish_user_paths:/home/timoxa0/\x2econfig/hypr/bin\x1e/home/timoxa0/\x2elocal/bin
SETUVAR fish_user_paths:/home/timoxa0/\x2ecargo/bin\x1e/home/timoxa0/\x2econfig/hypr/bin\x1e/home/timoxa0/\x2elocal/bin
SETUVAR pure_begin_prompt_with_current_directory:true
SETUVAR pure_check_for_new_release:false
SETUVAR pure_color_at_sign:pure_color_mute

View file

@ -1,34 +0,0 @@
# name: Default
# author: Lily Ballard
function fish_prompt --description 'Write out the prompt'
set -l last_pipestatus $pipestatus
set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
set -l normal (set_color normal)
set -q fish_color_status
or set -g fish_color_status red
# Color the prompt differently when we're root
set -l color_cwd $fish_color_cwd
set -l suffix '>'
if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root
set color_cwd $fish_color_cwd_root
end
set suffix '#'
end
# Write pipestatus
# If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it.
set -l bold_flag --bold
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
if test $__fish_prompt_status_generation = $status_generation
set bold_flag
end
set __fish_prompt_status_generation $status_generation
set -l status_color (set_color $fish_color_status)
set -l statusb_color (set_color $bold_flag $fish_color_status)
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " "
end

View file

@ -0,0 +1 @@
/usr/share/fish/functions/fish_prompt.fish

View file

@ -1,6 +0,0 @@
function fish_right_prompt -d "Write out the right prompt"
if set -q CONTAINER_ID
set distrobox_prefix "$(string replace -r -a '\b([\w])' '\U$0' "$CONTAINER_ID") "
end
echo -n -s $distrobox_prefix
end

View file

@ -4,6 +4,7 @@ general {
col.inactive_border = $secondary
}
exec-once = gsettings set org.gnome.desktop.interface font-name "BigBlueTermPlus Nerd Font 11"
exec-once = gsettings set org.gnome.desktop.interface gtk-theme "adw-gtk3"
exec-once = gsettings set org.gnome.desktop.interface icon-theme Papirus-Dark
exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'

View file

@ -1,5 +1,5 @@
$primary = rgb(82d5c8)
$secondary = rgb(b1ccc6)
$bg = rgb(0e1513)
$fg = rgb(dde4e1)
$primary = rgb(ffb781)
$secondary = rgb(e4bfa7)
$bg = rgb(19120d)
$fg = rgb(f0dfd6)

View file

@ -1,10 +1,17 @@
general {
lock_cmd = ~/.config/hypr/bin/lockscreen
before_sleep_cmd = loginctl lock-session
ignore_dbus_inhibit = false
ignore_systemd_inhibit = false
}
listener {
timeout = 3600
on-timeout = ~/.config/hypr/bin/lockscreen
timeout = 300
on-timeout = loginctl lock-session
}
listener {
timeout = 60
on-timeout = ~/.config/hypr/bin/dimscreen d
on-resume = ~/.config/hypr/bin/dimscreen r
}

View file

@ -1,6 +1,5 @@
source = appearance.conf
source = monitors.conf
# source = ~/.config/hypr/monitors.sunshine.conf
#===========================================================================#
# Variables #
#===========================================================================#
@ -8,7 +7,7 @@ source = monitors.conf
$terminal = alacritty
$fileManager = nautilus -w
$menu = ~/.config/hypr/bin/runner
$browser = firefox-nightly
$browser = firefox
$discord = vesktop
$telegram = telegram-desktop
$pctl = playerctl
@ -22,6 +21,7 @@ $mainMod = SUPER
#===========================================================================#
exec-once = gsettings set org.gnome.desktop.wm.preferences button-layout ':'
exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=Hyprland
exec-once = hyprpaper -c ~/.config/hypr/components/hyprland/hyprpaper.conf
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
@ -32,11 +32,12 @@ exec-once = bash -c "sleep 2; easyeffects --gapplication-service"
exec-once = /usr/lib/xdg-desktop-portal -r
exec-once = waybar -c ~/.config/hypr/components/waybar/waybar.jsonc -s ~/.config/hypr/components/waybar/waybar.css
exec-once = clash-verge
exec-once = bash -c "sleep 5; vesktop"
#exec-once = bash -c "sleep 5; vesktop"
exec-once = bash -c "sleep 5; telegram-desktop -startintray"
# exec-once = pipewire &
# exec-once = pipewire-pulse &
# exec-once = wireplumber &
# exec-once = syshud -o h -p top -M "audio_in,audio_out" -m "15 0 0 0"
# exec-once = AmneziaVPN -a &
#===========================================================================#
@ -59,16 +60,19 @@ env = EDITOR,nvim
#===========================================================================#
general {
gaps_in = 5
gaps_out = 10
gaps_in = 3
gaps_out = 5
border_size = 3
resize_on_border = false
resize_on_border = true
allow_tearing = false
layout = dwindle
}
decoration {
rounding = 5
rounding = 0
active_opacity = 1.0
inactive_opacity = 1.0
@ -88,7 +92,7 @@ decoration {
}
animations {
enabled = true
enabled = false
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 7, myBezier
@ -103,6 +107,7 @@ dwindle {
pseudotile = false
preserve_split = true
smart_split = false
no_gaps_when_only = true
smart_resizing = false
}
@ -111,6 +116,11 @@ misc {
disable_hyprland_logo = true
}
#===========================================================================#
# Input #
#===========================================================================#
input {
kb_layout = us, ru
kb_variant =
@ -119,11 +129,21 @@ input {
kb_rules =
follow_mouse = 1
sensitivity = 0
touchpad {
natural_scroll = false
touchdevice {
transform = 3
}
}
gestures {
workspace_swipe = false
}
device {
name = epic-mouse-v1
sensitivity = -0.5
}
#===========================================================================#
# Keybinds #
#---------------------------------------------------------------------------#
@ -142,9 +162,9 @@ bind = $mainMod, C, togglefloating,
bind = $mainMod, SPACE, exec, $menu
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, X, togglesplit, # dwindle
bind = $mainMod, Home, exec, $sshot region
bind = $mainMod, Prior, exec, $sshot window
bind = $mainMod, Next, exec, $sshot output
bind = $mainMod, R, exec, $sshot region
bind = $mainMod, W, exec, $sshot window
bind = $mainMod, O, exec, $sshot output
bind = $mainMod Ctrl, Q, exec, $locker
#===========================================================================#
@ -157,7 +177,6 @@ bind = , XF86AudioPrev, exec, $pctl previous
bind = , XF86AudioMute, exec, pamixer -t
bind = , XF86AudioRaiseVolume, exec, pamixer -i 2
bind = , XF86AudioLowerVolume, exec, pamixer -d 2
#===========================================================================#
# Move focus with mainMod + arrow keys #
#===========================================================================#
@ -168,6 +187,12 @@ bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
#===========================================================================#
# Brightness control #
#===========================================================================#
bind = CTRL, 1, exec, brightnessctl s 5%-
bind = CTRL, 2, exec, brightnessctl s 5%+
#===========================================================================#
# Switch workspaces with mainMod + [0-9] #
#===========================================================================#
@ -234,11 +259,10 @@ windowrule = float, ^(fetch)$
windowrule = float, ^(AmneziaVPN)$
windowrule = float, ^(org.pulseaudio.pavucontrol)$
windowrule = size 696 570, ^(org.pulseaudio.pavucontrol)$
windowrule = move 1630 820, ^(org.pulseaudio.pavucontrol)$
windowrule = monitor DP-1, ^(org.pulseaudio.pavucontrol)$
#windowrule = size 696 570, ^(org.pulseaudio.pavucontrol)$
#windowrule = move 1630 820, ^(org.pulseaudio.pavucontrol)$
windowrule = monitor DSI-1, ^(org.pulseaudio.pavucontrol)$
windowrule = monitor HDMI-A-2, ^(xfreerdp)$
windowrule = fullscreen, ^(xfreerdp)$
windowrulev2 = opacity 0.0 override,class:^(xwaylandvideobridge)$
@ -246,3 +270,31 @@ windowrulev2 = noanim,class:^(xwaylandvideobridge)$
windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$
windowrulev2 = noblur,class:^(xwaylandvideobridge)$
plugin:touch_gestures {
# The default sensitivity is probably too low on tablet screens,
# I recommend turning it up to 4.0
sensitivity = 4.0
# must be >= 3
workspace_swipe_fingers = 3
# switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
# and can be used at the same time
# possible values: l, r, u, or d
# to disable it set it to anything else
workspace_swipe_edge = d
# in milliseconds
long_press_delay = 400
# in pixels, the distance from the edge that is considered an edge
edge_margin = 10
experimental {
# send proper cancel events to windows instead of hacky touch_up events,
# NOT recommended as it crashed a few times, once it's stabilized I'll make it the default
send_cancel = 0
}
}

View file

@ -6,7 +6,7 @@ background {
path = ~/.config/hypr/wallpaper.png
blur_passes = 3
contrast = 0.8916
brightness = 0.8172
brightness = 0.4172
vibrancy = 0.1696
vibrancy_darkness = 0.0
}
@ -19,31 +19,31 @@ general {
}
# INPUT FIELD
input-field {
monitor = DP-1
size = 200, 40
outline_thickness = 2
dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
dots_center = true
outer_color = rgba(0, 0, 0, 0)
inner_color = rgba(0, 0, 0, 0.5)
font_color = $fg
fade_on_empty = false
placeholder_text =
hide_input = false
position = 0, -650 #-120
halign = center
valign = center
}
# input-field {
# monitor = DSI-1
# size = 200, 40
# outline_thickness = 2
# dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
# dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
# dots_center = true
# outer_color = rgba(0, 0, 0, 0)
# inner_color = rgba(0, 0, 0, 0.5)
# font_color = $fg
# fade_on_empty = false
# placeholder_text =
# hide_input = false
# position = 0, -650 #-120
# halign = center
# valign = center
# }
# TIME
label {
monitor = DP-1
monitor = DSI-1
text = cmd[update:1000] echo "$(date +"%H:%M")"
color = $fg
font_size = 240
font_family = eurofurence
font_size = 100
font_family = BigBlueTermPlus Nerd Font
position = 0, -300
halign = center
valign = top
@ -51,12 +51,12 @@ label {
# USER
label {
monitor = DP-1
monitor = DSI-1
text = Enter your password
color = $fg
font_size = 14
font_family = eurofurence
position = 0, -690 # -40
font_size = 16
font_family = BigBlueTermPlus Nerd Font
position = 0, -780 # -40
halign = center
valign = center

View file

@ -2,6 +2,10 @@
# Monitors #
#===========================================================================#
monitor=DP-1, 3440x1440@100, 1920x0, 1
monitor=HDMI-A-2, 1920x1200@60, 0x0, 1
monitor=HDMI-A-1, 1920x1200@60, 2680x1440, 1
render {
explicit_sync = 0
explicit_sync_kms = 0
direct_scanout = false
}
monitor=DSI-1,1600x2560@104,0x0,1.6, transform, 3

View file

@ -1,3 +0,0 @@
monitor=DP-1, 2560x1600@120, 0x0, 1
monitor=HDMI-A-1, disable
monitor=HDMI-A-2, disable

View file

@ -1,18 +1,18 @@
sort=-time
layer=overlay
output=DP-1
output=DSI-1
anchor=top-right
background-color=#0e1513bb
background-color=#19120dbb
width=300
height=110
border-size=3
border-color=#82d5c8
border-radius=5
icons=0
border-color=#ffb781
border-radius=0
icons=1
max-icon-size=64
default-timeout=5000
ignore-timeout=1
font=JetBrainsMono Nerd Font Mono: 14
font=BigBlueTermPlus Nerd Font Mono 14
[urgency=high]
border-color=#ffb4ab

View file

@ -1,7 +1,7 @@
{
"LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
"LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" },
"NvChad": { "branch": "v2.5", "commit": "0ef037c6db092f0ea627d3f81ce8e7db45e9b187" },
"base46": { "branch": "v2.5", "commit": "b17df65f6d423055e9fdfa4e7f55967c03862f29" },
"base46": { "branch": "v2.5", "commit": "5b58434a52f86a9bcc7ee89f8a4da81225b490a9" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
@ -9,20 +9,20 @@
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" },
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
"gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
"indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
"lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" },
"gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
"indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
"mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" },
"nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" },
"nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
"nvim-colorizer.lua": { "branch": "master", "commit": "08bd34bf0ed79723f62764c7f9ca70516d461d0d" },
"nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
"nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" },
"nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" },
"nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" },
"nvim-tree.lua": { "branch": "master", "commit": "ea55ef12036897fdc4476b115a395d2a34965c82" },
"nvim-treesitter": { "branch": "master", "commit": "c1ad655b6a0c83ab48e55240f367e2bc0c15af31" },
"nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" },
"ui": { "branch": "v2.5", "commit": "bfd0995b78376c342e84de580c85f842b163a75f" },
"nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
"plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
"telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },
"ui": { "branch": "v2.5", "commit": "7283d036fd6fc2a3352d373dddeb7b1ac27f453f" },
"vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" },
"which-key.nvim": { "branch": "main", "commit": "650f298f516018ad7ebce6d957e015d5db434f3c" }
"which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" }
}

View file

@ -5,7 +5,7 @@
local M = {}
M.ui = {
theme = "everforest",
theme = "gruvbox",
transparency = true
-- hl_override = {

View file

@ -4,7 +4,7 @@ local on_init = require("nvchad.configs.lspconfig").on_init
local capabilities = require("nvchad.configs.lspconfig").capabilities
local lspconfig = require "lspconfig"
local servers = { "html", "gopls" }
local servers = { "html" }
-- lsps with default config
for _, lsp in ipairs(servers) do

View file

@ -1,47 +1,47 @@
* {
primary: #82d5c8;
primary-fixed: #9ef2e4;
primary-fixed-dim: #82d5c8;
on-primary: #003731;
on-primary-fixed: #00201c;
on-primary-fixed-variant: #005048;
primary-container: #005048;
on-primary-container: #9ef2e4;
secondary: #b1ccc6;
secondary-fixed: #cce8e2;
secondary-fixed-dim: #b1ccc6;
on-secondary: #1c3531;
on-secondary-fixed: #05201c;
on-secondary-fixed-variant: #334b47;
secondary-container: #354e49;
on-secondary-container: #cce8e2;
tertiary: #adcae6;
tertiary-fixed: #cce5ff;
tertiary-fixed-dim: #adcae6;
on-tertiary: #153349;
on-tertiary-fixed: #001e31;
on-tertiary-fixed-variant: #2d4961;
tertiary-container: #2d4961;
on-tertiary-container: #cce5ff;
primary: #ffb781;
primary-fixed: #ffdcc5;
primary-fixed-dim: #ffb781;
on-primary: #4f2500;
on-primary-fixed: #301400;
on-primary-fixed-variant: #6d390a;
primary-container: #6d390a;
on-primary-container: #ffdcc5;
secondary: #e4bfa7;
secondary-fixed: #ffdcc5;
secondary-fixed-dim: #e4bfa7;
on-secondary: #422b1a;
on-secondary-fixed: #2a1708;
on-secondary-fixed-variant: #5b412f;
secondary-container: #5b412f;
on-secondary-container: #ffdcc5;
tertiary: #c7ca95;
tertiary-fixed: #e3e6af;
tertiary-fixed-dim: #c7ca95;
on-tertiary: #30330b;
on-tertiary-fixed: #1b1d00;
on-tertiary-fixed-variant: #464920;
tertiary-container: #464920;
on-tertiary-container: #e3e6af;
error: #ffb4ab;
on-error: #690005;
error-container: #93000a;
on-error-container: #ffdad6;
surface: #0e1513;
on-surface: #dde4e1;
on-surface-variant: #bec9c6;
outline: #899390;
outline-variant: #3f4947;
surface: #19120d;
on-surface: #f0dfd6;
on-surface-variant: #d6c3b7;
outline: #9f8d83;
outline-variant: #52443b;
shadow: #000000;
scrim: #000000;
inverse-surface: #dde4e1;
inverse-on-surface: #2b3230;
inverse-primary: #006a60;
surface-dim: #0e1513;
surface-bright: #343b39;
surface-container-lowest: #090f0e;
surface-container-low: #161d1c;
surface-container: #1a2120;
surface-container-high: #252b2a;
surface-container-highest: #303635;
inverse-surface: #f0dfd6;
inverse-on-surface: #382f28;
inverse-primary: #895020;
surface-dim: #19120d;
surface-bright: #413731;
surface-container-lowest: #140d08;
surface-container-low: #221a14;
surface-container: #261e18;
surface-container-high: #312822;
surface-container-highest: #3c332d;
}

View file

@ -3,101 +3,101 @@
* Generated with Matugen
*/
@define-color background #0e1513;
@define-color background #19120d;
@define-color error #ffb4ab;
@define-color error_container #93000a;
@define-color inverse_on_surface #2b3230;
@define-color inverse_on_surface #382f28;
@define-color inverse_primary #006a60;
@define-color inverse_primary #895020;
@define-color inverse_surface #dde4e1;
@define-color inverse_surface #f0dfd6;
@define-color on_background #dde4e1;
@define-color on_background #f0dfd6;
@define-color on_error #690005;
@define-color on_error_container #ffdad6;
@define-color on_primary #003731;
@define-color on_primary #4f2500;
@define-color on_primary_container #9ef2e4;
@define-color on_primary_container #ffdcc5;
@define-color on_primary_fixed #00201c;
@define-color on_primary_fixed #301400;
@define-color on_primary_fixed_variant #005048;
@define-color on_primary_fixed_variant #6d390a;
@define-color on_secondary #1c3531;
@define-color on_secondary #422b1a;
@define-color on_secondary_container #cce8e2;
@define-color on_secondary_container #ffdcc5;
@define-color on_secondary_fixed #05201c;
@define-color on_secondary_fixed #2a1708;
@define-color on_secondary_fixed_variant #334b47;
@define-color on_secondary_fixed_variant #5b412f;
@define-color on_surface #dde4e1;
@define-color on_surface #f0dfd6;
@define-color on_surface_variant #bec9c6;
@define-color on_surface_variant #d6c3b7;
@define-color on_tertiary #153349;
@define-color on_tertiary #30330b;
@define-color on_tertiary_container #cce5ff;
@define-color on_tertiary_container #e3e6af;
@define-color on_tertiary_fixed #001e31;
@define-color on_tertiary_fixed #1b1d00;
@define-color on_tertiary_fixed_variant #2d4961;
@define-color on_tertiary_fixed_variant #464920;
@define-color outline #899390;
@define-color outline #9f8d83;
@define-color outline_variant #3f4947;
@define-color outline_variant #52443b;
@define-color primary #82d5c8;
@define-color primary #ffb781;
@define-color primary_container #005048;
@define-color primary_container #6d390a;
@define-color primary_fixed #9ef2e4;
@define-color primary_fixed #ffdcc5;
@define-color primary_fixed_dim #82d5c8;
@define-color primary_fixed_dim #ffb781;
@define-color scrim #000000;
@define-color secondary #b1ccc6;
@define-color secondary #e4bfa7;
@define-color secondary_container #354e49;
@define-color secondary_container #5b412f;
@define-color secondary_fixed #cce8e2;
@define-color secondary_fixed #ffdcc5;
@define-color secondary_fixed_dim #b1ccc6;
@define-color secondary_fixed_dim #e4bfa7;
@define-color shadow #000000;
@define-color source_color #1f3834;
@define-color source_color #d2741d;
@define-color surface #0e1513;
@define-color surface #19120d;
@define-color surface_bright #343b39;
@define-color surface_bright #413731;
@define-color surface_container #1a2120;
@define-color surface_container #261e18;
@define-color surface_container_high #252b2a;
@define-color surface_container_high #312822;
@define-color surface_container_highest #303635;
@define-color surface_container_highest #3c332d;
@define-color surface_container_low #161d1c;
@define-color surface_container_low #221a14;
@define-color surface_container_lowest #090f0e;
@define-color surface_container_lowest #140d08;
@define-color surface_dim #0e1513;
@define-color surface_dim #19120d;
@define-color surface_variant #3f4947;
@define-color surface_variant #52443b;
@define-color tertiary #adcae6;
@define-color tertiary #c7ca95;
@define-color tertiary_container #2d4961;
@define-color tertiary_container #464920;
@define-color tertiary_fixed #cce5ff;
@define-color tertiary_fixed #e3e6af;
@define-color tertiary_fixed_dim #adcae6;
@define-color tertiary_fixed_dim #c7ca95;

View file

@ -1,8 +1,8 @@
@import "colors.css";
* {
font-family: JetBrainsMono, "Font Awesome 6 Free", SymbolsNerdFont;
font-weight: bold;
font-family: "BigBlueTermPlus Nerd Font", SymbolsNerdFont;
font-weight: normal;
font-size: 14px;
min-height: 0px;
}
@ -12,73 +12,66 @@ window#waybar {
background: @on_primary_fixed;
transition-property: background-color;
transition-duration: .5s;
border-radius: 15px;
border-radius: 0px;
}
#workspaces {
background-color: @on_primary_fixed_variant;
margin: 4px 5px 4px 5px;
padding: 1px;
border-radius: 12px;
background-color: @on_pimary_fixed;
border-radius: 0px;
margin: 0px 0px 0px 5px;
}
#workspaces button,
#workspaces button:hover,
#workspaces button.active {
padding: 0px 3px;
margin: 2px;
border-radius: 10px;
border-radius: 0px;
padding: 2px 0px 0px 0px;
}
#workspaces button {
color: @secondary_fixed_dim;
}
#workspaces button:hover {
background-color: @primary_fixed;
color: @on_primary_fixed;
color: @primary_fixed;
}
#workspaces button.active {
background-color: @primary_fixed_dim;
color: @on_primary_fixed
}
#workspaces button.active:hover {
background-color: @primary_fixed;
color: @on_primary_fixed;
color: @primary_fixed_dim
}
#custom-power, #custom-runner,
#custom-power, #custom-runner, #custom-batmon,
#wireplumber, #wireplumber.muted,
#tray, #language, #clock {
background: @on_primary_fixed_variant;
border-radius: 12px;
#custom-rbracket, #custom-lbracket, #tray, #language, #clock, #window {
background: @on_pimary_fixed;
border-radius: 0px;
color: @primary_fixed_dim;
margin: 4px 2.5px 4px 2.5px;
margin: 4px 2px 4px 2px;
padding: 2px 0px 0px 0px;
}
#custom-rbracket {
margin: 4px 2px 4px 0px;
}
#custom-lbracket {
margin: 4px 0px 4px 2px;
}
window#waybar.empty #window {
color: transparent;
}
#custom-power {
margin: 4px 2.5px 4px 5px;
padding: 0px 9px;
}
#custom-runner {
padding: 0px 10px;
margin: 4px 1px 4px 5px;
}
#tray {
padding: 0px 10px;
margin: 0px 8px;
margin: 4px 0px 4px 0px
}
#wireplumber, #wireplumber.muted {
padding: 0px 10px;
min-width: 55px;
}
#wireplumber.muted {
color: @error;
}
#language {
padding: 0px 7px 0px 7px;
}
#clock {
padding: 0px 10px;
margin: 4px 5px 4px 2.5px;
margin: 4px 5px 4px 1px;
}

View file

@ -1,57 +1,80 @@
{
"position": "bottom",
"height": 31,
"width": 900,
"height": 29,
// "width": 900,
"spacing": 0,
"margin-bottom": 5,
// "margin-bottom": 5,
"layer": "top",
"modules-left": ["custom/power", "custom/runner"],
"modules-center": ["hyprland/workspaces"],
"modules-right": ["tray", "wireplumber", "hyprland/language", "clock"],
"modules-left": ["custom/power", "custom/runner", "hyprland/workspaces"],
"modules-center": ["hyprland/window"],
"modules-right": ["custom/lbracket", "tray", "custom/rbracket", "custom/batmon", "wireplumber", "hyprland/language", "clock"],
"custom/power": {
"format": "",
"format": "[POWER]",
"on-click": "~/.config/hypr/bin/powermenu"
},
"custom/runner": {
"format": "",
"format": "[RUN]",
"on-click": "~/.config/hypr/bin/runner"
},
"custom/batmon": {
"format": "[BAT: {}]",
"exec": "~/.config/hypr/bin/batmon"
},
"custom/rbracket": {
"format": "]"
},
"custom/lbracket": {
"format": "["
},
"hyprland/window": {
"format": "[{}]",
"rewrite": {
},
"separate-outputs": true
},
"hyprland/workspaces": {
"format": "{name}",
"format": "[{name}]",
"on-click": "activate",
"tooltip": false,
"persistent_workspaces": {
"*": 1
"*": 1,
"*": 2,
"*": 3,
"*": 4,
"*": 5
}
},
"tray": {
"icon-size": 14,
"spacing": 15
"spacing": 8,
"show-passive-items": true
},
"wireplumber": {
"scroll-step": 2,
"format": "{icon} {volume}%",
"format-icons":["", "", ""],
"format-muted": " mute",
"format": "[VOL: {volume}%]",
"format-muted": "[VOL: mute]",
"on-click": "pavucontrol",
"max-volume": 100
},
"hyprland/language": {
"format": "{}",
"format-en": "Eng",
"format-ru": "Rus"
"format": "[LANG: {}]",
"format-en": "ENG",
"format-ru": "RUS"
},
"clock": {
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": " {:%Y-%m-%d}",
"format": "{:%H:%M}",
"format-alt": "[DATE: {:%Y-%m-%d}]",
"format": "[TIME: {:%H:%M}]",
"timezone": "Asia/Yekaterinburg"
}
}

View file

@ -3,19 +3,19 @@
* Generated with Matugen
*/
@define-color accent_color #82d5c8;
@define-color accent_fg_color #00201c;
@define-color accent_bg_color #82d5c8;
@define-color window_bg_color #0e1513;
@define-color window_fg_color #dde4e1;
@define-color headerbar_bg_color #0e1513;
@define-color headerbar_fg_color #dde4e1;
@define-color popover_bg_color #0e1513;
@define-color popover_fg_color #dde4e1;
@define-color view_bg_color #0e1513;
@define-color view_fg_color #dde4e1;
@define-color card_bg_color #0e1513;
@define-color card_fg_color #dde4e1;
@define-color accent_color #ffb781;
@define-color accent_fg_color #301400;
@define-color accent_bg_color #ffb781;
@define-color window_bg_color #19120d;
@define-color window_fg_color #f0dfd6;
@define-color headerbar_bg_color #19120d;
@define-color headerbar_fg_color #f0dfd6;
@define-color popover_bg_color #19120d;
@define-color popover_fg_color #f0dfd6;
@define-color view_bg_color #19120d;
@define-color view_fg_color #f0dfd6;
@define-color card_bg_color #19120d;
@define-color card_fg_color #f0dfd6;
@define-color sidebar_bg_color @window_bg_color;
@define-color sidebar_fg_color @window_fg_color;
@define-color sidebar_border_color @window_bg_color;

View file

@ -3,19 +3,19 @@
* Generated with Matugen
*/
@define-color accent_color #82d5c8;
@define-color accent_fg_color #00201c;
@define-color accent_bg_color #82d5c8;
@define-color window_bg_color #0e1513;
@define-color window_fg_color #dde4e1;
@define-color headerbar_bg_color #0e1513;
@define-color headerbar_fg_color #dde4e1;
@define-color popover_bg_color #0e1513;
@define-color popover_fg_color #dde4e1;
@define-color view_bg_color #0e1513;
@define-color view_fg_color #dde4e1;
@define-color card_bg_color #0e1513;
@define-color card_fg_color #dde4e1;
@define-color accent_color #ffb781;
@define-color accent_fg_color #301400;
@define-color accent_bg_color #ffb781;
@define-color window_bg_color #19120d;
@define-color window_fg_color #f0dfd6;
@define-color headerbar_bg_color #19120d;
@define-color headerbar_fg_color #f0dfd6;
@define-color popover_bg_color #19120d;
@define-color popover_fg_color #f0dfd6;
@define-color view_bg_color #19120d;
@define-color view_fg_color #f0dfd6;
@define-color card_bg_color #19120d;
@define-color card_fg_color #f0dfd6;
@define-color sidebar_bg_color @window_bg_color;
@define-color sidebar_fg_color @window_fg_color;
@define-color sidebar_border_color @window_bg_color;

View file

@ -3,19 +3,19 @@
* Generated with Matugen
*/
@define-color accent_color #82d5c8;
@define-color accent_fg_color #00201c;
@define-color accent_bg_color #82d5c8;
@define-color window_bg_color #0e1513;
@define-color window_fg_color #dde4e1;
@define-color headerbar_bg_color #0e1513;
@define-color headerbar_fg_color #dde4e1;
@define-color popover_bg_color #0e1513;
@define-color popover_fg_color #dde4e1;
@define-color view_bg_color #0e1513;
@define-color view_fg_color #dde4e1;
@define-color card_bg_color #0e1513;
@define-color card_fg_color #dde4e1;
@define-color accent_color #ffb781;
@define-color accent_fg_color #301400;
@define-color accent_bg_color #ffb781;
@define-color window_bg_color #19120d;
@define-color window_fg_color #f0dfd6;
@define-color headerbar_bg_color #19120d;
@define-color headerbar_fg_color #f0dfd6;
@define-color popover_bg_color #19120d;
@define-color popover_fg_color #f0dfd6;
@define-color view_bg_color #19120d;
@define-color view_fg_color #f0dfd6;
@define-color card_bg_color #19120d;
@define-color card_fg_color #f0dfd6;
@define-color sidebar_bg_color @window_bg_color;
@define-color sidebar_fg_color @window_fg_color;
@define-color sidebar_border_color @window_bg_color;

View file

@ -3,19 +3,19 @@
* Generated with Matugen
*/
@define-color accent_color #82d5c8;
@define-color accent_fg_color #00201c;
@define-color accent_bg_color #82d5c8;
@define-color window_bg_color #0e1513;
@define-color window_fg_color #dde4e1;
@define-color headerbar_bg_color #0e1513;
@define-color headerbar_fg_color #dde4e1;
@define-color popover_bg_color #0e1513;
@define-color popover_fg_color #dde4e1;
@define-color view_bg_color #0e1513;
@define-color view_fg_color #dde4e1;
@define-color card_bg_color #0e1513;
@define-color card_fg_color #dde4e1;
@define-color accent_color #ffb781;
@define-color accent_fg_color #301400;
@define-color accent_bg_color #ffb781;
@define-color window_bg_color #19120d;
@define-color window_fg_color #f0dfd6;
@define-color headerbar_bg_color #19120d;
@define-color headerbar_fg_color #f0dfd6;
@define-color popover_bg_color #19120d;
@define-color popover_fg_color #f0dfd6;
@define-color view_bg_color #19120d;
@define-color view_fg_color #f0dfd6;
@define-color card_bg_color #19120d;
@define-color card_fg_color #f0dfd6;
@define-color sidebar_bg_color @window_bg_color;
@define-color sidebar_fg_color @window_fg_color;
@define-color sidebar_border_color @window_bg_color;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 MiB

After

Width:  |  Height:  |  Size: 11 MiB