From 92e48b9495bfe9fa6b126f24d4e0c13f11625dc1 Mon Sep 17 00:00:00 2001
From: Matthias Puchstein <matthias@puchstein.bayern>
Date: Tue, 13 May 2025 20:24:51 +0200
Subject: [PATCH] fresh colors

---
 .config/gtk-3.0/bookmarks                     |   1 +
 .config/hypr/conf.d/catpuccinmocha.conf       |  97 +++++++++++++++
 .config/hypr/conf.d/keybinds.conf             |  10 +-
 .../conf.d/{theme.conf => tokyonight.conf}    |  10 +-
 .config/hypr/hyprland.conf                    |  12 +-
 .config/kitty/current-theme.conf              | 112 +++++++++++-------
 .config/kitty/kitty.conf                      |   2 +-
 .config/kitty/kitty.conf.bak                  |   9 +-
 8 files changed, 197 insertions(+), 56 deletions(-)
 create mode 100644 .config/hypr/conf.d/catpuccinmocha.conf
 rename .config/hypr/conf.d/{theme.conf => tokyonight.conf} (71%)

diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
index 1b24a27..a03963c 100644
--- a/.config/gtk-3.0/bookmarks
+++ b/.config/gtk-3.0/bookmarks
@@ -4,3 +4,4 @@ file:///home/mpuchstein/Pictures
 file:///home/mpuchstein/Music
 file:///home/mpuchstein/Nextcloud
 file:///home/mpuchstein/Downloads
+file:///home/mpuchstein/Documents/uni/ss25/AD/Vorlesung Vorlesung
diff --git a/.config/hypr/conf.d/catpuccinmocha.conf b/.config/hypr/conf.d/catpuccinmocha.conf
new file mode 100644
index 0000000..552f816
--- /dev/null
+++ b/.config/hypr/conf.d/catpuccinmocha.conf
@@ -0,0 +1,97 @@
+#######################################
+### CATTPUCCIN MOCHA HYPRLAND THEME ###
+#######################################
+
+$rosewater = rgb(f5e0dc)
+$rosewaterAlpha = f5e0dc
+
+$flamingo = rgb(f2cdcd)
+$flamingoAlpha = f2cdcd
+
+$pink = rgb(f5c2e7)
+$pinkAlpha = f5c2e7
+
+$mauve = rgb(cba6f7)
+$mauveAlpha = cba6f7
+
+$red = rgb(f38ba8)
+$redAlpha = f38ba8
+
+$maroon = rgb(eba0ac)
+$maroonAlpha = eba0ac
+
+$peach = rgb(fab387)
+$peachAlpha = fab387
+
+$yellow = rgb(f9e2af)
+$yellowAlpha = f9e2af
+
+$green = rgb(a6e3a1)
+$greenAlpha = a6e3a1
+
+$teal = rgb(94e2d5)
+$tealAlpha = 94e2d5
+
+$sky = rgb(89dceb)
+$skyAlpha = 89dceb
+
+$sapphire = rgb(74c7ec)
+$sapphireAlpha = 74c7ec
+
+$blue = rgb(89b4fa)
+$blueAlpha = 89b4fa
+
+$lavender = rgb(b4befe)
+$lavenderAlpha = b4befe
+
+$text = rgb(cdd6f4)
+$textAlpha = cdd6f4
+
+$subtext1 = rgb(bac2de)
+$subtext1Alpha = bac2de
+
+$subtext0 = rgb(a6adc8)
+$subtext0Alpha = a6adc8
+
+$overlay2 = rgb(9399b2)
+$overlay2Alpha = 9399b2
+
+$overlay1 = rgb(7f849c)
+$overlay1Alpha = 7f849c
+
+$overlay0 = rgb(6c7086)
+$overlay0Alpha = 6c7086
+
+$surface2 = rgb(585b70)
+$surface2Alpha = 585b70
+
+$surface1 = rgb(45475a)
+$surface1Alpha = 45475a
+
+$surface0 = rgb(313244)
+$surface0Alpha = 313244
+
+$base = rgb(1e1e2e)
+$baseAlpha = 1e1e2e
+
+$mantle = rgb(181825)
+$mantleAlpha = 181825
+
+$crust = rgb(11111b)
+$crustAlpha = 11111b
+
+$splash_text = rgba($textAlphaee)
+$dec_shadow = rgba($surface0Alpha88)
+$border_active = rgba($pinkAlphaff) rgba($mauveAlphaff) 45deg
+$border_inactive = rgba($redAlphabb) rgba($mauveAlphabb) 45deg
+$border_nogroup_active = rgba($tealAlphaff) rgba($yellowAlphaff) 45deg
+$border_nogroup_inactive = rgba($tealAlphaaa) rgba($yellowAlphaff) 45deg
+$border_group_active = rgba($sapphireAlphaff) rgba($lavenderAlphaff) 45deg
+$border_group_inactive = rgba($blueAlphadd) rgba($peachAlphadd) 45deg
+$border_grouplocked_active = rgba($maroonAlphaff) rgba(f7767eff) 45deg
+$border_grouplocked_inactive = rgba(ff007caa) rgba(f7767eff) 45deg
+$groupbar_text = rgba($baseAlphaff) 
+$groupbar_active = rgba($sapphireAlphaff) rgba($lavenderAlphaaa)
+$groupbar_inactive = rgba($blueAlphaee) rgba($lavenderAlphaaa)
+$groupbar_grouplocked_active = rgba($tealAlphaff) rgba($greenAlphaff)
+$groupbar_grouplocked_inactive = rgba($tealAlphaaa) rgba($greenAlphaaa)
diff --git a/.config/hypr/conf.d/keybinds.conf b/.config/hypr/conf.d/keybinds.conf
index 0fa416f..4edc8dc 100644
--- a/.config/hypr/conf.d/keybinds.conf
+++ b/.config/hypr/conf.d/keybinds.conf
@@ -5,6 +5,7 @@
 # Set programs that you use
 $terminal = uwsm app -T
 $terminal_backup = uwsm app -- kitty
+$term_tmux = uwsm app -- kitty tmux a
 $filemanager = uwsm app -- nautilus
 $launcher = uwsm app -- walker
 $clipboard = uwsm app -- nwg-clipman
@@ -37,7 +38,8 @@ bind = $mainMod Shift ALT_L, E, exec, $editor0
 bind = $mainMod, X, exec, $launcher
 bind = $mainMod, C, exec, $clipman
 bind = $mainMod, Return, exec, $terminal_backup
-bind = $mainMod SHIFT, Return, exec, $terminal
+bind = $mainMod SHIFT, Return, exec, $term_tmux
+bind = $mainMod CTRL, Return, exec, $terminal
 bind = $mainMod, Escape, exec, $taskman
 bind = $mainMod, R, exec, $pwdmgr
 
@@ -158,5 +160,9 @@ bindl = , XF86AudioPlay, exec, swayosd-client --playerctl play-pause
 bindl = , XF86AudioPrev, exec, swayosd-client --playerctl previous
 
 bind = , Print, exec, grimblast --notify copy output
+bind = SHIFT, Print, exec, grimblast --notify edit output
 bind = $mainMod, Print, exec, grimblast --notify edit area
-bind = SHIFT, Print, exec, uwsm app -- kitty --app-id=scrrec wf-recorder -f ~/Videos/scrrec.mkv -g "$(slurp)"
+bind = ALT_L, Print, exec, grimblast --notify copy screen
+bind = ALT_L SHIFT, Print, exec, grimblast --notify edit screen
+
+bind = SHIFT, Print, exec, uwsm app -- kitty --app-id=scrrec wf-recorder -f ~/Videos/scrrec.mkv -y -g "$(slurp)"
diff --git a/.config/hypr/conf.d/theme.conf b/.config/hypr/conf.d/tokyonight.conf
similarity index 71%
rename from .config/hypr/conf.d/theme.conf
rename to .config/hypr/conf.d/tokyonight.conf
index fd27171..f496284 100644
--- a/.config/hypr/conf.d/theme.conf
+++ b/.config/hypr/conf.d/tokyonight.conf
@@ -11,8 +11,8 @@ $border_group_active = rgba(ff9e64ff) rgba(ff0e64ff) 45deg
 $border_group_inactive = rgba(ff9e64aa) rgba(ff0e64aa) 45deg
 $border_grouplocked_active = rgba(ff007cff) rgba(f7767eff) 45deg
 $border_grouplocked_inactive = rgba(ff007caa) rgba(f7767eff) 45deg
-$groupbar_text = rgba(1f2335ff)
-$groupbar_active = rgba(ff9e64ff)
-$groupbar_inactive = rgba(ff9e64aa)
-$groupbar_grouplocked_active = rgba(ff007cff) 
-$groupbar_grouplocked_inactive = rgba(ff007caa)
+$groupbar_text = rgba(1f2335ff) 
+$groupbar_active = rgba(ff9e64ee) rgba(ff9e6499)
+$groupbar_inactive = rgba(ff9e64bb) rgba(ff9e6499)
+$groupbar_grouplocked_active = rgba(ff007cee) rgba(ff007c99)
+$groupbar_grouplocked_inactive = rgba(ff007cbb) rgba(ff007c99)
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index d6cac21..e2a96f4 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -240,19 +240,19 @@ group {
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 
 # Ignore maximize requests from apps. You'll probably like this.
-windowrulev2 = suppressevent maximize, class:.*
+windowrule = suppressevent maximize, class:.*
 
 # Fix some dragging issues with XWayland
-windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
 ## ========== Communication ==========
 # Mumble & Discord & TeamSpeak
-windowrulev2 = workspace 5, class:^(info\.mumble\.Mumble|discord|TeamSpeak|vesktop)$
-# Signal & nheko
-windowrulev2 = workspace 4, class:^(signal|Element)$
+windowrulev2 = workspace 2, class:^(info\.mumble\.Mumble|discord|TeamSpeak|vesktop)$
+# Signal & Element
+windowrule = workspace 1, class:^(signal|Element)$
 
 ## ========== Multimedia ==========
-windowrulev2 = workspace 10, class:Spotify
+windowrule = workspace 10, class:Spotify
 
 ### ========== Development ==========
 #windowrulev2 = float, class:jetbrains-webstorm, title:Welcome to WebStorm
diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf
index f2d9728..2533db7 100644
--- a/.config/kitty/current-theme.conf
+++ b/.config/kitty/current-theme.conf
@@ -1,50 +1,80 @@
 # vim:ft=kitty
 
-## name: Tokyo Night
-## license: MIT
-## author: Folke Lemaitre
-## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
+## name:     Catppuccin-Mocha
+## author:   Pocco81 (https://github.com/Pocco81)
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
 
 
-background #1a1b26
-foreground #c0caf5
-selection_background #283457
-selection_foreground #c0caf5
-url_color #73daca
-cursor #c0caf5
-cursor_text_color #1a1b26
 
-# Tabs
-active_tab_background #7aa2f7
-active_tab_foreground #16161e
-inactive_tab_background #292e42
-inactive_tab_foreground #545c7e
-#tab_bar_background #15161e
+# The basic colors
+foreground              #CDD6F4
+background              #1E1E2E
+selection_foreground    #1E1E2E
+selection_background    #F5E0DC
 
-# Windows
-active_border_color #7aa2f7
-inactive_border_color #292e42
+# Cursor colors
+cursor                  #F5E0DC
+cursor_text_color       #1E1E2E
 
-# normal
-color0 #15161e
-color1 #f7768e
-color2 #9ece6a
-color3 #e0af68
-color4 #7aa2f7
-color5 #bb9af7
-color6 #7dcfff
-color7 #a9b1d6
+# URL underline color when hovering with mouse
+url_color               #F5E0DC
 
-# bright
-color8 #414868
-color9 #f7768e
-color10 #9ece6a
-color11 #e0af68
-color12 #7aa2f7
-color13 #bb9af7
-color14 #7dcfff
-color15 #c0caf5
+# Kitty window border colors
+active_border_color     #B4BEFE
+inactive_border_color   #6C7086
+bell_border_color       #F9E2AF
 
-# extended colors
-color16 #ff9e64
-color17 #db4b4b
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111B
+active_tab_background   #CBA6F7
+inactive_tab_foreground #CDD6F4
+inactive_tab_background #181825
+tab_bar_background      #11111B
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1E1E2E
+mark1_background #B4BEFE
+mark2_foreground #1E1E2E
+mark2_background #CBA6F7
+mark3_foreground #1E1E2E
+mark3_background #74C7EC
+
+# The 16 terminal colors
+
+# black
+color0 #45475A
+color8 #585B70
+
+# red
+color1 #F38BA8
+color9 #F38BA8
+
+# green
+color2  #A6E3A1
+color10 #A6E3A1
+
+# yellow
+color3  #F9E2AF
+color11 #F9E2AF
+
+# blue
+color4  #89B4FA
+color12 #89B4FA
+
+# magenta
+color5  #F5C2E7
+color13 #F5C2E7
+
+# cyan
+color6  #94E2D5
+color14 #94E2D5
+
+# white
+color7  #BAC2DE
+color15 #A6ADC8
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index d52a6a0..7233530 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -2707,6 +2707,6 @@ bold_italic_font auto
 
 
 # BEGIN_KITTY_THEME
-# Tokyo Night
+# Catppuccin-Mocha
 include current-theme.conf
 # END_KITTY_THEME
diff --git a/.config/kitty/kitty.conf.bak b/.config/kitty/kitty.conf.bak
index 081309d..d52a6a0 100644
--- a/.config/kitty/kitty.conf.bak
+++ b/.config/kitty/kitty.conf.bak
@@ -88,6 +88,7 @@ font_size 9.0
 #: ligatures, use the font_features option.
 
 # font_features
+font_features = emoji
 
 #: E.g. font_features none
 
@@ -1251,7 +1252,7 @@ font_size 9.0
 
 #: The foreground and background colors.
 
-background_opacity 0.7
+background_opacity 0.9
 
 #: The opacity of the background. A number between zero and one, where
 #: one is opaque and zero is fully transparent. This will only work if
@@ -2703,3 +2704,9 @@ bold_font        auto
 italic_font      auto
 bold_italic_font auto
 # END_KITTY_FONTS
+
+
+# BEGIN_KITTY_THEME
+# Tokyo Night
+include current-theme.conf
+# END_KITTY_THEME