diff --git a/README.md b/README.md index 84f9941..f4cac3e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ # dotfiles my hyprland dotfiles -![screenshot](https://git.pablusha.ru/admin/dotfiles/raw/commit/815d855a307cc1c52ec8308e5f2a6c4e4fc5dc1d/2025-05-24.11:48:23.png) \ No newline at end of file + +![screenshot](https://git.pablusha.ru/admin/dotfiles/raw/branch/main/screenshot.png) + +# ❗️ ВАЖНО + +**автоматической установки дотов нет (и я хз будет ли она, ибо мне лень), конфиги я писал для себя, а не для общего пользования, поэтому, пожалуйста, если у вас что-то не работает - ищите проблемму сами, не надо писать об этом мне (у меня-то все работает) :3** \ No newline at end of file diff --git a/fish/config.fish b/fish/config.fish index ede86c1..e09741c 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,5 +1,3 @@ -source /home/pablusha/.cache/wal/colors.fish - function fish_greeting echo "halo!" end diff --git a/fish/fish_variables b/fish/fish_variables index 00cbe87..9a109e1 100644 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -3,21 +3,21 @@ SETUVAR __fish_initialized:3800 SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:CFBDBB -SETUVAR fish_color_comment:9ca3a6 +SETUVAR fish_color_command:8D756A +SETUVAR fish_color_comment:9c8f88 SETUVAR fish_color_cwd:green SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:B6DAE5 +SETUVAR fish_color_end:D09978 SETUVAR fish_color_error:ff0000 -SETUVAR fish_color_escape:E1D7CD +SETUVAR fish_color_escape:7A7F83 SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:dfe9ee +SETUVAR fish_color_host:dfcdc3 SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:dfe9ee -SETUVAR fish_color_operator:E1D7CD -SETUVAR fish_color_param:D6A59D -SETUVAR fish_color_quote:FAEDD9 -SETUVAR fish_color_redirection:D6A59D +SETUVAR fish_color_normal:dfcdc3 +SETUVAR fish_color_operator:7A7F83 +SETUVAR fish_color_param:A06747 +SETUVAR fish_color_quote:B6998A +SETUVAR fish_color_redirection:A06747 SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red @@ -25,7 +25,7 @@ SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_key_bindings:fish_default_key_bindings SETUVAR fish_pager_color_completion:\x1d -SETUVAR fish_pager_color_description:FAEDD9\x1eyellow +SETUVAR fish_pager_color_description:B6998A\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr diff --git a/hypr/colors.conf b/hypr/colors.conf new file mode 100644 index 0000000..4a99954 --- /dev/null +++ b/hypr/colors.conf @@ -0,0 +1,151 @@ + +$image = Pictures/bg.png +$background = rgba(101417ff) + +$image = Pictures/bg.png +$error = rgba(ffb4abff) + +$image = Pictures/bg.png +$error_container = rgba(93000aff) + +$image = Pictures/bg.png +$inverse_on_surface = rgba(2d3135ff) + +$image = Pictures/bg.png +$inverse_primary = rgba(216487ff) + +$image = Pictures/bg.png +$inverse_surface = rgba(dfe3e7ff) + +$image = Pictures/bg.png +$on_background = rgba(dfe3e7ff) + +$image = Pictures/bg.png +$on_error = rgba(690005ff) + +$image = Pictures/bg.png +$on_error_container = rgba(ffdad6ff) + +$image = Pictures/bg.png +$on_primary = rgba(00344cff) + +$image = Pictures/bg.png +$on_primary_container = rgba(c7e7ffff) + +$image = Pictures/bg.png +$on_primary_fixed = rgba(001e2eff) + +$image = Pictures/bg.png +$on_primary_fixed_variant = rgba(004c6cff) + +$image = Pictures/bg.png +$on_secondary = rgba(21323eff) + +$image = Pictures/bg.png +$on_secondary_container = rgba(d2e5f5ff) + +$image = Pictures/bg.png +$on_secondary_fixed = rgba(0b1d29ff) + +$image = Pictures/bg.png +$on_secondary_fixed_variant = rgba(374955ff) + +$image = Pictures/bg.png +$on_surface = rgba(dfe3e7ff) + +$image = Pictures/bg.png +$on_surface_variant = rgba(c1c7ceff) + +$image = Pictures/bg.png +$on_tertiary = rgba(342b4bff) + +$image = Pictures/bg.png +$on_tertiary_container = rgba(e8ddffff) + +$image = Pictures/bg.png +$on_tertiary_fixed = rgba(1e1635ff) + +$image = Pictures/bg.png +$on_tertiary_fixed_variant = rgba(4a4263ff) + +$image = Pictures/bg.png +$outline = rgba(8b9198ff) + +$image = Pictures/bg.png +$outline_variant = rgba(41484dff) + +$image = Pictures/bg.png +$primary = rgba(92cef5ff) + +$image = Pictures/bg.png +$primary_container = rgba(004c6cff) + +$image = Pictures/bg.png +$primary_fixed = rgba(c7e7ffff) + +$image = Pictures/bg.png +$primary_fixed_dim = rgba(92cef5ff) + +$image = Pictures/bg.png +$scrim = rgba(000000ff) + +$image = Pictures/bg.png +$secondary = rgba(b6c9d8ff) + +$image = Pictures/bg.png +$secondary_container = rgba(374955ff) + +$image = Pictures/bg.png +$secondary_fixed = rgba(d2e5f5ff) + +$image = Pictures/bg.png +$secondary_fixed_dim = rgba(b6c9d8ff) + +$image = Pictures/bg.png +$shadow = rgba(000000ff) + +$image = Pictures/bg.png +$source_color = rgba(235e7eff) + +$image = Pictures/bg.png +$surface = rgba(101417ff) + +$image = Pictures/bg.png +$surface_bright = rgba(353a3dff) + +$image = Pictures/bg.png +$surface_container = rgba(1c2024ff) + +$image = Pictures/bg.png +$surface_container_high = rgba(262a2eff) + +$image = Pictures/bg.png +$surface_container_highest = rgba(313539ff) + +$image = Pictures/bg.png +$surface_container_low = rgba(181c20ff) + +$image = Pictures/bg.png +$surface_container_lowest = rgba(0a0f12ff) + +$image = Pictures/bg.png +$surface_dim = rgba(101417ff) + +$image = Pictures/bg.png +$surface_tint = rgba(92cef5ff) + +$image = Pictures/bg.png +$surface_variant = rgba(41484dff) + +$image = Pictures/bg.png +$tertiary = rgba(ccc1e9ff) + +$image = Pictures/bg.png +$tertiary_container = rgba(4a4263ff) + +$image = Pictures/bg.png +$tertiary_fixed = rgba(e8ddffff) + +$image = Pictures/bg.png +$tertiary_fixed_dim = rgba(ccc1e9ff) + diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 2aaf6b4..2ce31ed 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,4 +1,5 @@ -source = ~/.cache/wal/hyprland-colors.conf +source = colors.conf + # MONITORS monitor = DVI-D-1, 1920x1080, 0x0, 1 @@ -40,9 +41,6 @@ exec-once = waybar & hyprpaper & mako exec-once = hyprctl setcursor Bibata-Modern-Classic 22 exec-once = wal -R -exec = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark" -exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" - # DECO general { @@ -50,8 +48,8 @@ general { gaps_out = 8 border_size = 0 - col.active_border = $color1 $color2 45deg - col.inactive_border = $color1 $color2 45deg + col.active_border = $primary $secondary 45deg + col.inactive_border = $primary $secondary 45deg allow_tearing = false layout = dwindle @@ -166,5 +164,7 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow +bind = , mouse:275, workspace, e-1 +bind = , mouse:276, workspace, e+1 bind = $mainMod SHIFT, S, exec, ~/.config/hypr/screenshot.sh diff --git a/kitty/colors.conf b/kitty/colors.conf new file mode 100644 index 0000000..cddb6c7 --- /dev/null +++ b/kitty/colors.conf @@ -0,0 +1,40 @@ +cursor #dfe3e7 +cursor_text_color #c1c7ce + +foreground #dfe3e7 +background #101417 +selection_foreground #21323e +selection_background #b6c9d8 +url_color #92cef5 + +# black +color8 #262626 +color0 #4c4c4c + +# red +color1 #ac8a8c +color9 #c49ea0 + +# green +color2 #8aac8b +color10 #9ec49f + +# yellow +color3 #aca98a +color11 #c4c19e + +# blue +color4 #92cef5 +color12 #a39ec4 + +# magenta +color5 #ac8aac +color13 #c49ec4 + +# cyan +color6 #8aacab +color14 #9ec3c4 + +# white +color15 #e7e7e7 +color7 #f0f0f0 diff --git a/kitty/kitty.conf b/kitty/kitty.conf index e2b6948..ddb25cf 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,23 +1,4 @@ -foreground #dfe9ee -background #222227 -cursor #dfe9ee - -color0 #222227 -color8 #9ca3a6 -color1 #D6A59D -color9 #D6A59D -color2 #CFBDBB -color10 #CFBDBB -color3 #E9D3AE -color11 #E9D3AE -color4 #B6DAE5 -color12 #B6DAE5 -color5 #E1D7CD -color13 #E1D7CD -color6 #FAEDD9 -color14 #FAEDD9 -color7 #dfe9ee -color15 #dfe9ee +include colors.conf background_opacity 0.8 font_size 11.0 diff --git a/matugen/colors.css b/matugen/colors.css new file mode 100644 index 0000000..951e8f5 --- /dev/null +++ b/matugen/colors.css @@ -0,0 +1,3 @@ +<* for name, value in colors *> + @define-color {{name}} {{value.default.hex}}; +<* endfor *> diff --git a/matugen/config.toml b/matugen/config.toml new file mode 100644 index 0000000..b4dd568 --- /dev/null +++ b/matugen/config.toml @@ -0,0 +1,27 @@ +[config] + +[templates.hyprland] +input_path = "hyprland.conf" +output_path = "~/.config/hypr/colors.conf" +post_hook = "hyprctl reload" + +[templates.kitty] +input_path = 'kitty.conf' +output_path = '~/.config/kitty/colors.conf' + +[templates.waybar] +input_path = 'colors.css' +output_path = '~/.config/waybar/colors.css' +post_hook = 'pkill -SIGUSR2 waybar' + +[templates.gtk3] +input_path = 'colors.css' +output_path = '~/.config/gtk-3.0/colors.css' + +[templates.gtk4] +input_path = 'colors.css' +output_path = '~/.config/gtk-4.0/colors.css' + +[templates.wofi] +input_path = "colors.css" +output_path = "~/.config/wofi/colors.css" diff --git a/matugen/hyprland.conf b/matugen/hyprland.conf new file mode 100644 index 0000000..d7e6821 --- /dev/null +++ b/matugen/hyprland.conf @@ -0,0 +1,4 @@ +<* for name, value in colors *> +$image = {{image}} +${{name}} = rgba({{value.default.hex_stripped}}ff) +<* endfor *> diff --git a/matugen/kitty.conf b/matugen/kitty.conf new file mode 100644 index 0000000..d9ee664 --- /dev/null +++ b/matugen/kitty.conf @@ -0,0 +1,40 @@ +cursor {{colors.on_surface.default.hex}} +cursor_text_color {{colors.on_surface_variant.default.hex}} + +foreground {{colors.on_surface.default.hex}} +background {{colors.surface.default.hex}} +selection_foreground {{colors.on_secondary.default.hex}} +selection_background {{colors.secondary_fixed_dim.default.hex}} +url_color {{colors.primary.default.hex}} + +# black +color8 #262626 +color0 #4c4c4c + +# red +color1 #ac8a8c +color9 #c49ea0 + +# green +color2 #8aac8b +color10 #9ec49f + +# yellow +color3 #aca98a +color11 #c4c19e + +# blue +color4 {{colors.primary.default.hex}} +color12 #a39ec4 + +# magenta +color5 #ac8aac +color13 #c49ec4 + +# cyan +color6 #8aacab +color14 #9ec3c4 + +# white +color15 #e7e7e7 +color7 #f0f0f0 diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..d09b880 Binary files /dev/null and b/screenshot.png differ diff --git a/wal/templates/colors.fish b/wal/templates/colors.fish deleted file mode 100644 index 00592e2..0000000 --- a/wal/templates/colors.fish +++ /dev/null @@ -1,34 +0,0 @@ -# set fish_color_normal normal -set fish_color_normal {foreground.strip} -# set fish_color_command 005fd7 -set fish_color_command {color2.strip} -# set fish_color_param 00afff -set fish_color_param {color1.strip} -# set fish_color_redirection 00afff -set fish_color_redirection $fish_color_param -# set fish_color_comment 990000 -set fish_color_comment {color8.strip} -set fish_color_error ff0000 -# set fish_color_escape 00a6b2 -set fish_color_escape {color5.strip} -# set fish_color_operator 00a6b2 -set fish_color_operator $fish_color_escape -set fish_color_end {color4.strip} -set fish_color_quote {color6.strip} -set fish_color_autosuggestion 555 brblack -set fish_color_user brgreen -# set fish_color_host normal -set fish_color_host $fish_color_normal -set fish_color_valid_path --underline -set fish_color_cwd green -set fish_color_cwd_root red -set fish_color_match --background=brblue -set fish_color_search_match bryellow --background=brblack -set fish_color_selection white --bold --background=brblack -set fish_color_cancel -r -set fish_pager_color_prefix white --bold --underline -set fish_pager_color_completion -# set fish_pager_color_description B3A06D yellow -set fish_pager_color_description $fish_color_quote yellow -set fish_pager_color_progress brwhite --background=cyan -set fish_color_history_current --bold diff --git a/wal/templates/hyprland-colors.conf b/wal/templates/hyprland-colors.conf deleted file mode 100644 index bff6deb..0000000 --- a/wal/templates/hyprland-colors.conf +++ /dev/null @@ -1,20 +0,0 @@ -$foreground = rgb({foreground.strip}) -$background = rgb({background.strip}) -$wallpaper = /{wallpaper.strip} - -$color0 = rgb({color0.strip}) -$color1 = rgb({color1.strip}) -$color2 = rgb({color2.strip}) -$color3 = rgb({color3.strip}) -$color4 = rgb({color4.strip}) -$color5 = rgb({color5.strip}) -$color6 = rgb({color6.strip}) -$color7 = rgb({color7.strip}) -$color8 = rgb({color8.strip}) -$color9 = rgb({color9.strip}) -$color10 = rgb({color10.strip}) -$color11 = rgb({color11.strip}) -$color12 = rgb({color12.strip}) -$color13 = rgb({color13.strip}) -$color14 = rgb({color14.strip}) -$color15 = rgb({color15.strip}) diff --git a/waybar/colors.css b/waybar/colors.css new file mode 100644 index 0000000..e86885f --- /dev/null +++ b/waybar/colors.css @@ -0,0 +1,101 @@ + + @define-color background #101417; + + @define-color error #ffb4ab; + + @define-color error_container #93000a; + + @define-color inverse_on_surface #2d3135; + + @define-color inverse_primary #216487; + + @define-color inverse_surface #dfe3e7; + + @define-color on_background #dfe3e7; + + @define-color on_error #690005; + + @define-color on_error_container #ffdad6; + + @define-color on_primary #00344c; + + @define-color on_primary_container #c7e7ff; + + @define-color on_primary_fixed #001e2e; + + @define-color on_primary_fixed_variant #004c6c; + + @define-color on_secondary #21323e; + + @define-color on_secondary_container #d2e5f5; + + @define-color on_secondary_fixed #0b1d29; + + @define-color on_secondary_fixed_variant #374955; + + @define-color on_surface #dfe3e7; + + @define-color on_surface_variant #c1c7ce; + + @define-color on_tertiary #342b4b; + + @define-color on_tertiary_container #e8ddff; + + @define-color on_tertiary_fixed #1e1635; + + @define-color on_tertiary_fixed_variant #4a4263; + + @define-color outline #8b9198; + + @define-color outline_variant #41484d; + + @define-color primary #92cef5; + + @define-color primary_container #004c6c; + + @define-color primary_fixed #c7e7ff; + + @define-color primary_fixed_dim #92cef5; + + @define-color scrim #000000; + + @define-color secondary #b6c9d8; + + @define-color secondary_container #374955; + + @define-color secondary_fixed #d2e5f5; + + @define-color secondary_fixed_dim #b6c9d8; + + @define-color shadow #000000; + + @define-color source_color #235e7e; + + @define-color surface #101417; + + @define-color surface_bright #353a3d; + + @define-color surface_container #1c2024; + + @define-color surface_container_high #262a2e; + + @define-color surface_container_highest #313539; + + @define-color surface_container_low #181c20; + + @define-color surface_container_lowest #0a0f12; + + @define-color surface_dim #101417; + + @define-color surface_tint #92cef5; + + @define-color surface_variant #41484d; + + @define-color tertiary #ccc1e9; + + @define-color tertiary_container #4a4263; + + @define-color tertiary_fixed #e8ddff; + + @define-color tertiary_fixed_dim #ccc1e9; + diff --git a/waybar/style.css b/waybar/style.css index 252e2d3..8a63fc1 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,4 +1,4 @@ -@import url("../../.cache/wal/colors-waybar.css"); +@import "colors.css"; * { font-family: FontAwesome, MonaspiceAr Nerd Font Mono, monospace; @@ -38,7 +38,7 @@ window#waybar { } #workspaces button.active { - color: @color8; + color: @tertiary; } #workspaces button:hover { @@ -47,9 +47,9 @@ window#waybar { } #network { - color: @color9; + color: @primary; } #pulseaudio { - color: @color9; + color: @secondary; } diff --git a/wofi/colors.css b/wofi/colors.css new file mode 100644 index 0000000..e86885f --- /dev/null +++ b/wofi/colors.css @@ -0,0 +1,101 @@ + + @define-color background #101417; + + @define-color error #ffb4ab; + + @define-color error_container #93000a; + + @define-color inverse_on_surface #2d3135; + + @define-color inverse_primary #216487; + + @define-color inverse_surface #dfe3e7; + + @define-color on_background #dfe3e7; + + @define-color on_error #690005; + + @define-color on_error_container #ffdad6; + + @define-color on_primary #00344c; + + @define-color on_primary_container #c7e7ff; + + @define-color on_primary_fixed #001e2e; + + @define-color on_primary_fixed_variant #004c6c; + + @define-color on_secondary #21323e; + + @define-color on_secondary_container #d2e5f5; + + @define-color on_secondary_fixed #0b1d29; + + @define-color on_secondary_fixed_variant #374955; + + @define-color on_surface #dfe3e7; + + @define-color on_surface_variant #c1c7ce; + + @define-color on_tertiary #342b4b; + + @define-color on_tertiary_container #e8ddff; + + @define-color on_tertiary_fixed #1e1635; + + @define-color on_tertiary_fixed_variant #4a4263; + + @define-color outline #8b9198; + + @define-color outline_variant #41484d; + + @define-color primary #92cef5; + + @define-color primary_container #004c6c; + + @define-color primary_fixed #c7e7ff; + + @define-color primary_fixed_dim #92cef5; + + @define-color scrim #000000; + + @define-color secondary #b6c9d8; + + @define-color secondary_container #374955; + + @define-color secondary_fixed #d2e5f5; + + @define-color secondary_fixed_dim #b6c9d8; + + @define-color shadow #000000; + + @define-color source_color #235e7e; + + @define-color surface #101417; + + @define-color surface_bright #353a3d; + + @define-color surface_container #1c2024; + + @define-color surface_container_high #262a2e; + + @define-color surface_container_highest #313539; + + @define-color surface_container_low #181c20; + + @define-color surface_container_lowest #0a0f12; + + @define-color surface_dim #101417; + + @define-color surface_tint #92cef5; + + @define-color surface_variant #41484d; + + @define-color tertiary #ccc1e9; + + @define-color tertiary_container #4a4263; + + @define-color tertiary_fixed #e8ddff; + + @define-color tertiary_fixed_dim #ccc1e9; + diff --git a/wofi/style.css b/wofi/style.css index a233aa4..a2b8b89 100644 --- a/wofi/style.css +++ b/wofi/style.css @@ -1,4 +1,4 @@ -@import url(".cache/wal/colors-waybar.css"); +@import url("colors.css"); * { all:unset; @@ -10,7 +10,7 @@ window { all:unset; background: alpha(@background, 0.7); - border: 2px solid @color1; + border: 2px solid @primary; border-radius: 4px; } @@ -23,7 +23,8 @@ window { } #entry:selected { - background: @color1; + color: @on_primary; + background: @primary; border-radius: 4px; }