From 3acc5bc70d967550dc16f61baffedec602aef6b8 Mon Sep 17 00:00:00 2001 From: Mathias Schneider Date: Sat, 11 Apr 2026 08:18:40 +0200 Subject: [PATCH 1/2] nvim surround: sensible keymaps --- term/.config/nvim/lua/plugins/surround.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/term/.config/nvim/lua/plugins/surround.lua b/term/.config/nvim/lua/plugins/surround.lua index 08ac0f2..8c5b167 100644 --- a/term/.config/nvim/lua/plugins/surround.lua +++ b/term/.config/nvim/lua/plugins/surround.lua @@ -3,6 +3,13 @@ return { version = "*", event = "VeryLazy", config = function() - require("nvim-surround").setup() + require("nvim-surround").setup({ + keymaps = { + add = "S", -- Add surrounding + delete = "SD", -- Delete surrounding + change = "SC", -- Change surrounding + change_line = "SCL", -- Change surrounding on current line + }, + }) end, } From aae65576fb8839b524ccbea54fe12cec63d7526d Mon Sep 17 00:00:00 2001 From: Mathias Schneider Date: Sat, 11 Apr 2026 09:46:27 +0200 Subject: [PATCH 2/2] some theming --- hypr/.config/hypr/hyprland.conf | 17 +- hypr/.config/hypr/themes/download.sh | 6 + hypr/.config/hypr/themes/mocha.conf | 78 +++++ hypr/.config/kitty/kitty.conf | 3 + hypr/.config/kitty/themes/download.sh | 6 + hypr/.config/kitty/themes/mocha.conf | 84 +++++ .../.config/waybar/style_backup2026-02-21.css | 327 ------------------ 7 files changed, 190 insertions(+), 331 deletions(-) create mode 100755 hypr/.config/hypr/themes/download.sh create mode 100644 hypr/.config/hypr/themes/mocha.conf create mode 100755 hypr/.config/kitty/themes/download.sh create mode 100644 hypr/.config/kitty/themes/mocha.conf delete mode 100755 hypr/.config/waybar/style_backup2026-02-21.css diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index ce51a08..eedecab 100755 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -114,6 +114,15 @@ env = QT_QPA_PLATFORMTHEME,kde # permission = /usr/(bin|local/bin)/hyprpm, plugin, allow +##################### +### COLOR SCHEMES ### +##################### + +source=themes/mocha.conf +$color_active_border = rgba($sapphireAlphaee) +$color_inactive_border = rgba($surface1Alphaee) +$color_decoration_shadow = rgba($sapphireAlphaee) + ##################### ### LOOK AND FEEL ### ##################### @@ -125,11 +134,11 @@ general { gaps_in = 3 gaps_out = 4 - border_size = 2 + border_size = 3 # https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = $color_active_border + col.inactive_border = $color_inactive_border # Set to true enable resizing windows by clicking and dragging on borders and gaps resize_on_border = true @@ -153,7 +162,7 @@ decoration { enabled = true range = 10 render_power = 3 - color = rgba(1a1a1aee) + color = $color_decoration_shadow } # https://wiki.hypr.land/Configuring/Variables/#blur diff --git a/hypr/.config/hypr/themes/download.sh b/hypr/.config/hypr/themes/download.sh new file mode 100755 index 0000000..4ff149d --- /dev/null +++ b/hypr/.config/hypr/themes/download.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +out_dir="$HOME/dotfiles/themes/.config/catppuccin/mocha.conf" +url="https://raw.githubusercontent.com/catppuccin/hyprland/main/themes/mocha.conf" + +curl -o "$out_dir" "$url" diff --git a/hypr/.config/hypr/themes/mocha.conf b/hypr/.config/hypr/themes/mocha.conf new file mode 100644 index 0000000..8ccb56a --- /dev/null +++ b/hypr/.config/hypr/themes/mocha.conf @@ -0,0 +1,78 @@ + +$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 diff --git a/hypr/.config/kitty/kitty.conf b/hypr/.config/kitty/kitty.conf index 09af8c8..3b41307 100644 --- a/hypr/.config/kitty/kitty.conf +++ b/hypr/.config/kitty/kitty.conf @@ -3,6 +3,9 @@ map ctrl+shift+c copy_to_clipboard map ctrl+shift+v paste_from_clipboard copy_on_select yes +# Coloer theme +include themes/mocha.conf + # Font font_family JetBrainsMono NF bold_font auto diff --git a/hypr/.config/kitty/themes/download.sh b/hypr/.config/kitty/themes/download.sh new file mode 100755 index 0000000..6257636 --- /dev/null +++ b/hypr/.config/kitty/themes/download.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +out_dir="$HOME/dotfiles/themes/.config/themes/kitty/catppuccin/mocha.conf" +url="https://raw.githubusercontent.com/catppuccin/kitty/main/themes/mocha.conf" + +curl -o "$out_dir" "$url" diff --git a/hypr/.config/kitty/themes/mocha.conf b/hypr/.config/kitty/themes/mocha.conf new file mode 100644 index 0000000..6eb38be --- /dev/null +++ b/hypr/.config/kitty/themes/mocha.conf @@ -0,0 +1,84 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + + + +# The basic colors +foreground #cdd6f4 +background #1e1e2e +selection_foreground #1e1e2e +selection_background #f5e0dc + +# Cursor colors +cursor #f5e0dc +cursor_text_color #1e1e2e + +# Scrollbar colors +scrollbar_handle_color #9399b2 +scrollbar_track_color #45475a + +# URL color when hovering with mouse +url_color #f5e0dc + +# Kitty window border colors +active_border_color #b4befe +inactive_border_color #6c7086 +bell_border_color #f9e2af + +# 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/hypr/.config/waybar/style_backup2026-02-21.css b/hypr/.config/waybar/style_backup2026-02-21.css deleted file mode 100755 index a7b7df2..0000000 --- a/hypr/.config/waybar/style_backup2026-02-21.css +++ /dev/null @@ -1,327 +0,0 @@ -* { - /* `otf-font-awesome` is required to be installed for icons */ - font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; -} - -window#waybar { - background-color: rgba(43, 48, 59, 0.5); - border-bottom: 3px solid rgba(100, 114, 125, 0.5); - color: #ffffff; - transition-property: background-color; - transition-duration: .5s; -} - -window#waybar.hidden { - opacity: 0.2; -} - -/* -window#waybar.empty { - background-color: transparent; -} -window#waybar.solo { - background-color: #FFFFFF; -} -*/ - -window#waybar.termite { - background-color: #3F3F3F; -} - -window#waybar.chromium { - background-color: #000000; - border: none; -} - -button { - /* Use box-shadow instead of border so the text isn't offset */ - box-shadow: inset 0 -3px transparent; - /* Avoid rounded borders under each button name */ - border: none; - border-radius: 0; -} - -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -button:hover { - background: inherit; - box-shadow: inset 0 -3px #ffffff; -} - -/* you can set a style on hover for any module like this */ -#pulseaudio:hover { - background-color: #a37800; -} - -#workspaces button { - padding: 0 5px; - background-color: transparent; - color: #ffffff; -} - -#workspaces button:hover { - background: rgba(0, 0, 0, 0.2); -} - -#workspaces button.focused, #workspaces button.active { - background-color: #64727D; - box-shadow: inset 0 -3px #ffffff; -} - -#workspaces button.urgent { - background-color: #eb4d4b; -} - -#mode { - background-color: #64727D; - box-shadow: inset 0 -3px #ffffff; -} - -#clock, -#battery, -#cpu, -#memory, -#disk, -#temperature, -#backlight, -#network, -#pulseaudio, -#wireplumber, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#scratchpad, -#power-profiles-daemon, -#mpd { - padding: 0 10px; - color: #ffffff; -} - -#window, -#workspaces { - margin: 0 4px; -} - -/* If workspaces is the leftmost module, omit left margin */ -.modules-left > widget:first-child > #workspaces { - margin-left: 0; -} - -/* If workspaces is the rightmost module, omit right margin */ -.modules-right > widget:last-child > #workspaces { - margin-right: 0; -} - -#clock { - background-color: #64727D; -} - -#battery { - background-color: #ffffff; - color: #000000; -} - -#battery.charging, #battery.plugged { - color: #ffffff; - background-color: #26A65B; -} - -@keyframes blink { - to { - background-color: #ffffff; - color: #000000; - } -} - -/* Using steps() instead of linear as a timing function to limit cpu usage */ -#battery.critical:not(.charging) { - background-color: #f53c3c; - color: #ffffff; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: steps(12); - animation-iteration-count: infinite; - animation-direction: alternate; -} - -#power-profiles-daemon { - padding-right: 15px; -} - -#power-profiles-daemon.performance { - background-color: #f53c3c; - color: #C3D4D9; -} - -#power-profiles-daemon.balanced { - background-color: #2980b9; - color: #C3D4D9; -} - -#power-profiles-daemon.power-saver { - background-color: #2ecc71; - color: #C3D4D9; -} - -label:focus { - background-color: #000000; -} - -#cpu { - background-color: #2ecc71; - color: #C3D4D9; -} - -#memory { - background-color: #C3D4D9; -} - -#disk { - background-color: #C3D4D9; -} - -#backlight { - background-color: #90b1b1; -} - -#network { - background-color: #C3D4D9; -} - -#network.disconnected { - background-color: #f53c3c; -} - -#pulseaudio { - background-color: #f1c40f; - color: #C3D4D9; -} - -#pulseaudio.muted { - background-color: #90b1b1; - color: #C3D4D9; -} - -#wireplumber { - background-color: #fff0f5; - color: #000000; -} - -#wireplumber.muted { - background-color: #f53c3c; -} - -#custom-media { - background-color: #66cc99; - color: #C3D4D9; - min-width: 100px; -} - -#custom-media.custom-spotify { - background-color: #66cc99; -} - -#custom-media.custom-vlc { - background-color: #ffa000; -} - -#temperature { - background-color: #f0932b; -} - -#temperature.critical { - background-color: #eb4d4b; -} - -#tray { - background-color: #2980b9; -} - -#tray > .passive { - -gtk-icon-effect: dim; -} - -#tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#mpd { - background-color: #66cc99; - color: #2a5c45; -} - -#mpd.disconnected { - background-color: #f53c3c; -} - -#mpd.stopped { - background-color: #90b1b1; -} - -#mpd.paused { - background-color: #51a37a; -} - -#language { - background: #00b093; - color: #740864; - padding: 0 5px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state { - background: #97e1ad; - color: #000000; - padding: 0 0px; - margin: 0 5px; - min-width: 16px; -} - -#keyboard-state > label { - padding: 0 5px; -} - -#keyboard-state > label.locked { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad { - background: rgba(0, 0, 0, 0.2); -} - -#scratchpad.empty { - background-color: transparent; -} - -#privacy { - padding: 0; -} - -#privacy-item { - padding: 0 5px; - color: white; -} - -#privacy-item.screenshare { - background-color: #cf5700; -} - -#privacy-item.audio-in { - background-color: #1ca000; -} - -#privacy-item.audio-out { - background-color: #0069d4; -}