Skip to content

B
branding-etersoft-ximper
Commit 50ccb6c9 authored by prolinux's avatar prolinux
Browse files
Options

Поправил config modules.json style-dark.css и добавил svg

parent 662bb6ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 403 additions and 35 deletions
configs/hyprland/kitty/autosave 0 → 100644
View file @ 50ccb6c9
set aaa_mode=all
set altformat_current= %F
set altformat_playlist= %F
set altformat_title= %F
set altformat_trackwin= %F
set auto_expand_albums_follow=true
set auto_expand_albums_search=true
set auto_expand_albums_selcur=true
set auto_reshuffle=true
set buffer_seconds=10
set color_cmdline_attr=default
set color_cmdline_bg=default
set color_cmdline_fg=default
set color_cur_sel_attr=default
set color_error=lightred
set color_info=lightyellow
set color_separator=blue
set color_statusline_attr=default
set color_statusline_bg=default
set color_statusline_fg=black
set color_titleline_attr=default
set color_titleline_bg=blue
set color_titleline_fg=default
set color_trackwin_album_attr=bold
set color_trackwin_album_bg=default
set color_trackwin_album_fg=default
set color_win_attr=default
set color_win_bg=default
set color_win_cur=black
set color_win_cur_attr=default
set color_win_cur_sel_attr=default
set color_win_cur_sel_bg=blue
set color_win_cur_sel_fg=green
set color_win_dir=blue
set color_win_fg=red
set color_win_inactive_cur_sel_attr=default
set color_win_inactive_cur_sel_bg=gray
set color_win_inactive_cur_sel_fg=lightyellow
set color_win_inactive_sel_attr=default
set color_win_inactive_sel_bg=black
set color_win_inactive_sel_fg=black
set color_win_sel_attr=default
set color_win_sel_bg=blue
set color_win_sel_fg=white
set color_win_title_attr=default
set color_win_title_bg=blue
set color_win_title_fg=white
set confirm_run=true
set continue=true
set device=/dev/cdrom
set display_artist_sort_name=false
set dsp.oss.device=
set follow=false
set format_current= %a - %l -%3n. %t%= %y
set format_playlist= %F
set format_playlist_va= %F
set format_statusline= %{status} %{?show_playback_position?%{position} %{?duration?/ %{duration} }?%{?duration?%{duration} }}- %{total} %{?bpm>0?at %{bpm} BPM }%{?volume>=0?vol: %{?lvolume!=rvolume?%{lvolume},%{rvolume} ?%{volume} }}%{?stream?buf: %{buffer} }%{?show_current_bitrate & bitrate>=0? %{bitrate} kbps }%=%{?repeat_current?repeat current?%{?play_library?%{playlist_mode} from %{?play_sorted?sorted }library?playlist}} | %1{continue}%1{follow}%1{repeat}%1{shuffle}
set format_title=%a - %l - %t (%y)
set format_trackwin=%3n. %t%= %y %d
set format_trackwin_album= %l %= %{albumduration}
set format_trackwin_va=%3n. %t (%a)%= %y %d
set format_treewin= %l
set format_treewin_artist=%a
set icecast_default_charset=ISO-8859-1
set id3_default_charset=ISO-8859-1
set input.mad.priority=55
set input.wav.priority=50
set lib_add_filter=
set lib_sort=albumartist date album discnumber tracknumber title filename play_count
set mixer.oss.channel=PCM
set mixer.oss.device=
set mixer.pulse.restore_volume=1
set mouse=true
set mpris=false
set output_plugin=pulse
set passwd=
set pl_sort=
set play_library=false
set play_sorted=false
set repeat=false
set repeat_current=false
set replaygain=disabled
set replaygain_limit=true
set replaygain_preamp=0.000000
set resume=false
set rewind_offset=5
set scroll_offset=2
set set_term_title=true
set show_all_tracks=true
set show_current_bitrate=false
set show_hidden=false
set show_playback_position=true
set show_remaining_time=false
set shuffle=false
set skip_track_info=false
set smart_artist_sort=true
set softvol=false
set softvol_state=0 0
set start_view=playlist
set status_display_program=
set time_show_leading_zero=true
set wrap_search=true
bind browser backspace browser-up
bind browser i toggle show_hidden
bind browser space win-activate
bind browser u win-update
bind common ! push shell
bind common + vol +10%
bind common , seek -1m
bind common - vol -10%
bind common . seek +1m
bind common / search-start
bind common 1 view tree
bind common 2 view sorted
bind common 3 view playlist
bind common 4 view queue
bind common 5 view browser
bind common 6 view filters
bind common 7 view settings
bind common = vol +10%
bind common ? search-b-start
bind common C toggle continue
bind common D win-remove
bind common E win-add-Q
bind common F push filter
bind common G win-bottom
bind common I echo {}
bind common L push live-filter
bind common M toggle play_library
bind common N search-prev
bind common P win-mv-before
bind common U win-update-cache
bind common [ vol +1% +0
bind common ] vol +0 +1%
bind common ^B win-page-up
bind common ^C echo Type :quit<enter> to exit cmus.
bind common ^D win-half-page-down
bind common ^E win-scroll-down
bind common ^F win-page-down
bind common ^L refresh
bind common ^R toggle repeat_current
bind common ^U win-half-page-up
bind common ^Y win-scroll-up
bind common a win-add-l
bind common b player-next
bind common c player-pause
bind common delete win-remove
bind common down win-down
bind common e win-add-q
bind common end win-bottom
bind common enter win-activate
bind common f toggle follow
bind common g win-top
bind common h seek -5
bind common home win-top
bind common i win-sel-cur
bind common j win-down
bind common k win-up
bind common l seek +5
bind common left seek -5
bind common m toggle aaa_mode
bind common mlb_click_selected win-activate
bind common mouse_scroll_down win-down
bind common mouse_scroll_up win-up
bind common n search-next
bind common o toggle play_sorted
bind common p win-mv-after
bind common page_down win-page-down
bind common page_up win-page-up
bind common q quit -i
bind common r toggle repeat
bind common right seek +5
bind common s toggle shuffle
bind common space win-toggle
bind common t toggle show_remaining_time
bind common tab win-next
bind common u update-cache
bind common up win-up
bind common v player-stop
bind common x player-play
bind common y win-add-p
bind common z player-prev
bind common { vol -1% -0
bind common } vol -0 -1%
fset 90s=date>=1990&date<2000
fset classical=genre="Classical"
fset missing-tag=!stream&(artist=""|album=""|title=""|tracknumber=-1|date=-1)
fset mp3=filename="*.mp3"
fset ogg=filename="*.ogg"
fset ogg-or-mp3=ogg|mp3
fset unheard=play_count=0
factivate
configs/hyprland/waybar/colors/adw-dark.css
View file @ 50ccb6c9
...@@ -7,3 +7,4 @@ ...@@ -7,3 +7,4 @@
@define-color unfocused #f85656; @define-color unfocused #f85656;
@define-color urgent #e89b0b; @define-color urgent #e89b0b;
@define-color accent #3584e4; @define-color accent #3584e4;
configs/hyprland/waybar/config
View file @ 50ccb6c9
{ {
"layer": "top", "layer": "top",
"position": "top", "position": "top",
"margin-left": 8, "margin-left": 62,
"margin-top": 5, "margin-top": 10,
"margin-right": 8, "margin-right": 62,
"height": 28, "height": 28,
"spacing": 3, "spacing": 3,
"exclusive": true, "exclusive": true,
"gtk-layer-shell": true, "gtk-layer-shell": true,
"passthrough": false, "passthrough": false,
"fixed-center": true, "fixed-center": true,
"reload_style_on_change": true, //Релоад при изменении css
"output": "DP-1", //Вывод на нужный монитор
"include": [ "include": [
"/etc/ximperdistro/hyprland/waybar/modules.json", "/home/owl/.config/waybar/modules.json",
"/etc/ximperdistro/hyprland/waybar/extra-modules.json" "/home/owl/.config/waybar/extra-modules.json"
], ],
"modules-left": [ "modules-left": [
"image#menu", "image#menu",
"hyprland/workspaces", "hyprland/workspaces",
"tray", "hyprland/window",
"hyprland/submap",
], ],
"modules-center": [ "modules-center": [
"custom/media-mini", "group/center",
], ],
"modules-right": [ "modules-right": [
"custom/media-mini",
"idle_inhibitor", "idle_inhibitor",
"hyprland/language", "hyprland/language",
"group/volume", "group/volume",
"network",
"bluetooth", "bluetooth",
"battery", "custom/notification"
"backlight",
"group/notification",
] ]
} }
configs/hyprland/waybar/modules.json
View file @ 50ccb6c9
{ {
"image#menu": { "image#menu": {
"path": "/usr/share/pixmaps/ximperlinux.svg", "path": "/home/owl/.config/waybar/ximperlinux.svg",
"size": 20, "size": 20,
"on-click": "pkill wofi || wofi --show drun -x 8 -y 10 --height 35% --width 25%" "on-click": "pkill wofi || wofi --show drun -x 8 -y 10 --height 35% --width 25%"
}, },
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
"on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1", "on-scroll-down": "hyprctl dispatch workspace e-1",
"format-icons": { "format-icons": {
"default": "", "default": "",
"active": "",
} }
}, },
...@@ -215,4 +216,14 @@ ...@@ -215,4 +216,14 @@
"custom/notification", "custom/notification",
] ]
}, },
"group/center": {
"orientation": "horizontal",
"modules": [
"clock",
"tray",
]
},
} }
configs/hyprland/waybar/style-dark.css
View file @ 50ccb6c9
@import "/home/owl/.config/waybar/colors/adw-dark.css";
* { * {
min-height: 0; min-height: 0;
font-size: 12px; font-size: 16px;
font-family: FiraCode Nerd Font; font-family: Evolventa-Regular, FiraCode Nerd Font;
font-weight: 500; font-weight: 500;
} }
window#waybar { window#waybar {
background: none; background: @bg;
border-radius: 20px;
} }
#image, #image,
...@@ -27,15 +30,15 @@ window#waybar { ...@@ -27,15 +30,15 @@ window#waybar {
#cpu, #cpu,
#custom-media, #custom-media,
#custom-ddclight { #custom-ddclight {
background-color: @bg; background-color: @bg;
min-height: 0; min-height: 0;
border-radius: 12px; border-radius: 20px;
margin: 0px; margin: 5px;
padding: 0px 5px;
color: @text; color: @text;
border: none; border: none;
} }
#image{ #image{
padding: 0px 10px; padding: 0px 10px;
} }
...@@ -44,22 +47,36 @@ window#waybar { ...@@ -44,22 +47,36 @@ window#waybar {
} }
#workspaces { #workspaces {
padding: 0px 5px; padding: 0px 15px;
border-radius: 20px;
} }
#workspaces:hover { #workspaces:hover {
background-color: @selected_bg; background-color: @selected_bg;
} }
#workspaces button { #workspaces button {
padding: 0px; margin: 0px 0px;
color: @workspace_text; padding: 0px 0px;
background-image: url('/home/owl/.config/hypr/Ximper/workspace.svg');
background-position: center;
background-repeat: no-repeat;
background-size: 35% 25%;
} }
#workspaces button:hover { #workspaces button:hover {
color: @text; color: @text;
background-color: @bg; background-color: @bg;
} }
#workspaces button.active { #workspaces button.active {
color: @accent; color: @fg;
margin: 0px -2px;
padding: 0px 8px;
background-image: url('/home/owl/.config/hypr/Ximper/workspace active.svg');
background-position: center;
background-repeat: no-repeat;
background-size: 70% 40%;
border-radius: 20px;
animation-name: switch;
animation-duration: 0.5s;
} }
#workspaces button.urgent { #workspaces button.urgent {
color: @urgent; color: @urgent;
...@@ -85,14 +102,25 @@ window#waybar { ...@@ -85,14 +102,25 @@ window#waybar {
border: 1.5px solid @urgent; border: 1.5px solid @urgent;
} }
@keyframes switch {
from{
background-size: 90% 40%;
}
to{
background-size: 70% 40%;
}
}
#tray { #tray {
padding: 0px 10px; border-radius: 0px 12px 12px 0px;
padding: 0px 10px 0px 10px;
} }
#tray:hover { #tray:hover {
background-color: @selected_bg; background-color: @selected_bg;
} }
#tray menu { #tray menu {
background-color: alpha(@bg, 0.80); background-color: alpha(@bg, 1);
} }
#custom-media, #custom-media,
...@@ -126,11 +154,11 @@ window#waybar { ...@@ -126,11 +154,11 @@ window#waybar {
} }
#pulseaudio.volume{ #pulseaudio.volume{
border-radius: 12px 0px 0px 12px; border-radius: 20px 0px 0px 20px;
padding: 0px 7px 0px 10px; padding: 0px 7px 0px 10px;
} }
#pulseaudio.microphone{ #pulseaudio.microphone{
border-radius: 0px 12px 12px 0px; border-radius: 0px 20px 20px 0px;
padding: 0px 10px 0px 7px; padding: 0px 10px 0px 7px;
} }
#pulseaudio:hover { #pulseaudio:hover {
...@@ -172,24 +200,26 @@ window#waybar { ...@@ -172,24 +200,26 @@ window#waybar {
} }
#clock { #clock {
border-radius: 12px 0px 0px 12px; border-radius: 20px 0px 0px 20px;
padding: 0px 7px 0px 10px; padding: 0px 10px 0px 10px;
margin: 5px 0px;
} }
#clock:hover { #clock:hover {
background-color: @selected_bg; background-color: @selected_bg;
} }
#custom-notification { #custom-notification {
border-radius: 0px 12px 12px 0px; border-radius: 20px;
padding: 0px 10px 0px 7px; padding: 0px 10px;
margin: 5px 10px;
} }
#custom-notification:hover { #custom-notification:hover {
background-color: @selected_bg; background-color: @selected_bg;
} }
tooltip { tooltip {
border-radius: 12px; border-radius: 20px;
background: alpha(@bg, 0.80); background: alpha(@bg, 1);
color: @text color: @text
} }
tooltip label { tooltip label {
......
configs/hyprland/waybar/workspace active.svg 0 → 100644
View file @ 50ccb6c9
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="200"
height="100"
viewBox="0 0 52.91667 26.458336"
version="1.1"
id="svg1"
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
sodipodi:docname="workspace active.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#aaaaaa"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#282828"
inkscape:document-units="px"
inkscape:zoom="2.9790123"
inkscape:cx="-8.2242023"
inkscape:cy="73.682139"
inkscape:window-width="1896"
inkscape:window-height="1056"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" /><defs
id="defs1" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><rect
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:3.96754"
id="rect1"
width="52.916672"
height="26.458336"
x="-3.7646487e-07"
y="-1.8823243e-07"
ry="13.229168" /></g></svg>
configs/hyprland/waybar/workspace spec.svg 0 → 100644
View file @ 50ccb6c9
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="200"
height="100"
viewBox="0 0 52.91667 26.458336"
version="1.1"
id="svg1"
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
sodipodi:docname="workspace spec.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#aaaaaa"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#282828"
inkscape:document-units="px"
inkscape:zoom="0.74475308"
inkscape:cx="-42.295898"
inkscape:cy="59.751348"
inkscape:window-width="1896"
inkscape:window-height="1056"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" /><defs
id="defs1" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><rect
style="opacity:1;fill:#a7a8f6;fill-opacity:1;stroke-width:3.96754"
id="rect1"
width="52.916672"
height="26.458336"
x="-3.7646487e-07"
y="-1.8823243e-07"
ry="13.229168" /></g></svg>
configs/hyprland/waybar/workspace.svg 0 → 100644
View file @ 50ccb6c9
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100"
height="100"
viewBox="0 0 26.458334 26.458336"
version="1.1"
id="svg1"
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
sodipodi:docname="workspace.svg"
xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#aaaaaa"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#282828"
inkscape:document-units="px"
inkscape:zoom="8.4259192"
inkscape:cx="-0.17802212"
inkscape:cy="27.949473"
inkscape:window-width="1896"
inkscape:window-height="1056"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" /><defs
id="defs1" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><rect
style="opacity:1;fill:#e6e6e6;fill-opacity:1;stroke-width:2.80548"
id="rect1"
width="26.458336"
height="26.458336"
x="9.9999994e-08"
y="-6.4030981e-09"
ry="13.229168" /></g></svg>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment