diff --git a/dot_config/fuzzel/fuzzel.ini b/dot_config/fuzzel/fuzzel.ini index f9de7da..9dcf46c 100644 --- a/dot_config/fuzzel/fuzzel.ini +++ b/dot_config/fuzzel/fuzzel.ini @@ -55,8 +55,8 @@ inner-pad=20 # enable-mouse=yes -include=~/.config/fuzzel/themes/owl.ini -# include=~/.config/fuzzel/themes/rose-pine.ini +include=~/.config/fuzzel/themes/apex-neon.ini +# include=~/.config/fuzzel/themes/owl.ini #[colors] # background=fdf6e3ff # text=657b83ff diff --git a/dot_config/fuzzel/themes/apex-neon.ini b/dot_config/fuzzel/themes/apex-neon.ini new file mode 100644 index 0000000..c4bb8c0 --- /dev/null +++ b/dot_config/fuzzel/themes/apex-neon.ini @@ -0,0 +1,12 @@ +[colors] +background=#050505ff +text=#edededff +prompt=#edededff +placeholder=#404040ff +input=#edededff +match=#ffb700ff +selection=#00eaffff +selection-text=#050505ff +selection-match=#ff0044ff +counter=#ffb700ff +border=#ff0044ff diff --git a/dot_config/qt6ct/qt6ct.conf b/dot_config/qt6ct/qt6ct.conf index 962e188..d14f236 100644 --- a/dot_config/qt6ct/qt6ct.conf +++ b/dot_config/qt6ct/qt6ct.conf @@ -1,7 +1,7 @@ [Appearance] color_scheme_path=/home/mpuchstein/.config/qt6ct/style-colors.conf custom_palette=true -icon_theme=rose-pine-icons +icon_theme=apex-neon-icons standard_dialogs=gtk3 style=kvantum diff --git a/dot_config/qt6ct/style-colors.conf b/dot_config/qt6ct/style-colors.conf index aecd3c3..ef77cb9 100644 --- a/dot_config/qt6ct/style-colors.conf +++ b/dot_config/qt6ct/style-colors.conf @@ -1,4 +1,4 @@ [ColorScheme] -active_colors=#ffe0def4, #ff26233a, #ff6e6a86, #ff6e6a86, #ff191724, #ff191724, #ffe0def4, #ffffffff, #ffe0def4, #ff191724, #ff1f1d2e, #ff000000, #ffebbcba, #ff191724, #ff9ccfd8, #ffc4a7e7, #ff191724, #ff000000, #ff000000, #ffe0def4, #80e0def4, #ff308cc6 -disabled_colors=#ff908caa, #ff26233a, #ff6e6a86, #ff6e6a86, #ff191724, #ff191724, #ff908caa, #ffffffff, #ff908caa, #ff191724, #ff1f1d2e, #ff000000, #ffebbcba, #66191724, #ff9ccfd8, #ffc4a7e7, #ff191724, #ff000000, #ff000000, #ffe0def4, #80e0def4, #ff919191 -inactive_colors=#ffe0def4, #ff26233a, #ff6e6a86, #ff6e6a86, #ff191724, #ff191724, #ffe0def4, #ffffffff, #ffe0def4, #ff191724, #ff1f1d2e, #ff000000, #ffebbcba, #ff191724, #ff9ccfd8, #ffc4a7e7, #ff191724, #ff000000, #ff000000, #ffe0def4, #80e0def4, #ff308cc6 +active_colors=#ffededed, #ff262626, #ff404040, #ff404040, #ff050505, #ff050505, #ffededed, #ffffffff, #ffededed, #ff050505, #ff141414, #ff000000, #ffff80bf, #ff050505, #ff00eaff, #ff9d00ff, #ff050505, #ff000000, #ff000000, #ffededed, #80ededed, #ff0088cc +disabled_colors=#ff404040, #ff262626, #ff404040, #ff404040, #ff050505, #ff050505, #ff404040, #ffffffff, #ff404040, #ff050505, #ff141414, #ff000000, #ffff80bf, #66050505, #ff00eaff, #ff9d00ff, #ff050505, #ff000000, #ff000000, #ffededed, #80ededed, #ff404040 +inactive_colors=#ffededed, #ff262626, #ff404040, #ff404040, #ff050505, #ff050505, #ffededed, #ffffffff, #ffededed, #ff050505, #ff141414, #ff000000, #ffff80bf, #ff050505, #ff00eaff, #ff9d00ff, #ff050505, #ff000000, #ff000000, #ffededed, #80ededed, #ff0088cc diff --git a/dot_config/spicetify/config-xpui.ini.tmpl b/dot_config/spicetify/config-xpui.ini similarity index 76% rename from dot_config/spicetify/config-xpui.ini.tmpl rename to dot_config/spicetify/config-xpui.ini index b210bde..f2eae9a 100644 --- a/dot_config/spicetify/config-xpui.ini.tmpl +++ b/dot_config/spicetify/config-xpui.ini @@ -1,11 +1,11 @@ [Setting] spotify_path = $HOME/.local/share/spotify-launcher/install/usr/share/spotify/ -current_theme = Ziro -color_scheme = rose-pine +current_theme = apex-neon +color_scheme = apex-neon inject_theme_js = 1 replace_colors = 1 always_enable_devtools = 0 -prefs_path = {{ .chezmoi.homeDir }}/.config/spotify/prefs +prefs_path = /home/mpuchstein/.config/spotify/prefs inject_css = 1 overwrite_assets = 0 spotify_launch_flags = @@ -28,5 +28,5 @@ extensions = ; DO NOT CHANGE! [Backup] -version = 1.2.63.394.g126b0d89 -with = 2.41.0 +version = 1.2.79.425.g1d0fcf61 +with = 2.42.7 diff --git a/dot_config/spicetify/private_CustomApps/.keep b/dot_config/spicetify/private_CustomApps/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/spicetify/private_Extensions/.keep b/dot_config/spicetify/private_Extensions/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/spicetify/private_Themes/.keep b/dot_config/spicetify/private_Themes/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/spicetify/private_Themes/apex-neon/color.ini b/dot_config/spicetify/private_Themes/apex-neon/color.ini new file mode 100644 index 0000000..00a1dc9 --- /dev/null +++ b/dot_config/spicetify/private_Themes/apex-neon/color.ini @@ -0,0 +1,16 @@ +[apex-neon] +text = ededed +subtext = 404040 +main = 050505 +sidebar = 050505 +player = 050505 +card = 141414 +shadow = 000000 +selected-row = 00eaff +button = 00eaff +button-active = ff0044 +button-disabled = 404040 +tab-active = 262626 +notification = 00eaff +notification-error = ff0044 +misc = ffb700 diff --git a/dot_config/spicetify/private_Themes/apex-neon/user.css b/dot_config/spicetify/private_Themes/apex-neon/user.css new file mode 100644 index 0000000..aaa216a --- /dev/null +++ b/dot_config/spicetify/private_Themes/apex-neon/user.css @@ -0,0 +1 @@ +/* Apex Neon - Spicetify overrides */ diff --git a/dot_config/swaync/style.css b/dot_config/swaync/style.css index 82bab78..dd6aebd 100644 --- a/dot_config/swaync/style.css +++ b/dot_config/swaync/style.css @@ -1,26 +1,22 @@ -@define-color rp-base #191724; -@define-color rp-surface #1f1d2e; -@define-color rp-overlay #26233a; -@define-color rp-hl-low #21202e; -@define-color rp-hl-med #403d52; -@define-color rp-hl-high #524f67; +@define-color rp-base #050505; +@define-color rp-surface #141414; +@define-color rp-overlay #262626; +@define-color rp-hl-low #141414; +@define-color rp-hl-med #262626; +@define-color rp-hl-high #404040; -@define-color rp-muted #6e6a86; -@define-color rp-subtle #908caa; -@define-color rp-text #e0def4; +@define-color rp-muted #404040; +@define-color rp-subtle #404040; +@define-color rp-text #ededed; -@define-color rp-love #eb6f92; -@define-color rp-gold #f6c177; -@define-color rp-rose #ebbcba; -@define-color rp-pine #31748f; -@define-color rp-foam #9ccfd8; -@define-color rp-iris #c4a7e7; +@define-color rp-love #ff0044; +@define-color rp-gold #ffb700; +@define-color rp-rose #ff80bf; +@define-color rp-pine #00ff99; +@define-color rp-foam #00eaff; +@define-color rp-iris #9d00ff; -/* To use Rosé Pine Moon, replace: -rp-base: #232136; rp-surface: #2a273f; rp-overlay: #393552; -rp-hl-low: #2a283e; rp-hl-med: #44415a; rp-hl-high: #56526e; -rp-text: #e0def4; rp-subtle: #908caa; accents same. -For Dawn (light), you’ll likely also want to invert contrasts. */ +/* Apex Neon palette */ @define-color cc-bg @rp-surface; @define-color noti-border-color @rp-hl-high; @@ -30,13 +26,13 @@ For Dawn (light), you’ll likely also want to invert contrasts. */ @define-color noti-bg-focus alpha(@rp-hl-high, 0.6); @define-color text-color @rp-text; @define-color text-color-disabled @rp-subtle; -@define-color bg-selected @rp-iris; +@define-color bg-selected @rp-foam; - { - font-family: JetBrainsMono NFP; - font-weight: bold; - font-size: 14px; - } +* { + font-family: JetBrainsMono NFP; + font-weight: bold; + font-size: 14px; +} .control-center .notification-row:focus, .control-center .notification-row:hover { diff --git a/dot_config/tmux/tmux.conf b/dot_config/tmux/tmux.conf index af8074e..1873dfe 100644 --- a/dot_config/tmux/tmux.conf +++ b/dot_config/tmux/tmux.conf @@ -55,50 +55,29 @@ setw -g mode-keys vi bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel "kitty +kitten clipboard" -# For TPM, instead use `run ~/.tmux/plugins/tmux/catppuccin.tmux` -run ~/.config/tmux/plugins/tmux/catppuccin.tmux - -# Catppuccin -set -g @catppuccin_flavor "mocha" -set -g @catppuccin_date_time_text '%d.%m.%y %H:%M' +# Apex Neon theme +set -g status-style "fg=#ededed,bg=#050505" +set -g status-justify "absolute-centre" +set -g pane-border-style "fg=#262626" +set -g pane-active-border-style "fg=#ff0044" +set -g message-style "fg=#050505,bg=#00eaff" +set -g mode-style "fg=#050505,bg=#00eaff" +set -g display-panes-active-colour "#00eaff" +set -g display-panes-colour "#404040" +set -g clock-mode-colour "#00eaff" set -g @tmux-weather-location "Nospelt" -# Windows -set -g @catppuccin_window_tabs_enabled "on" -set -g @catppuccin_window_number_position 'right' -set -g @catppuccin_window_status 'yes' -set -g @catppuccin_window_default_text '#W' -set -g @catppuccin_window_current_fill 'number' -set -g @catppuccin_window_current_text '#W' -set -g @catppuccin_window_current_color '#{E:@thm_surface_2}' -set -g @catppuccin_status_module_text_bg '#{E:@thm_mantle}' -set -g @catppuccin_window_status_style "slanted" +set -g window-status-style "fg=#404040,bg=#050505" +set -g window-status-current-style "fg=#050505,bg=#00eaff,bold" +set -g window-status-format " #I:#W " +set -g window-status-current-format "#[fg=#050505,bg=#00eaff,bold] #I:#W #[fg=#00eaff,bg=#050505]" -# Status -set -g status-justify "absolute-centre" -set -g @catppuccin_status_background "none" - -# Left status set -g status-left-length 100 -set -g status-left "" -set -ga status-left "#{E:@catppuccin_status_user}" -set -ga status-left "#{E:@catppuccin_status_session}" -set -ga status-left "#{E:@catppuccin_status_application}" -set -g @catppuccin_host "on" -set -g @catppuccin_user "on" +set -g status-left "#[fg=#050505,bg=#ff0044,bold] #S #[fg=#ff0044,bg=#050505] " -# Right status set -g status-right-length 100 -set -g status-right "" -set -agF status-right "#{E:@catppuccin_status_cpu}" -set -ag status-right "#{E:@catppuccin_status_uptime}" -if 'test -r /sys/class/power_supply/BAT*' { - set -agF status-right '#{E:@catppuccin_status_battery}' -} -set -agF status-right "#{E:@catppuccin_status_weather}" -set -ag status-right "#{E:@catppuccin_status_date_time}" -set -ag status-right "#{E:@catppuccin_status_host}" +set -g status-right "#[fg=#9d00ff]#H #[fg=#00eaff]%Y-%m-%d %H:%M " #### TMUX PLUGIN MANAGER + PLUGINS #### @@ -109,7 +88,6 @@ set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'tmux-plugins/tmux-yank' # style -set -g @plugin 'catppuccin/tmux' set -g @plugin 'joshmedeski/tmux-nerd-font-window-name' set -g @plugin 'tmux-plugins/tmux-cpu' set -g @plugin 'tmux-plugins/tmux-battery' diff --git a/dot_config/waybar/config.tmpl b/dot_config/waybar/config.tmpl index f392be5..af7562d 100644 --- a/dot_config/waybar/config.tmpl +++ b/dot_config/waybar/config.tmpl @@ -149,10 +149,10 @@ "weeks-pos": "right", "on-scroll": 1, "format": { - "months": "{}", - "weekdays": "{}", + "months": "{}", + "weekdays": "{}", "days": "{}", - "today": "{}" + "today": "{}" } }, "actions": { diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css index d22fce5..0c10d72 100644 --- a/dot_config/waybar/style.css +++ b/dot_config/waybar/style.css @@ -1,21 +1,21 @@ -@define-color base #191724; -@define-color surface #1f1d2e; -@define-color overlay #26233a; -@define-color text #e0def4; -@define-color muted #6e6a86; -@define-color subtle #908caa; -@define-color love #eb6f92; -@define-color gold #f6c177; -@define-color rose #ea9a97; -@define-color pine #31748f; -@define-color foam #9ccfd8; -@define-color iris #c4a7e7; -@define-color hl_low #21202e; -@define-color hl_med #403d52; -@define-color hl_high #524f67; -@define-color bar_alpha rgba(25, 23, 36, 0.65); -@define-color surface_alpha rgba(31, 29, 46, 0.82); -@define-color overlay_alpha rgba(38, 35, 58, 0.9); +@define-color base #050505; +@define-color surface #141414; +@define-color overlay #262626; +@define-color text #ededed; +@define-color muted #404040; +@define-color subtle #404040; +@define-color love #ff0044; +@define-color gold #ffb700; +@define-color rose #ff80bf; +@define-color pine #00ff99; +@define-color foam #00eaff; +@define-color iris #9d00ff; +@define-color hl_low #141414; +@define-color hl_med #262626; +@define-color hl_high #404040; +@define-color bar_alpha rgba(5, 5, 5, 0.65); +@define-color surface_alpha rgba(20, 20, 20, 0.82); +@define-color overlay_alpha rgba(38, 38, 38, 0.9); /* Bar */ window#waybar {