From f64ebf3407f0591882a53a3a9b5ecca5437669ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Czy=C5=BC?= Date: Mon, 26 Feb 2024 10:43:30 +0100 Subject: [PATCH] theming and platform switch --- desktop/.dwm | 2 +- desktop/.xinitrc | 4 +- gtk/.config/gtk-3.0/settings.ini | 6 +- hypr/.config/hypr/hyprpaper.conf | 8 +- kitty/.config/kitty/kitty.conf | 5 +- kitty/.config/kitty/melange_dark.conf | 27 + kitty/.config/kitty/theme.conf | 49 ++ .../gruvbox-kvantum/gruvbox-kvantum.kvconfig | 501 ++++++++++++++++++ .../gruvbox-kvantum/gruvbox-kvantum.svg | 1 + kvantum/.config/Kvantum/kvantum.kvconfig | 2 +- neovide/.config/neovide/config.toml | 2 +- nvim/.config/nvim/lua/custom/chadrc.lua | 4 +- picom/.config/picom.conf | 18 +- rofi/.config/rofi/config.rasi | 21 +- zsh/.zprofile | 2 +- 15 files changed, 609 insertions(+), 43 deletions(-) create mode 100644 kitty/.config/kitty/melange_dark.conf create mode 100644 kitty/.config/kitty/theme.conf create mode 100644 kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig create mode 100644 kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg diff --git a/desktop/.dwm b/desktop/.dwm index ad4182a..42512de 160000 --- a/desktop/.dwm +++ b/desktop/.dwm @@ -1 +1 @@ -Subproject commit ad4182a15b8dea201f35eb1a374d6578a10b64a5 +Subproject commit 42512ded09a09dce718bd85e611782202c675ab8 diff --git a/desktop/.xinitrc b/desktop/.xinitrc index 964c48e..c7b5c1e 100755 --- a/desktop/.xinitrc +++ b/desktop/.xinitrc @@ -108,7 +108,7 @@ easyeffects --gapplication-service & # emacs --daemon & # Theme changing service -xsettingsd & +# xsettingsd & # Theming service # dusk & @@ -120,7 +120,7 @@ xsettingsd & #hash dockd && dockd --daemon & # status bar -bash $HOME/.cache/wal/bar.sh & disown +bash $HOME/.dwm/bar.sh & disown # dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini index 57186a3..615f2f0 100644 --- a/gtk/.config/gtk-3.0/settings.ini +++ b/gtk/.config/gtk-3.0/settings.ini @@ -1,8 +1,8 @@ [Settings] -gtk-theme-name=Catppuccin-Macchiato-Standard-Blue-Dark -gtk-icon-theme-name=Papirus-Dark +gtk-theme-name=gruvbox-dark-gtk +gtk-icon-theme-name=oomox-gruvbox-dark gtk-font-name=Cantarell 11 -gtk-cursor-theme-name=Catppuccin-Macchiato-Blue-Cursors +gtk-cursor-theme-name=Simp1e-Gruvbox-Dark gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/hypr/.config/hypr/hyprpaper.conf b/hypr/.config/hypr/hyprpaper.conf index 6290c86..de9afa5 100644 --- a/hypr/.config/hypr/hyprpaper.conf +++ b/hypr/.config/hypr/hyprpaper.conf @@ -1,7 +1,7 @@ -preload = /home/mike/Wallpapers/tokio.jpg +preload = /home/mike/Wallpapers/pexels-ehsan-haque-19270612.jpg -wallpaper = DP-1, contain:/home/mike/Wallpapers/tokio.jpg -wallpaper = DP-2, contain:/home/mike/Wallpapers/tokio.jpg -wallpaper = HDMI-A-1, contain:/home/mike/Wallpapers/tokio.jpg +wallpaper = DP-1, /home/mike/Wallpapers/pexels-ehsan-haque-19270612.jpg +wallpaper = DP-2, /home/mike/Wallpapers/pexels-ehsan-haque-19270612.jpg +wallpaper = HDMI-A-1, /home/mike/Wallpapers/pexels-ehsan-haque-19270612.jpg splash = false diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index bd635db..1c7430c 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -1,5 +1,6 @@ # include ${HOME}/.cache/wal/kitty.conf -include macchiato.conf +# include macchiato.conf +include theme.conf font_family FiraCode Nerd Font bold_font auto @@ -21,5 +22,5 @@ enable_audio_bell no # BEGIN_KITTY_THEME # Catppuccin-Macchiato -include current-theme.conf +# include current-theme.conf # END_KITTY_THEME diff --git a/kitty/.config/kitty/melange_dark.conf b/kitty/.config/kitty/melange_dark.conf new file mode 100644 index 0000000..4241e12 --- /dev/null +++ b/kitty/.config/kitty/melange_dark.conf @@ -0,0 +1,27 @@ +background #292522 +foreground #ECE1D7 +cursor none +url_color #7F91B2 +selection_background #403A36 +selection_foreground #ECE1D7 +tab_bar_background #34302C +active_tab_background #34302C +active_tab_foreground #E49B5D +inactive_tab_background #34302C +inactive_tab_foreground #ECE1D7 +color0 #34302C +color1 #BD8183 +color2 #78997A +color3 #E49B5D +color4 #7F91B2 +color5 #B380B0 +color6 #7B9695 +color7 #C1A78E +color8 #867462 +color9 #D47766 +color10 #85B695 +color11 #EBC06D +color12 #A3A9CE +color13 #CF9BC2 +color14 #89B3B6 +color15 #ECE1D7 diff --git a/kitty/.config/kitty/theme.conf b/kitty/.config/kitty/theme.conf new file mode 100644 index 0000000..369da8d --- /dev/null +++ b/kitty/.config/kitty/theme.conf @@ -0,0 +1,49 @@ +# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox +# This work is licensed under the terms of the MIT license. +# For a copy, see https://opensource.org/licenses/MIT. + +background #282828 +foreground #ebdbb2 + +cursor #928374 + +selection_foreground #928374 +selection_background #3c3836 + +color0 #282828 +color8 #928374 + +# red +color1 #cc241d +# light red +color9 #fb4934 + +# green +color2 #98971a +# light green +color10 #b8bb26 + +# yellow +color3 #d79921 +# light yellow +color11 #fabd2d + +# blue +color4 #458588 +# light blue +color12 #83a598 + +# magenta +color5 #b16286 +# light magenta +color13 #d3869b + +# cyan +color6 #689d6a +# lighy cyan +color14 #8ec07c + +# light gray +color7 #a89984 +# dark gray +color15 #928374 diff --git a/kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig b/kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig new file mode 100644 index 0000000..edc74a1 --- /dev/null +++ b/kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig @@ -0,0 +1,501 @@ +[%General] +author=Sourav Gope +comment=Medium Dark Gruvbox kvantum theme +x11drag=menubar_and_primary_toolbar +alt_mnemonic=true +left_tabs=true +attach_active_tab=true +mirror_doc_tabs=true +group_toolbar_buttons=false +toolbar_item_spacing=1 +toolbar_interior_spacing=3 +spread_progressbar=true +composite=true +menu_shadow_depth=5 +menu_separator_height=6 +tooltip_shadow_depth=6 +splitter_width=4 +scroll_width=6 +scroll_arrows=false +scroll_min_extent=60 +slider_width=2 +slider_handle_width=18 +slider_handle_length=18 +center_toolbar_handle=true +check_size=14 +textless_progressbar=false +progressbar_thickness=2 +menubar_mouse_tracking=true +toolbutton_style=1 +double_click=false +translucent_windows=true +blurring=true +popup_blurring=true +vertical_spin_indicators=false +spin_button_width=32 +fill_rubberband=false +merge_menubar_with_toolbar=true +small_icon_size=16 +large_icon_size=32 +button_icon_size=16 +toolbar_icon_size=22 +combo_as_lineedit=true +animate_states=false +button_contents_shift=false +combo_menu=true +hide_combo_checkboxes=true +combo_focus_rect=true +groupbox_top_label=true +inline_spin_indicators=false +joined_inactive_tabs=false +layout_spacing=6 +layout_margin=9 +scrollbar_in_view=true +transient_scrollbar=true +transient_groove=false +submenu_overlap=0 +tooltip_delay=-1 +tree_branch_line=true +dark_titlebar=true +opaque=QMPlay2,kaffeine,kmplayer,subtitlecomposer,kdenlive,vlc,avidemux,avidemux2_qt4,avidemux3_qt4,avidemux3_qt5,kamoso,QtCreator,VirtualBox,trojita,dragon,digikam +reduce_window_opacity=18 +scrollable_menu=false +submenu_delay=250 +no_inactiveness=false +no_window_pattern=false +reduce_menu_opacity=0 +respect_DE=true +contrast=1.00 +dialog_button_layout=0 +intensity=1.00 +saturation=1.00 +click_behavior=0 +drag_from_buttons=false +menu_blur_radius=0 +shadowless_popup=false +tooltip_blur_radius=0 + +[GeneralColors] +window.color=#3c3836 +base.color=#3c3836 +alt.base.color=#282828 +button.color=#3c4454 +light.color=#282828 +mid.light.color=#282828 +dark.color=#282828 +mid.color=#282828 +highlight.color=#b8bb26 +inactive.highlight.color=#282828 +text.color=#d8dee9 +window.text.color=#d8dee9 +button.text.color=#d8dee9 +disabled.text.color=#d8dee978 +tooltip.text.color=#d8dee9 +highlight.text.color=#d8dee9 +link.color=#646464 +link.visited.color=#7f8c8d +progress.indicator.text.color=#d8dee9 + +[Hacks] +transparent_ktitle_label=true +transparent_dolphin_view=true +transparent_pcmanfm_sidepane=true +blur_translucent=true +transparent_menutitle=true +respect_darkness=true +kcapacitybar_as_progressbar=true +force_size_grip=true +iconless_pushbutton=false +iconless_menu=false +disabled_icon_opacity=70 +lxqtmainmenu_iconsize=22 +normal_default_pushbutton=true +single_top_toolbar=true +tint_on_mouseover=0 +transparent_pcmanfm_view=true +middle_click_scroll=false +no_selection_tint=false +opaque_colors=false +scroll_jump_workaround=false +blur_only_active_window=false +centered_forms=false +kinetic_scrolling=false +noninteger_translucency=false +style_vertical_toolbars=false + +[PanelButtonCommand] +frame=true +frame.element=button +frame.top=3 +frame.bottom=3 +frame.left=3 +frame.right=3 +interior=true +interior.element=button +indicator.size=8 +text.normal.color=#d8dee9 +text.focus.color=#d8dee9 +text.press.color=#d8dee9 +text.toggle.color=#d8dee9 +text.shadow=0 +text.margin=1 +text.iconspacing=4 +indicator.element=arrow +text.margin.top=2 +text.margin.bottom=2 +text.margin.left=2 +text.margin.right=2 +min_width=+0.3font +min_height=+0.3font +frame.expansion=6 + +[PanelButtonTool] +inherits=PanelButtonCommand + +[Dock] +inherits=PanelButtonCommand +interior.element=dock +frame.element=dock +frame.top=1 +frame.bottom=1 +frame.left=1 +frame.right=1 +text.normal.color=#d8dee9 + +[DockTitle] +inherits=PanelButtonCommand +frame=false +interior=false +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.bold=false + +[IndicatorSpinBox] +inherits=PanelButtonCommand +frame=true +interior=true +frame.left=1 +indicator.element=spin +indicator.size=10 +text.normal.color=#d8dee9 + +[RadioButton] +inherits=PanelButtonCommand +frame=false +interior.element=radio +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca + +[CheckBox] +inherits=PanelButtonCommand +frame=false +interior.element=checkbox +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca + +[Focus] +inherits=PanelButtonCommand +frame=true +frame.element=focus +frame.top=1 +frame.bottom=1 +frame.left=1 +frame.right=1 +frame.patternsize=20 + +[GenericFrame] +inherits=PanelButtonCommand +frame=true +interior=false +frame.element=common +interior.element=common +frame.top=1 +frame.bottom=1 +frame.left=1 +frame.right=1 + +[LineEdit] +inherits=PanelButtonCommand +frame.element=lineedit +interior.element=lineedit +text.margin.left=0 +text.margin.right=0 + +[DropDownButton] +inherits=PanelButtonCommand +indicator.element=arrow-down + +[IndicatorArrow] +indicator.element=arrow +indicator.size=8 + +[ToolboxTab] +inherits=PanelButtonCommand +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.press.color=#d2d2d4 + +[Tab] +inherits=PanelButtonCommand +interior.element=tab +text.margin.left=8 +text.margin.right=8 +text.margin.top=2 +text.margin.bottom=2 +frame.element=tab +indicator.element=tab +frame.top=4 +frame.bottom=4 +frame.left=4 +frame.right=4 +text.normal.color=#d8dee9 +text.focus.color=#d8dee9 +text.toggle.color=#d8dee9 +frame.expansion=0 + +[TabFrame] +inherits=PanelButtonCommand +frame.element=tabframe +interior.element=tabframe +frame.top=4 +frame.bottom=4 +frame.left=4 +frame.right=4 + +[TreeExpander] +inherits=PanelButtonCommand +indicator.size=12 +indicator.element=tree + +[HeaderSection] +inherits=PanelButtonCommand +interior.element=header +frame.element=header +frame.top=1 +frame.bottom=1 +frame.left=1 +frame.right=1 +text.bold=false +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.press.color=#d2d2d4 +text.toggle.color=#d2d2d4 +frame.expansion=0 + +[SizeGrip] +indicator.element=resize-grip + +[Toolbar] +inherits=PanelButtonCommand +indicator.element=toolbar +indicator.size=5 +text.margin=0 +frame=true +interior.element=menubar +frame.element=menubar +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +frame.left=0 +frame.right=0 +frame.top=0 +frame.bottom=1 +frame.expansion=0 + +[Slider] +inherits=PanelButtonCommand +frame.element=slider +interior.element=slider +frame.top=3 +frame.bottom=3 +frame.left=3 +frame.right=3 + +[SliderCursor] +inherits=PanelButtonCommand +frame=false +interior.element=slidercursor + +[Progressbar] +inherits=PanelButtonCommand +frame.element=progress +interior.element=progress +text.margin=0 +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.press.color=#d2d2d4 +text.toggle.color=#d8dee9 +text.bold=false +frame.expansion=8 + +[ProgressbarContents] +inherits=PanelButtonCommand +frame=true +frame.element=progress-pattern +interior.element=progress-pattern + +[ItemView] +inherits=PanelButtonCommand +text.margin=0 +frame.element=itemview +interior.element=itemview +frame.top=2 +frame.bottom=2 +frame.left=2 +frame.right=2 +text.margin.top=2 +text.margin.bottom=2 +text.margin.left=4 +text.margin.right=4 +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.press.color=#d8dee9 +text.toggle.color=#d8dee9 +min_width=+0.3font +min_height=+0.3font +frame.expansion=0 + +[Splitter] +indicator.size=48 + +[Scrollbar] +inherits=PanelButtonCommand +indicator.element=arrow +indicator.size=8 + +[ScrollbarSlider] +inherits=PanelButtonCommand +interior.element=scrollbarslider +interior=true +frame=false +frame.expansion=48 + +[ScrollbarGroove] +inherits=PanelButtonCommand +interior.element=scrollbargroove +interior=true +frame=false +frame.expansion=48 + +[MenuItem] +inherits=PanelButtonCommand +frame=true +frame.element=menuitem +interior.element=menuitem +indicator.element=menuitem +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.margin.top=1 +text.margin.bottom=1 +text.margin.left=4 +text.margin.right=4 +frame.top=3 +frame.bottom=3 +frame.left=3 +frame.right=3 +text.bold=false +min_width=+0.3font +min_height=+0.3font +frame.expansion=0 + +[MenuBar] +inherits=PanelButtonCommand +frame.element=menubar +interior.element=menubar +text.normal.color=#d8dee9 +frame.bottom=0 +frame.expansion=0 + +[MenuBarItem] +inherits=PanelButtonCommand +interior=true +interior.element=menubaritem +frame.element=menubaritem +frame.top=2 +frame.bottom=2 +frame.left=2 +frame.right=2 +text.margin.left=4 +text.margin.right=4 +text.margin.top=0 +text.margin.bottom=0 +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +frame.expansion=0 + +[TitleBar] +inherits=PanelButtonCommand +frame=false +text.margin.top=2 +text.margin.bottom=2 +text.margin.left=2 +text.margin.right=2 +interior.element=titlebar +indicator.size=16 +indicator.element=mdi +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.bold=true +text.italic=false +frame.expansion=0 + +[ComboBox] +inherits=PanelButtonCommand +interior.element=combo +frame.element=combo +text.press.color=#d2d2d4 +indicator.element=carrow + +[Menu] +inherits=PanelButtonCommand +frame.top=1 +frame.bottom=1 +frame.left=1 +frame.right=1 +frame.element=menu +interior.element=menu +text.normal.color=#d8dee9 +text.shadow=false +frame.expansion=0 + +[GroupBox] +inherits=GenericFrame +frame=false +text.shadow=0 +text.margin=0 +text.normal.color=#d8dee9 +text.focus.color=#c8c8ca +text.bold=true +frame.expansion=0 + +[TabBarFrame] +inherits=GenericFrame +frame=true +frame.element=tabBarFrame +interior=false +frame.top=4 +frame.bottom=4 +frame.left=4 +frame.right=4 + +[ToolTip] +inherits=GenericFrame +frame.top=3 +frame.bottom=3 +frame.left=3 +frame.right=3 +interior=true +text.shadow=0 +text.margin=0 +interior.element=tooltip +frame.element=tooltip +frame.expansion=0 + +[StatusBar] +inherits=GenericFrame +frame=false +interior=false +interior=false + +[Window] +interior=true +interior.element=window diff --git a/kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg b/kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg new file mode 100644 index 0000000..993f72a --- /dev/null +++ b/kvantum/.config/Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/kvantum/.config/Kvantum/kvantum.kvconfig b/kvantum/.config/Kvantum/kvantum.kvconfig index 73895eb..c0ca7bc 100644 --- a/kvantum/.config/Kvantum/kvantum.kvconfig +++ b/kvantum/.config/Kvantum/kvantum.kvconfig @@ -1,2 +1,2 @@ [General] -theme=Catppuccin-Macchiato-Blue +theme=gruvbox-kvantum diff --git a/neovide/.config/neovide/config.toml b/neovide/.config/neovide/config.toml index ed130ef..7db6ab7 100644 --- a/neovide/.config/neovide/config.toml +++ b/neovide/.config/neovide/config.toml @@ -2,4 +2,4 @@ vsync = true [font] normal = ["FiraCode Nerd Font"] -size = 15 +size = 14 diff --git a/nvim/.config/nvim/lua/custom/chadrc.lua b/nvim/.config/nvim/lua/custom/chadrc.lua index e3df5e4..0e4b375 100644 --- a/nvim/.config/nvim/lua/custom/chadrc.lua +++ b/nvim/.config/nvim/lua/custom/chadrc.lua @@ -5,8 +5,8 @@ local M = {} local highlights = require "custom.highlights" M.ui = { - theme = "catppuccin", - theme_toggle = { "catppuccin", "everforest_light" }, + theme = "gruvbox", + theme_toggle = { "gruvbox", "everforest_light" }, hl_override = highlights.override, hl_add = highlights.add, diff --git a/picom/.config/picom.conf b/picom/.config/picom.conf index 7e4a1e5..52e981d 100644 --- a/picom/.config/picom.conf +++ b/picom/.config/picom.conf @@ -164,18 +164,16 @@ blur-kern = "3x3box"; # xprop | grep -i 'class' opacity-rule = [ - "85:class_g = 'Code'", - "85:class_g = 'code-oss'", - "88:class_g = 'discord'", - "85:class_g = 'Emacs'", - "95:class_g = 'Signal'", - "85:class_g = 'TelegramDesktop'", + "90:class_g = 'neovide'", + "90:class_g = 'code-oss'", + "90:class_g = 'discord'", + "90:class_g = 'Emacs'", + "90:class_g = 'TelegramDesktop'", "90:class_g = 'Spotify'", - "90:class_g = 'notion-app'", "90:class_g = 'easyeffects'", - "85:class_g = 'kitty'", - "85:class_g = 'Nemo'" - # "85:class_g = 'firefox'", + "90:class_g = 'kitty'", + "90:class_g = 'Nemo'", + "97:class_g = 'firefox'", ] # Exclude conditions for background blur. diff --git a/rofi/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi index fb503d3..6e2557c 100644 --- a/rofi/.config/rofi/config.rasi +++ b/rofi/.config/rofi/config.rasi @@ -1,18 +1,7 @@ -configuration{ - modi: "run,drun,window"; - icon-theme: "Oranchelo"; +configuration { + width: 10; + padding: 10; + terminal: "kitty"; show-icons: true; - terminal: "alacritty"; - drun-display-format: "{icon} {name}"; - location: 0; - disable-history: false; - hide-scrollbar: true; - display-drun: "  Apps "; - display-run: "  Run "; - display-window: " 﩯 Window"; - display-Network: " 󰤨 Network"; - sidebar-mode: true; } - -@theme "catppuccin-mocha" - +@theme "/usr/share/rofi/themes/gruvbox-dark.rasi" diff --git a/zsh/.zprofile b/zsh/.zprofile index 29b1301..fbf3680 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -1,3 +1,3 @@ if [ "$(tty)" = "/dev/tty1" ];then - exec Hyprland + exec startx fi