diff --git a/.config/fish/auto-Hypr.fish b/config/fish/auto-Hypr.fish similarity index 100% rename from .config/fish/auto-Hypr.fish rename to config/fish/auto-Hypr.fish diff --git a/.config/fish/config.fish b/config/fish/config.fish similarity index 100% rename from .config/fish/config.fish rename to config/fish/config.fish diff --git a/.config/fish/fish_variables b/config/fish/fish_variables similarity index 100% rename from .config/fish/fish_variables rename to config/fish/fish_variables diff --git a/.config/fuzzel/fuzzel.ini b/config/fuzzel/fuzzel.ini similarity index 100% rename from .config/fuzzel/fuzzel.ini rename to config/fuzzel/fuzzel.ini diff --git a/.config/fuzzel/mocha/blue.ini b/config/fuzzel/mocha/blue.ini similarity index 100% rename from .config/fuzzel/mocha/blue.ini rename to config/fuzzel/mocha/blue.ini diff --git a/.config/fuzzel/mocha/flamingo.ini b/config/fuzzel/mocha/flamingo.ini similarity index 100% rename from .config/fuzzel/mocha/flamingo.ini rename to config/fuzzel/mocha/flamingo.ini diff --git a/.config/fuzzel/mocha/green.ini b/config/fuzzel/mocha/green.ini similarity index 100% rename from .config/fuzzel/mocha/green.ini rename to config/fuzzel/mocha/green.ini diff --git a/.config/fuzzel/mocha/lavender.ini b/config/fuzzel/mocha/lavender.ini similarity index 100% rename from .config/fuzzel/mocha/lavender.ini rename to config/fuzzel/mocha/lavender.ini diff --git a/.config/fuzzel/mocha/maroon.ini b/config/fuzzel/mocha/maroon.ini similarity index 100% rename from .config/fuzzel/mocha/maroon.ini rename to config/fuzzel/mocha/maroon.ini diff --git a/.config/fuzzel/mocha/mauve.ini b/config/fuzzel/mocha/mauve.ini similarity index 100% rename from .config/fuzzel/mocha/mauve.ini rename to config/fuzzel/mocha/mauve.ini diff --git a/.config/fuzzel/mocha/peach.ini b/config/fuzzel/mocha/peach.ini similarity index 100% rename from .config/fuzzel/mocha/peach.ini rename to config/fuzzel/mocha/peach.ini diff --git a/.config/fuzzel/mocha/pink.ini b/config/fuzzel/mocha/pink.ini similarity index 100% rename from .config/fuzzel/mocha/pink.ini rename to config/fuzzel/mocha/pink.ini diff --git a/.config/fuzzel/mocha/red.ini b/config/fuzzel/mocha/red.ini similarity index 100% rename from .config/fuzzel/mocha/red.ini rename to config/fuzzel/mocha/red.ini diff --git a/.config/fuzzel/mocha/rosewater.ini b/config/fuzzel/mocha/rosewater.ini similarity index 100% rename from .config/fuzzel/mocha/rosewater.ini rename to config/fuzzel/mocha/rosewater.ini diff --git a/.config/fuzzel/mocha/sapphire.ini b/config/fuzzel/mocha/sapphire.ini similarity index 100% rename from .config/fuzzel/mocha/sapphire.ini rename to config/fuzzel/mocha/sapphire.ini diff --git a/.config/fuzzel/mocha/sky.ini b/config/fuzzel/mocha/sky.ini similarity index 100% rename from .config/fuzzel/mocha/sky.ini rename to config/fuzzel/mocha/sky.ini diff --git a/.config/fuzzel/mocha/teal.ini b/config/fuzzel/mocha/teal.ini similarity index 100% rename from .config/fuzzel/mocha/teal.ini rename to config/fuzzel/mocha/teal.ini diff --git a/.config/fuzzel/mocha/yellow.ini b/config/fuzzel/mocha/yellow.ini similarity index 100% rename from .config/fuzzel/mocha/yellow.ini rename to config/fuzzel/mocha/yellow.ini diff --git a/.config/hypr/hyprland.conf b/config/hypr/hyprland.conf similarity index 99% rename from .config/hypr/hyprland.conf rename to config/hypr/hyprland.conf index 96fdbd73..f6a1b5cd 100644 --- a/.config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -61,6 +61,8 @@ exec-once = wl-paste --watch cliphist store env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 +env = __NV_DISABLE_EXPLICIT_SYNC,1 + exec = gsettings set org.gnome.desktop.interface gtk-theme "YOUR_DARK_GTK3_THEME" # for GTK3 apps exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" # for GTK4 apps diff --git a/.config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf similarity index 100% rename from .config/hypr/hyprlock.conf rename to config/hypr/hyprlock.conf diff --git a/.config/hypr/themes/mocha.conf b/config/hypr/themes/mocha.conf similarity index 100% rename from .config/hypr/themes/mocha.conf rename to config/hypr/themes/mocha.conf diff --git a/.config/kitty/kitty-themes/.all-contributorsrc b/config/kitty/kitty-themes/.all-contributorsrc similarity index 100% rename from .config/kitty/kitty-themes/.all-contributorsrc rename to config/kitty/kitty-themes/.all-contributorsrc diff --git a/.config/kitty/kitty-themes/CONTRIBUTING.md b/config/kitty/kitty-themes/CONTRIBUTING.md similarity index 100% rename from .config/kitty/kitty-themes/CONTRIBUTING.md rename to config/kitty/kitty-themes/CONTRIBUTING.md diff --git a/.config/kitty/kitty-themes/LICENSE.md b/config/kitty/kitty-themes/LICENSE.md similarity index 100% rename from .config/kitty/kitty-themes/LICENSE.md rename to config/kitty/kitty-themes/LICENSE.md diff --git a/.config/kitty/kitty-themes/README.md b/config/kitty/kitty-themes/README.md similarity index 100% rename from .config/kitty/kitty-themes/README.md rename to config/kitty/kitty-themes/README.md diff --git a/.config/kitty/kitty-themes/themes/3024_Day.conf b/config/kitty/kitty-themes/themes/3024_Day.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/3024_Day.conf rename to config/kitty/kitty-themes/themes/3024_Day.conf diff --git a/.config/kitty/kitty-themes/themes/3024_Night.conf b/config/kitty/kitty-themes/themes/3024_Night.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/3024_Night.conf rename to config/kitty/kitty-themes/themes/3024_Night.conf diff --git a/.config/kitty/kitty-themes/themes/AdventureTime.conf b/config/kitty/kitty-themes/themes/AdventureTime.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/AdventureTime.conf rename to config/kitty/kitty-themes/themes/AdventureTime.conf diff --git a/.config/kitty/kitty-themes/themes/Afterglow.conf b/config/kitty/kitty-themes/themes/Afterglow.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Afterglow.conf rename to config/kitty/kitty-themes/themes/Afterglow.conf diff --git a/.config/kitty/kitty-themes/themes/AlienBlood.conf b/config/kitty/kitty-themes/themes/AlienBlood.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/AlienBlood.conf rename to config/kitty/kitty-themes/themes/AlienBlood.conf diff --git a/.config/kitty/kitty-themes/themes/Alucard.conf b/config/kitty/kitty-themes/themes/Alucard.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Alucard.conf rename to config/kitty/kitty-themes/themes/Alucard.conf diff --git a/.config/kitty/kitty-themes/themes/Apprentice.conf b/config/kitty/kitty-themes/themes/Apprentice.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Apprentice.conf rename to config/kitty/kitty-themes/themes/Apprentice.conf diff --git a/.config/kitty/kitty-themes/themes/Argonaut.conf b/config/kitty/kitty-themes/themes/Argonaut.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Argonaut.conf rename to config/kitty/kitty-themes/themes/Argonaut.conf diff --git a/.config/kitty/kitty-themes/themes/Arthur.conf b/config/kitty/kitty-themes/themes/Arthur.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Arthur.conf rename to config/kitty/kitty-themes/themes/Arthur.conf diff --git a/.config/kitty/kitty-themes/themes/AtelierSulphurpool.conf b/config/kitty/kitty-themes/themes/AtelierSulphurpool.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/AtelierSulphurpool.conf rename to config/kitty/kitty-themes/themes/AtelierSulphurpool.conf diff --git a/.config/kitty/kitty-themes/themes/Atom.conf b/config/kitty/kitty-themes/themes/Atom.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Atom.conf rename to config/kitty/kitty-themes/themes/Atom.conf diff --git a/.config/kitty/kitty-themes/themes/AtomOneLight.conf b/config/kitty/kitty-themes/themes/AtomOneLight.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/AtomOneLight.conf rename to config/kitty/kitty-themes/themes/AtomOneLight.conf diff --git a/.config/kitty/kitty-themes/themes/Batman.conf b/config/kitty/kitty-themes/themes/Batman.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Batman.conf rename to config/kitty/kitty-themes/themes/Batman.conf diff --git a/.config/kitty/kitty-themes/themes/Belafonte_Day.conf b/config/kitty/kitty-themes/themes/Belafonte_Day.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Belafonte_Day.conf rename to config/kitty/kitty-themes/themes/Belafonte_Day.conf diff --git a/.config/kitty/kitty-themes/themes/Belafonte_Night.conf b/config/kitty/kitty-themes/themes/Belafonte_Night.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Belafonte_Night.conf rename to config/kitty/kitty-themes/themes/Belafonte_Night.conf diff --git a/.config/kitty/kitty-themes/themes/BirdsOfParadise.conf b/config/kitty/kitty-themes/themes/BirdsOfParadise.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/BirdsOfParadise.conf rename to config/kitty/kitty-themes/themes/BirdsOfParadise.conf diff --git a/.config/kitty/kitty-themes/themes/Blazer.conf b/config/kitty/kitty-themes/themes/Blazer.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Blazer.conf rename to config/kitty/kitty-themes/themes/Blazer.conf diff --git a/.config/kitty/kitty-themes/themes/Borland.conf b/config/kitty/kitty-themes/themes/Borland.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Borland.conf rename to config/kitty/kitty-themes/themes/Borland.conf diff --git a/.config/kitty/kitty-themes/themes/Bright_Lights.conf b/config/kitty/kitty-themes/themes/Bright_Lights.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Bright_Lights.conf rename to config/kitty/kitty-themes/themes/Bright_Lights.conf diff --git a/.config/kitty/kitty-themes/themes/Broadcast.conf b/config/kitty/kitty-themes/themes/Broadcast.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Broadcast.conf rename to config/kitty/kitty-themes/themes/Broadcast.conf diff --git a/.config/kitty/kitty-themes/themes/Brogrammer.conf b/config/kitty/kitty-themes/themes/Brogrammer.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Brogrammer.conf rename to config/kitty/kitty-themes/themes/Brogrammer.conf diff --git a/.config/kitty/kitty-themes/themes/C64.conf b/config/kitty/kitty-themes/themes/C64.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/C64.conf rename to config/kitty/kitty-themes/themes/C64.conf diff --git a/.config/kitty/kitty-themes/themes/CLRS.conf b/config/kitty/kitty-themes/themes/CLRS.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/CLRS.conf rename to config/kitty/kitty-themes/themes/CLRS.conf diff --git a/.config/kitty/kitty-themes/themes/Chalk.conf b/config/kitty/kitty-themes/themes/Chalk.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Chalk.conf rename to config/kitty/kitty-themes/themes/Chalk.conf diff --git a/.config/kitty/kitty-themes/themes/Chalkboard.conf b/config/kitty/kitty-themes/themes/Chalkboard.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Chalkboard.conf rename to config/kitty/kitty-themes/themes/Chalkboard.conf diff --git a/.config/kitty/kitty-themes/themes/Ciapre.conf b/config/kitty/kitty-themes/themes/Ciapre.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Ciapre.conf rename to config/kitty/kitty-themes/themes/Ciapre.conf diff --git a/.config/kitty/kitty-themes/themes/Cobalt2.conf b/config/kitty/kitty-themes/themes/Cobalt2.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Cobalt2.conf rename to config/kitty/kitty-themes/themes/Cobalt2.conf diff --git a/.config/kitty/kitty-themes/themes/Cobalt_Neon.conf b/config/kitty/kitty-themes/themes/Cobalt_Neon.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Cobalt_Neon.conf rename to config/kitty/kitty-themes/themes/Cobalt_Neon.conf diff --git a/.config/kitty/kitty-themes/themes/CrayonPonyFish.conf b/config/kitty/kitty-themes/themes/CrayonPonyFish.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/CrayonPonyFish.conf rename to config/kitty/kitty-themes/themes/CrayonPonyFish.conf diff --git a/.config/kitty/kitty-themes/themes/Dark_Pastel.conf b/config/kitty/kitty-themes/themes/Dark_Pastel.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Dark_Pastel.conf rename to config/kitty/kitty-themes/themes/Dark_Pastel.conf diff --git a/.config/kitty/kitty-themes/themes/Darkside.conf b/config/kitty/kitty-themes/themes/Darkside.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Darkside.conf rename to config/kitty/kitty-themes/themes/Darkside.conf diff --git a/.config/kitty/kitty-themes/themes/Desert.conf b/config/kitty/kitty-themes/themes/Desert.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Desert.conf rename to config/kitty/kitty-themes/themes/Desert.conf diff --git a/.config/kitty/kitty-themes/themes/DimmedMonokai.conf b/config/kitty/kitty-themes/themes/DimmedMonokai.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/DimmedMonokai.conf rename to config/kitty/kitty-themes/themes/DimmedMonokai.conf diff --git a/.config/kitty/kitty-themes/themes/DotGov.conf b/config/kitty/kitty-themes/themes/DotGov.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/DotGov.conf rename to config/kitty/kitty-themes/themes/DotGov.conf diff --git a/.config/kitty/kitty-themes/themes/Dracula.conf b/config/kitty/kitty-themes/themes/Dracula.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Dracula.conf rename to config/kitty/kitty-themes/themes/Dracula.conf diff --git a/.config/kitty/kitty-themes/themes/Dumbledore.conf b/config/kitty/kitty-themes/themes/Dumbledore.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Dumbledore.conf rename to config/kitty/kitty-themes/themes/Dumbledore.conf diff --git a/.config/kitty/kitty-themes/themes/Duotone_Dark.conf b/config/kitty/kitty-themes/themes/Duotone_Dark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Duotone_Dark.conf rename to config/kitty/kitty-themes/themes/Duotone_Dark.conf diff --git a/.config/kitty/kitty-themes/themes/ENCOM.conf b/config/kitty/kitty-themes/themes/ENCOM.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/ENCOM.conf rename to config/kitty/kitty-themes/themes/ENCOM.conf diff --git a/.config/kitty/kitty-themes/themes/Earthsong.conf b/config/kitty/kitty-themes/themes/Earthsong.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Earthsong.conf rename to config/kitty/kitty-themes/themes/Earthsong.conf diff --git a/.config/kitty/kitty-themes/themes/Elemental.conf b/config/kitty/kitty-themes/themes/Elemental.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Elemental.conf rename to config/kitty/kitty-themes/themes/Elemental.conf diff --git a/.config/kitty/kitty-themes/themes/Espresso.conf b/config/kitty/kitty-themes/themes/Espresso.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Espresso.conf rename to config/kitty/kitty-themes/themes/Espresso.conf diff --git a/.config/kitty/kitty-themes/themes/Espresso_Libre.conf b/config/kitty/kitty-themes/themes/Espresso_Libre.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Espresso_Libre.conf rename to config/kitty/kitty-themes/themes/Espresso_Libre.conf diff --git a/.config/kitty/kitty-themes/themes/Fideloper.conf b/config/kitty/kitty-themes/themes/Fideloper.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Fideloper.conf rename to config/kitty/kitty-themes/themes/Fideloper.conf diff --git a/.config/kitty/kitty-themes/themes/FishTank.conf b/config/kitty/kitty-themes/themes/FishTank.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/FishTank.conf rename to config/kitty/kitty-themes/themes/FishTank.conf diff --git a/.config/kitty/kitty-themes/themes/Flat.conf b/config/kitty/kitty-themes/themes/Flat.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Flat.conf rename to config/kitty/kitty-themes/themes/Flat.conf diff --git a/.config/kitty/kitty-themes/themes/Flatland.conf b/config/kitty/kitty-themes/themes/Flatland.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Flatland.conf rename to config/kitty/kitty-themes/themes/Flatland.conf diff --git a/.config/kitty/kitty-themes/themes/Floraverse.conf b/config/kitty/kitty-themes/themes/Floraverse.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Floraverse.conf rename to config/kitty/kitty-themes/themes/Floraverse.conf diff --git a/.config/kitty/kitty-themes/themes/FrontEndDelight.conf b/config/kitty/kitty-themes/themes/FrontEndDelight.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/FrontEndDelight.conf rename to config/kitty/kitty-themes/themes/FrontEndDelight.conf diff --git a/.config/kitty/kitty-themes/themes/FunForrest.conf b/config/kitty/kitty-themes/themes/FunForrest.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/FunForrest.conf rename to config/kitty/kitty-themes/themes/FunForrest.conf diff --git a/.config/kitty/kitty-themes/themes/Galaxy.conf b/config/kitty/kitty-themes/themes/Galaxy.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Galaxy.conf rename to config/kitty/kitty-themes/themes/Galaxy.conf diff --git a/.config/kitty/kitty-themes/themes/Github.conf b/config/kitty/kitty-themes/themes/Github.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Github.conf rename to config/kitty/kitty-themes/themes/Github.conf diff --git a/.config/kitty/kitty-themes/themes/Glacier.conf b/config/kitty/kitty-themes/themes/Glacier.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Glacier.conf rename to config/kitty/kitty-themes/themes/Glacier.conf diff --git a/.config/kitty/kitty-themes/themes/GoaBase.conf b/config/kitty/kitty-themes/themes/GoaBase.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/GoaBase.conf rename to config/kitty/kitty-themes/themes/GoaBase.conf diff --git a/.config/kitty/kitty-themes/themes/Grape.conf b/config/kitty/kitty-themes/themes/Grape.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Grape.conf rename to config/kitty/kitty-themes/themes/Grape.conf diff --git a/.config/kitty/kitty-themes/themes/Grass.conf b/config/kitty/kitty-themes/themes/Grass.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Grass.conf rename to config/kitty/kitty-themes/themes/Grass.conf diff --git a/.config/kitty/kitty-themes/themes/Hardcore.conf b/config/kitty/kitty-themes/themes/Hardcore.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Hardcore.conf rename to config/kitty/kitty-themes/themes/Hardcore.conf diff --git a/.config/kitty/kitty-themes/themes/Harper.conf b/config/kitty/kitty-themes/themes/Harper.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Harper.conf rename to config/kitty/kitty-themes/themes/Harper.conf diff --git a/.config/kitty/kitty-themes/themes/Highway.conf b/config/kitty/kitty-themes/themes/Highway.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Highway.conf rename to config/kitty/kitty-themes/themes/Highway.conf diff --git a/.config/kitty/kitty-themes/themes/Hipster_Green.conf b/config/kitty/kitty-themes/themes/Hipster_Green.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Hipster_Green.conf rename to config/kitty/kitty-themes/themes/Hipster_Green.conf diff --git a/.config/kitty/kitty-themes/themes/Homebrew.conf b/config/kitty/kitty-themes/themes/Homebrew.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Homebrew.conf rename to config/kitty/kitty-themes/themes/Homebrew.conf diff --git a/.config/kitty/kitty-themes/themes/Hurtado.conf b/config/kitty/kitty-themes/themes/Hurtado.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Hurtado.conf rename to config/kitty/kitty-themes/themes/Hurtado.conf diff --git a/.config/kitty/kitty-themes/themes/Hybrid.conf b/config/kitty/kitty-themes/themes/Hybrid.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Hybrid.conf rename to config/kitty/kitty-themes/themes/Hybrid.conf diff --git a/.config/kitty/kitty-themes/themes/IC_Green_PPL.conf b/config/kitty/kitty-themes/themes/IC_Green_PPL.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/IC_Green_PPL.conf rename to config/kitty/kitty-themes/themes/IC_Green_PPL.conf diff --git a/.config/kitty/kitty-themes/themes/IC_Orange_PPL.conf b/config/kitty/kitty-themes/themes/IC_Orange_PPL.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/IC_Orange_PPL.conf rename to config/kitty/kitty-themes/themes/IC_Orange_PPL.conf diff --git a/.config/kitty/kitty-themes/themes/IR_Black.conf b/config/kitty/kitty-themes/themes/IR_Black.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/IR_Black.conf rename to config/kitty/kitty-themes/themes/IR_Black.conf diff --git a/.config/kitty/kitty-themes/themes/Jackie_Brown.conf b/config/kitty/kitty-themes/themes/Jackie_Brown.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Jackie_Brown.conf rename to config/kitty/kitty-themes/themes/Jackie_Brown.conf diff --git a/.config/kitty/kitty-themes/themes/Japanesque.conf b/config/kitty/kitty-themes/themes/Japanesque.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Japanesque.conf rename to config/kitty/kitty-themes/themes/Japanesque.conf diff --git a/.config/kitty/kitty-themes/themes/Jellybeans.conf b/config/kitty/kitty-themes/themes/Jellybeans.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Jellybeans.conf rename to config/kitty/kitty-themes/themes/Jellybeans.conf diff --git a/.config/kitty/kitty-themes/themes/JetBrains_Darcula.conf b/config/kitty/kitty-themes/themes/JetBrains_Darcula.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/JetBrains_Darcula.conf rename to config/kitty/kitty-themes/themes/JetBrains_Darcula.conf diff --git a/.config/kitty/kitty-themes/themes/Kibble.conf b/config/kitty/kitty-themes/themes/Kibble.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Kibble.conf rename to config/kitty/kitty-themes/themes/Kibble.conf diff --git a/.config/kitty/kitty-themes/themes/Later_This_Evening.conf b/config/kitty/kitty-themes/themes/Later_This_Evening.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Later_This_Evening.conf rename to config/kitty/kitty-themes/themes/Later_This_Evening.conf diff --git a/.config/kitty/kitty-themes/themes/Lavandula.conf b/config/kitty/kitty-themes/themes/Lavandula.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Lavandula.conf rename to config/kitty/kitty-themes/themes/Lavandula.conf diff --git a/.config/kitty/kitty-themes/themes/LiquidCarbon.conf b/config/kitty/kitty-themes/themes/LiquidCarbon.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/LiquidCarbon.conf rename to config/kitty/kitty-themes/themes/LiquidCarbon.conf diff --git a/.config/kitty/kitty-themes/themes/LiquidCarbonTransparent.conf b/config/kitty/kitty-themes/themes/LiquidCarbonTransparent.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/LiquidCarbonTransparent.conf rename to config/kitty/kitty-themes/themes/LiquidCarbonTransparent.conf diff --git a/.config/kitty/kitty-themes/themes/LiquidCarbonTransparentInverse.conf b/config/kitty/kitty-themes/themes/LiquidCarbonTransparentInverse.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/LiquidCarbonTransparentInverse.conf rename to config/kitty/kitty-themes/themes/LiquidCarbonTransparentInverse.conf diff --git a/.config/kitty/kitty-themes/themes/Man_Page.conf b/config/kitty/kitty-themes/themes/Man_Page.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Man_Page.conf rename to config/kitty/kitty-themes/themes/Man_Page.conf diff --git a/.config/kitty/kitty-themes/themes/Material.conf b/config/kitty/kitty-themes/themes/Material.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Material.conf rename to config/kitty/kitty-themes/themes/Material.conf diff --git a/.config/kitty/kitty-themes/themes/MaterialDark.conf b/config/kitty/kitty-themes/themes/MaterialDark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/MaterialDark.conf rename to config/kitty/kitty-themes/themes/MaterialDark.conf diff --git a/.config/kitty/kitty-themes/themes/Mathias.conf b/config/kitty/kitty-themes/themes/Mathias.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Mathias.conf rename to config/kitty/kitty-themes/themes/Mathias.conf diff --git a/.config/kitty/kitty-themes/themes/Medallion.conf b/config/kitty/kitty-themes/themes/Medallion.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Medallion.conf rename to config/kitty/kitty-themes/themes/Medallion.conf diff --git a/.config/kitty/kitty-themes/themes/Misterioso.conf b/config/kitty/kitty-themes/themes/Misterioso.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Misterioso.conf rename to config/kitty/kitty-themes/themes/Misterioso.conf diff --git a/.config/kitty/kitty-themes/themes/Molokai.conf b/config/kitty/kitty-themes/themes/Molokai.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Molokai.conf rename to config/kitty/kitty-themes/themes/Molokai.conf diff --git a/.config/kitty/kitty-themes/themes/MonaLisa.conf b/config/kitty/kitty-themes/themes/MonaLisa.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/MonaLisa.conf rename to config/kitty/kitty-themes/themes/MonaLisa.conf diff --git a/.config/kitty/kitty-themes/themes/Monokai.conf b/config/kitty/kitty-themes/themes/Monokai.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai.conf rename to config/kitty/kitty-themes/themes/Monokai.conf diff --git a/.config/kitty/kitty-themes/themes/Monokai_Classic.conf b/config/kitty/kitty-themes/themes/Monokai_Classic.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai_Classic.conf rename to config/kitty/kitty-themes/themes/Monokai_Classic.conf diff --git a/.config/kitty/kitty-themes/themes/Monokai_Pro.conf b/config/kitty/kitty-themes/themes/Monokai_Pro.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai_Pro.conf rename to config/kitty/kitty-themes/themes/Monokai_Pro.conf diff --git a/.config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Machine).conf b/config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Machine).conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Machine).conf rename to config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Machine).conf diff --git a/.config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Octagon).conf b/config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Octagon).conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Octagon).conf rename to config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Octagon).conf diff --git a/.config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Ristretto).conf b/config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Ristretto).conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Ristretto).conf rename to config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Ristretto).conf diff --git a/.config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Spectrum).conf b/config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Spectrum).conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Spectrum).conf rename to config/kitty/kitty-themes/themes/Monokai_Pro_(Filter_Spectrum).conf diff --git a/.config/kitty/kitty-themes/themes/Monokai_Soda.conf b/config/kitty/kitty-themes/themes/Monokai_Soda.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Monokai_Soda.conf rename to config/kitty/kitty-themes/themes/Monokai_Soda.conf diff --git a/.config/kitty/kitty-themes/themes/N0tch2k.conf b/config/kitty/kitty-themes/themes/N0tch2k.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/N0tch2k.conf rename to config/kitty/kitty-themes/themes/N0tch2k.conf diff --git a/.config/kitty/kitty-themes/themes/Neopolitan.conf b/config/kitty/kitty-themes/themes/Neopolitan.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Neopolitan.conf rename to config/kitty/kitty-themes/themes/Neopolitan.conf diff --git a/.config/kitty/kitty-themes/themes/Neutron.conf b/config/kitty/kitty-themes/themes/Neutron.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Neutron.conf rename to config/kitty/kitty-themes/themes/Neutron.conf diff --git a/.config/kitty/kitty-themes/themes/NightLion_v1.conf b/config/kitty/kitty-themes/themes/NightLion_v1.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/NightLion_v1.conf rename to config/kitty/kitty-themes/themes/NightLion_v1.conf diff --git a/.config/kitty/kitty-themes/themes/NightLion_v2.conf b/config/kitty/kitty-themes/themes/NightLion_v2.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/NightLion_v2.conf rename to config/kitty/kitty-themes/themes/NightLion_v2.conf diff --git a/.config/kitty/kitty-themes/themes/Nova.conf b/config/kitty/kitty-themes/themes/Nova.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Nova.conf rename to config/kitty/kitty-themes/themes/Nova.conf diff --git a/.config/kitty/kitty-themes/themes/Novel.conf b/config/kitty/kitty-themes/themes/Novel.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Novel.conf rename to config/kitty/kitty-themes/themes/Novel.conf diff --git a/.config/kitty/kitty-themes/themes/Obsidian.conf b/config/kitty/kitty-themes/themes/Obsidian.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Obsidian.conf rename to config/kitty/kitty-themes/themes/Obsidian.conf diff --git a/.config/kitty/kitty-themes/themes/Ocean.conf b/config/kitty/kitty-themes/themes/Ocean.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Ocean.conf rename to config/kitty/kitty-themes/themes/Ocean.conf diff --git a/.config/kitty/kitty-themes/themes/OceanicMaterial.conf b/config/kitty/kitty-themes/themes/OceanicMaterial.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/OceanicMaterial.conf rename to config/kitty/kitty-themes/themes/OceanicMaterial.conf diff --git a/.config/kitty/kitty-themes/themes/Ollie.conf b/config/kitty/kitty-themes/themes/Ollie.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Ollie.conf rename to config/kitty/kitty-themes/themes/Ollie.conf diff --git a/.config/kitty/kitty-themes/themes/OneDark.conf b/config/kitty/kitty-themes/themes/OneDark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/OneDark.conf rename to config/kitty/kitty-themes/themes/OneDark.conf diff --git a/.config/kitty/kitty-themes/themes/Parasio_Dark.conf b/config/kitty/kitty-themes/themes/Parasio_Dark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Parasio_Dark.conf rename to config/kitty/kitty-themes/themes/Parasio_Dark.conf diff --git a/.config/kitty/kitty-themes/themes/PaulMillr.conf b/config/kitty/kitty-themes/themes/PaulMillr.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/PaulMillr.conf rename to config/kitty/kitty-themes/themes/PaulMillr.conf diff --git a/.config/kitty/kitty-themes/themes/PencilDark.conf b/config/kitty/kitty-themes/themes/PencilDark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/PencilDark.conf rename to config/kitty/kitty-themes/themes/PencilDark.conf diff --git a/.config/kitty/kitty-themes/themes/PencilLight.conf b/config/kitty/kitty-themes/themes/PencilLight.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/PencilLight.conf rename to config/kitty/kitty-themes/themes/PencilLight.conf diff --git a/.config/kitty/kitty-themes/themes/Piatto_Light.conf b/config/kitty/kitty-themes/themes/Piatto_Light.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Piatto_Light.conf rename to config/kitty/kitty-themes/themes/Piatto_Light.conf diff --git a/.config/kitty/kitty-themes/themes/Pnevma.conf b/config/kitty/kitty-themes/themes/Pnevma.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Pnevma.conf rename to config/kitty/kitty-themes/themes/Pnevma.conf diff --git a/.config/kitty/kitty-themes/themes/Pro.conf b/config/kitty/kitty-themes/themes/Pro.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Pro.conf rename to config/kitty/kitty-themes/themes/Pro.conf diff --git a/.config/kitty/kitty-themes/themes/Red_Alert.conf b/config/kitty/kitty-themes/themes/Red_Alert.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Red_Alert.conf rename to config/kitty/kitty-themes/themes/Red_Alert.conf diff --git a/.config/kitty/kitty-themes/themes/Red_Sands.conf b/config/kitty/kitty-themes/themes/Red_Sands.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Red_Sands.conf rename to config/kitty/kitty-themes/themes/Red_Sands.conf diff --git a/.config/kitty/kitty-themes/themes/Relaxed_Afterglow.conf b/config/kitty/kitty-themes/themes/Relaxed_Afterglow.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Relaxed_Afterglow.conf rename to config/kitty/kitty-themes/themes/Relaxed_Afterglow.conf diff --git a/.config/kitty/kitty-themes/themes/Renault_Style.conf b/config/kitty/kitty-themes/themes/Renault_Style.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Renault_Style.conf rename to config/kitty/kitty-themes/themes/Renault_Style.conf diff --git a/.config/kitty/kitty-themes/themes/Renault_Style_Light.conf b/config/kitty/kitty-themes/themes/Renault_Style_Light.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Renault_Style_Light.conf rename to config/kitty/kitty-themes/themes/Renault_Style_Light.conf diff --git a/.config/kitty/kitty-themes/themes/Rippedcasts.conf b/config/kitty/kitty-themes/themes/Rippedcasts.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Rippedcasts.conf rename to config/kitty/kitty-themes/themes/Rippedcasts.conf diff --git a/.config/kitty/kitty-themes/themes/Royal.conf b/config/kitty/kitty-themes/themes/Royal.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Royal.conf rename to config/kitty/kitty-themes/themes/Royal.conf diff --git a/.config/kitty/kitty-themes/themes/SeaShells.conf b/config/kitty/kitty-themes/themes/SeaShells.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/SeaShells.conf rename to config/kitty/kitty-themes/themes/SeaShells.conf diff --git a/.config/kitty/kitty-themes/themes/Seafoam_Pastel.conf b/config/kitty/kitty-themes/themes/Seafoam_Pastel.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Seafoam_Pastel.conf rename to config/kitty/kitty-themes/themes/Seafoam_Pastel.conf diff --git a/.config/kitty/kitty-themes/themes/Seti.conf b/config/kitty/kitty-themes/themes/Seti.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Seti.conf rename to config/kitty/kitty-themes/themes/Seti.conf diff --git a/.config/kitty/kitty-themes/themes/Shaman.conf b/config/kitty/kitty-themes/themes/Shaman.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Shaman.conf rename to config/kitty/kitty-themes/themes/Shaman.conf diff --git a/.config/kitty/kitty-themes/themes/Slate.conf b/config/kitty/kitty-themes/themes/Slate.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Slate.conf rename to config/kitty/kitty-themes/themes/Slate.conf diff --git a/.config/kitty/kitty-themes/themes/Smyck.conf b/config/kitty/kitty-themes/themes/Smyck.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Smyck.conf rename to config/kitty/kitty-themes/themes/Smyck.conf diff --git a/.config/kitty/kitty-themes/themes/SoftServer.conf b/config/kitty/kitty-themes/themes/SoftServer.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/SoftServer.conf rename to config/kitty/kitty-themes/themes/SoftServer.conf diff --git a/.config/kitty/kitty-themes/themes/Solarized_Darcula.conf b/config/kitty/kitty-themes/themes/Solarized_Darcula.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Solarized_Darcula.conf rename to config/kitty/kitty-themes/themes/Solarized_Darcula.conf diff --git a/.config/kitty/kitty-themes/themes/Solarized_Dark.conf b/config/kitty/kitty-themes/themes/Solarized_Dark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Solarized_Dark.conf rename to config/kitty/kitty-themes/themes/Solarized_Dark.conf diff --git a/.config/kitty/kitty-themes/themes/Solarized_Dark_-_Patched.conf b/config/kitty/kitty-themes/themes/Solarized_Dark_-_Patched.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Solarized_Dark_-_Patched.conf rename to config/kitty/kitty-themes/themes/Solarized_Dark_-_Patched.conf diff --git a/.config/kitty/kitty-themes/themes/Solarized_Dark_Higher_Contrast.conf b/config/kitty/kitty-themes/themes/Solarized_Dark_Higher_Contrast.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Solarized_Dark_Higher_Contrast.conf rename to config/kitty/kitty-themes/themes/Solarized_Dark_Higher_Contrast.conf diff --git a/.config/kitty/kitty-themes/themes/Solarized_Light.conf b/config/kitty/kitty-themes/themes/Solarized_Light.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Solarized_Light.conf rename to config/kitty/kitty-themes/themes/Solarized_Light.conf diff --git a/.config/kitty/kitty-themes/themes/Source_Code_X.conf b/config/kitty/kitty-themes/themes/Source_Code_X.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Source_Code_X.conf rename to config/kitty/kitty-themes/themes/Source_Code_X.conf diff --git a/.config/kitty/kitty-themes/themes/SpaceGray.conf b/config/kitty/kitty-themes/themes/SpaceGray.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/SpaceGray.conf rename to config/kitty/kitty-themes/themes/SpaceGray.conf diff --git a/.config/kitty/kitty-themes/themes/SpaceGray_Eighties.conf b/config/kitty/kitty-themes/themes/SpaceGray_Eighties.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/SpaceGray_Eighties.conf rename to config/kitty/kitty-themes/themes/SpaceGray_Eighties.conf diff --git a/.config/kitty/kitty-themes/themes/SpaceGray_Eighties_Dull.conf b/config/kitty/kitty-themes/themes/SpaceGray_Eighties_Dull.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/SpaceGray_Eighties_Dull.conf rename to config/kitty/kitty-themes/themes/SpaceGray_Eighties_Dull.conf diff --git a/.config/kitty/kitty-themes/themes/Spacedust.conf b/config/kitty/kitty-themes/themes/Spacedust.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Spacedust.conf rename to config/kitty/kitty-themes/themes/Spacedust.conf diff --git a/.config/kitty/kitty-themes/themes/Spiderman.conf b/config/kitty/kitty-themes/themes/Spiderman.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Spiderman.conf rename to config/kitty/kitty-themes/themes/Spiderman.conf diff --git a/.config/kitty/kitty-themes/themes/Spring.conf b/config/kitty/kitty-themes/themes/Spring.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Spring.conf rename to config/kitty/kitty-themes/themes/Spring.conf diff --git a/.config/kitty/kitty-themes/themes/Square.conf b/config/kitty/kitty-themes/themes/Square.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Square.conf rename to config/kitty/kitty-themes/themes/Square.conf diff --git a/.config/kitty/kitty-themes/themes/Sundried.conf b/config/kitty/kitty-themes/themes/Sundried.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Sundried.conf rename to config/kitty/kitty-themes/themes/Sundried.conf diff --git a/.config/kitty/kitty-themes/themes/Symfonic.conf b/config/kitty/kitty-themes/themes/Symfonic.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Symfonic.conf rename to config/kitty/kitty-themes/themes/Symfonic.conf diff --git a/.config/kitty/kitty-themes/themes/Tango_Dark.conf b/config/kitty/kitty-themes/themes/Tango_Dark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Tango_Dark.conf rename to config/kitty/kitty-themes/themes/Tango_Dark.conf diff --git a/.config/kitty/kitty-themes/themes/Tango_Light.conf b/config/kitty/kitty-themes/themes/Tango_Light.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Tango_Light.conf rename to config/kitty/kitty-themes/themes/Tango_Light.conf diff --git a/.config/kitty/kitty-themes/themes/Teerb.conf b/config/kitty/kitty-themes/themes/Teerb.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Teerb.conf rename to config/kitty/kitty-themes/themes/Teerb.conf diff --git a/.config/kitty/kitty-themes/themes/Thayer_Bright.conf b/config/kitty/kitty-themes/themes/Thayer_Bright.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Thayer_Bright.conf rename to config/kitty/kitty-themes/themes/Thayer_Bright.conf diff --git a/.config/kitty/kitty-themes/themes/The_Hulk.conf b/config/kitty/kitty-themes/themes/The_Hulk.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/The_Hulk.conf rename to config/kitty/kitty-themes/themes/The_Hulk.conf diff --git a/.config/kitty/kitty-themes/themes/Tomorrow.conf b/config/kitty/kitty-themes/themes/Tomorrow.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Tomorrow.conf rename to config/kitty/kitty-themes/themes/Tomorrow.conf diff --git a/.config/kitty/kitty-themes/themes/Tomorrow_Night.conf b/config/kitty/kitty-themes/themes/Tomorrow_Night.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Tomorrow_Night.conf rename to config/kitty/kitty-themes/themes/Tomorrow_Night.conf diff --git a/.config/kitty/kitty-themes/themes/Tomorrow_Night_Blue.conf b/config/kitty/kitty-themes/themes/Tomorrow_Night_Blue.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Tomorrow_Night_Blue.conf rename to config/kitty/kitty-themes/themes/Tomorrow_Night_Blue.conf diff --git a/.config/kitty/kitty-themes/themes/Tomorrow_Night_Bright.conf b/config/kitty/kitty-themes/themes/Tomorrow_Night_Bright.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Tomorrow_Night_Bright.conf rename to config/kitty/kitty-themes/themes/Tomorrow_Night_Bright.conf diff --git a/.config/kitty/kitty-themes/themes/Tomorrow_Night_Eighties.conf b/config/kitty/kitty-themes/themes/Tomorrow_Night_Eighties.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Tomorrow_Night_Eighties.conf rename to config/kitty/kitty-themes/themes/Tomorrow_Night_Eighties.conf diff --git a/.config/kitty/kitty-themes/themes/ToyChest.conf b/config/kitty/kitty-themes/themes/ToyChest.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/ToyChest.conf rename to config/kitty/kitty-themes/themes/ToyChest.conf diff --git a/.config/kitty/kitty-themes/themes/Treehouse.conf b/config/kitty/kitty-themes/themes/Treehouse.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Treehouse.conf rename to config/kitty/kitty-themes/themes/Treehouse.conf diff --git a/.config/kitty/kitty-themes/themes/Twilight.conf b/config/kitty/kitty-themes/themes/Twilight.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Twilight.conf rename to config/kitty/kitty-themes/themes/Twilight.conf diff --git a/.config/kitty/kitty-themes/themes/Ubuntu.conf b/config/kitty/kitty-themes/themes/Ubuntu.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Ubuntu.conf rename to config/kitty/kitty-themes/themes/Ubuntu.conf diff --git a/.config/kitty/kitty-themes/themes/Urple.conf b/config/kitty/kitty-themes/themes/Urple.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Urple.conf rename to config/kitty/kitty-themes/themes/Urple.conf diff --git a/.config/kitty/kitty-themes/themes/Vaughn.conf b/config/kitty/kitty-themes/themes/Vaughn.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Vaughn.conf rename to config/kitty/kitty-themes/themes/Vaughn.conf diff --git a/.config/kitty/kitty-themes/themes/VibrantInk.conf b/config/kitty/kitty-themes/themes/VibrantInk.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/VibrantInk.conf rename to config/kitty/kitty-themes/themes/VibrantInk.conf diff --git a/.config/kitty/kitty-themes/themes/WarmNeon.conf b/config/kitty/kitty-themes/themes/WarmNeon.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/WarmNeon.conf rename to config/kitty/kitty-themes/themes/WarmNeon.conf diff --git a/.config/kitty/kitty-themes/themes/Wez.conf b/config/kitty/kitty-themes/themes/Wez.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Wez.conf rename to config/kitty/kitty-themes/themes/Wez.conf diff --git a/.config/kitty/kitty-themes/themes/WildCherry.conf b/config/kitty/kitty-themes/themes/WildCherry.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/WildCherry.conf rename to config/kitty/kitty-themes/themes/WildCherry.conf diff --git a/.config/kitty/kitty-themes/themes/Wombat.conf b/config/kitty/kitty-themes/themes/Wombat.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Wombat.conf rename to config/kitty/kitty-themes/themes/Wombat.conf diff --git a/.config/kitty/kitty-themes/themes/Wryan.conf b/config/kitty/kitty-themes/themes/Wryan.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Wryan.conf rename to config/kitty/kitty-themes/themes/Wryan.conf diff --git a/.config/kitty/kitty-themes/themes/Zenburn.conf b/config/kitty/kitty-themes/themes/Zenburn.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/Zenburn.conf rename to config/kitty/kitty-themes/themes/Zenburn.conf diff --git a/.config/kitty/kitty-themes/themes/ayu.conf b/config/kitty/kitty-themes/themes/ayu.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/ayu.conf rename to config/kitty/kitty-themes/themes/ayu.conf diff --git a/.config/kitty/kitty-themes/themes/ayu_light.conf b/config/kitty/kitty-themes/themes/ayu_light.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/ayu_light.conf rename to config/kitty/kitty-themes/themes/ayu_light.conf diff --git a/.config/kitty/kitty-themes/themes/ayu_mirage.conf b/config/kitty/kitty-themes/themes/ayu_mirage.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/ayu_mirage.conf rename to config/kitty/kitty-themes/themes/ayu_mirage.conf diff --git a/.config/kitty/kitty-themes/themes/gruvbox_dark.conf b/config/kitty/kitty-themes/themes/gruvbox_dark.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/gruvbox_dark.conf rename to config/kitty/kitty-themes/themes/gruvbox_dark.conf diff --git a/.config/kitty/kitty-themes/themes/gruvbox_light.conf b/config/kitty/kitty-themes/themes/gruvbox_light.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/gruvbox_light.conf rename to config/kitty/kitty-themes/themes/gruvbox_light.conf diff --git a/.config/kitty/kitty-themes/themes/idleToes.conf b/config/kitty/kitty-themes/themes/idleToes.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/idleToes.conf rename to config/kitty/kitty-themes/themes/idleToes.conf diff --git a/.config/kitty/kitty-themes/themes/snazzy.conf b/config/kitty/kitty-themes/themes/snazzy.conf similarity index 100% rename from .config/kitty/kitty-themes/themes/snazzy.conf rename to config/kitty/kitty-themes/themes/snazzy.conf diff --git a/.config/kitty/kitty.conf b/config/kitty/kitty.conf similarity index 100% rename from .config/kitty/kitty.conf rename to config/kitty/kitty.conf diff --git a/.config/lazygit/config.yml b/config/lazygit/config.yml similarity index 100% rename from .config/lazygit/config.yml rename to config/lazygit/config.yml diff --git a/.config/metapac/config.toml b/config/metapac/config.toml similarity index 100% rename from .config/metapac/config.toml rename to config/metapac/config.toml diff --git a/.config/metapac/groups/default.toml b/config/metapac/groups/default.toml similarity index 100% rename from .config/metapac/groups/default.toml rename to config/metapac/groups/default.toml diff --git a/.config/metapac/groups/desktop.toml b/config/metapac/groups/desktop.toml similarity index 100% rename from .config/metapac/groups/desktop.toml rename to config/metapac/groups/desktop.toml diff --git a/.config/metapac/groups/laptop.toml b/config/metapac/groups/laptop.toml similarity index 100% rename from .config/metapac/groups/laptop.toml rename to config/metapac/groups/laptop.toml diff --git a/.config/nvim/init.lua b/config/nvim/init.lua similarity index 100% rename from .config/nvim/init.lua rename to config/nvim/init.lua diff --git a/.config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json similarity index 100% rename from .config/nvim/lazy-lock.json rename to config/nvim/lazy-lock.json diff --git a/.config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua similarity index 100% rename from .config/nvim/lua/plugins/init.lua rename to config/nvim/lua/plugins/init.lua diff --git a/.config/starship.toml b/config/starship.toml similarity index 100% rename from .config/starship.toml rename to config/starship.toml diff --git a/config/tmux/plugins/catppuccin/tmux/.editorconfig b/config/tmux/plugins/catppuccin/tmux/.editorconfig new file mode 100644 index 00000000..d86ac027 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/.editorconfig @@ -0,0 +1,34 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# EditorConfig is awesome: https://EditorConfig.org + +root = true + +[*] +charset = utf-8 +indent_size = 2 +indent_style = space +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# go +[*.go] +indent_style = tab +indent_size = 4 + +# python +[*.{ini,py,py.tpl,rst}] +indent_size = 4 + +# rust +[*.rs] +indent_size = 4 + +# documentation, utils +[*.{md,mdx,diff}] +trim_trailing_whitespace = false + +# windows shell scripts +[*.{cmd,bat,ps1}] +end_of_line = crlf diff --git a/config/tmux/plugins/catppuccin/tmux/.gitignore b/config/tmux/plugins/catppuccin/tmux/.gitignore new file mode 100644 index 00000000..beab4f17 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/.gitignore @@ -0,0 +1,3 @@ +custom +!custom/README.md +!custom/example.sh diff --git a/config/tmux/plugins/catppuccin/tmux/.markdownlint.jsonc b/config/tmux/plugins/catppuccin/tmux/.markdownlint.jsonc new file mode 100644 index 00000000..6fb7438d --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/.markdownlint.jsonc @@ -0,0 +1,15 @@ +{ + "$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/v0.35.0/schema/markdownlint-config-schema.json", + "line-length": { + "code_block_line_length": 120, + "tables": false + }, + "no-inline-html": { + "allowed_elements": ["details", "summary", "img", "p", "a", "h3"] + }, + "first-line-heading": false, + "no-alt-text": false, + "code-block-style": { + "style": "consistent" + } +} \ No newline at end of file diff --git a/config/tmux/plugins/catppuccin/tmux/.shellcheckrc b/config/tmux/plugins/catppuccin/tmux/.shellcheckrc new file mode 100644 index 00000000..3f7e5f56 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/.shellcheckrc @@ -0,0 +1,6 @@ +shell=bash + +# TODO: Find a way to declare color variables +disable=SC2154 + +external-sources=true diff --git a/config/tmux/plugins/catppuccin/tmux/CHANGELOG.md b/config/tmux/plugins/catppuccin/tmux/CHANGELOG.md new file mode 100644 index 00000000..2b54cba8 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/CHANGELOG.md @@ -0,0 +1,181 @@ +# Changelog + +## [2.1.3](https://github.com/catppuccin/tmux/compare/v2.1.2...v2.1.3) (2025-03-23) + + +### Fixed + +* make the space in [@catppuccin](https://github.com/catppuccin)_window_flags_icon_format user-configurable ([#465](https://github.com/catppuccin/tmux/issues/465)) ([320e184](https://github.com/catppuccin/tmux/commit/320e184a31d0825cb4f4af550492cbdff2fc3ffc)) +* pomodoro plugin icon color - use a defined color (peach) rather than orange ([#466](https://github.com/catppuccin/tmux/issues/466)) ([da2143d](https://github.com/catppuccin/tmux/commit/da2143d2a6baf7951eda302678a57a171a78d78a)) +* use plain awk for the load status line module, removing a dep ([#508](https://github.com/catppuccin/tmux/issues/508)) ([c21246e](https://github.com/catppuccin/tmux/commit/c21246ed58e867c9594dc687c5e92b229bc1760d)) +* use the correct option for the left separator for the current window ([#450](https://github.com/catppuccin/tmux/issues/450)) ([ba9bd88](https://github.com/catppuccin/tmux/commit/ba9bd88c98c81f25060f051ed983e40f82fdd3ba)) + + +### Documentation + +* add a troubleshooting guide ([#473](https://github.com/catppuccin/tmux/issues/473)) ([ab647cf](https://github.com/catppuccin/tmux/commit/ab647cf91501cebbd3f967da2b488a5f87614e6b)) +* Correct the plugin path for TPM in the readme ([#492](https://github.com/catppuccin/tmux/issues/492)) ([ee8970d](https://github.com/catppuccin/tmux/commit/ee8970ddb5dd60fd93e254de9a30ed8277c7ccc7)) +* **README:** fix codeblock indentation ([#489](https://github.com/catppuccin/tmux/issues/489)) ([cce60ab](https://github.com/catppuccin/tmux/commit/cce60abc8efd7a641a5fcc8001e6b3ae61e8d5fe)) +* **README:** update migration guide issue link ([#493](https://github.com/catppuccin/tmux/issues/493)) ([073ee54](https://github.com/catppuccin/tmux/commit/073ee54992c59fedcc29c1525a26f95691f0ae1f)) + +## [2.1.2](https://github.com/catppuccin/tmux/compare/v2.1.1...v2.1.2) (2024-12-08) + + +### Fixed + +* improve uptime status sed script to report correct units for few uptime scenarios ([#437](https://github.com/catppuccin/tmux/issues/437)) ([31fc2bf](https://github.com/catppuccin/tmux/commit/31fc2bfb1123681dc06da613b944b85f81e4babd)) +* use current window separators for the current window format ([#443](https://github.com/catppuccin/tmux/issues/443)) ([2a6c45b](https://github.com/catppuccin/tmux/commit/2a6c45b7c0da1594de1105d6cef15e3e68981113)) + +## [2.1.1](https://github.com/catppuccin/tmux/compare/v2.1.0...v2.1.1) (2024-11-17) + + +### Fixed + +* escape the TPM environment variable in the kube status line module ([#434](https://github.com/catppuccin/tmux/issues/434)) ([eb78ade](https://github.com/catppuccin/tmux/commit/eb78ade9dc1f6cd8ba654572f51ddcae3c6e7fd7)) +* specify the color for right separator of the status modules to be the same as text bg color ([#429](https://github.com/catppuccin/tmux/issues/429)) ([0e66dee](https://github.com/catppuccin/tmux/commit/0e66dee11ee396824668d4db863f1873e9e9243f)) + + +### Documentation + +* add possible values for window_flags ([#417](https://github.com/catppuccin/tmux/issues/417)) ([c8a2d1a](https://github.com/catppuccin/tmux/commit/c8a2d1ae9649aa904960bef1516ea2ff9a3e6ad0)) +* **custom-status:** fix typo `catpuccin` -> `catppuccin` ([#424](https://github.com/catppuccin/tmux/issues/424)) ([aaf9120](https://github.com/catppuccin/tmux/commit/aaf9120f769a34e5491b3ee7f885c8c347f2f663)) + +## [2.1.0](https://github.com/catppuccin/tmux/compare/v2.0.0...v2.1.0) (2024-10-25) + + +### Added + +* add an option to format the window number with `[@catppuccin](https://github.com/catppuccin)_window_number` and `[@catppuccin](https://github.com/catppuccin)_window_current_number` ([c749885](https://github.com/catppuccin/tmux/commit/c74988511a462bdf07c5fc9ce88157b93a4ed185)) + + +### Fixed + +* allow for dynamic colors in status modules ([#411](https://github.com/catppuccin/tmux/issues/411)), fixes issue [#407](https://github.com/catppuccin/tmux/issues/407) ([5e273e4](https://github.com/catppuccin/tmux/commit/5e273e41dd3188a1a0e795b120623c95de491445)) +* session status icon bg color change by client_prefix ([#394](https://github.com/catppuccin/tmux/issues/394)) ([8855667](https://github.com/catppuccin/tmux/commit/885566714315915547516de5c2f1b660f8e524c2)) + + +### Documentation + +* **README:** add [@kjnsn](https://github.com/kjnsn) to "Thanks to" section ([#398](https://github.com/catppuccin/tmux/issues/398)) ([c3fab98](https://github.com/catppuccin/tmux/commit/c3fab98ab4248a2a78c8193ad48f0991b7bfa1e3)) + +## [2.0.0](https://github.com/catppuccin/tmux/compare/v1.0.3...v2.0.0) (2024-10-21) + + +### ⚠ BREAKING CHANGES + +* rebalance the colors used, and follow the styleguide +* change how windows are styled +* change how status modules are styled +* rebalance colors, adhere to style guide & overhaul docs ([#372](https://github.com/catppuccin/tmux/issues/372)) + +### Features + +* change how status modules are styled ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* rebalance colors, adhere to style guide & overhaul docs ([#372](https://github.com/catppuccin/tmux/issues/372)) ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* rebalance the colors used, and follow the styleguide ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* rebalance the status module colors for cpu and battery ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* replace `_ctp_status_bg` with unified `_ctp_module_bg_color` in module configuration ([a4d4ad0](https://github.com/catppuccin/tmux/commit/a4d4ad09cc8b5c9338cbd4510450d0ae997a7710)) + + +### Bug Fixes + +* **tests:** add tests for window styling ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) +* use ubuntu-24.04 in ci ([#388](https://github.com/catppuccin/tmux/issues/388)) ([3b0e0a6](https://github.com/catppuccin/tmux/commit/3b0e0a6f0741bf09149f23620516decd7b5f5ba5)) + + +### Code Refactoring + +* change how windows are styled ([79284da](https://github.com/catppuccin/tmux/commit/79284da665bf5d39d304e23df4165c8ac37f9b7a)) + +## [1.0.3](https://github.com/catppuccin/tmux/compare/v1.0.2...v1.0.3) (2024-10-16) + + +### Bug Fixes + +* change the default status line background to mantle ([#377](https://github.com/catppuccin/tmux/issues/377)) ([47dbe81](https://github.com/catppuccin/tmux/commit/47dbe818e3ad7a008ccbd3e5d69a29a4509f7d07)) + +## [1.0.2](https://github.com/catppuccin/tmux/compare/v1.0.1...v1.0.2) (2024-10-12) + + +### Bug Fixes + +* **ci:** update tmux in test workflow ([#370](https://github.com/catppuccin/tmux/issues/370)) ([02debd3](https://github.com/catppuccin/tmux/commit/02debd396802af9fe4b41601739e48ef38217533)) +* **status:** use a literal string for battery_icon so it can be replaced by the battery plugin ([#365](https://github.com/catppuccin/tmux/issues/365)) ([06fff2f](https://github.com/catppuccin/tmux/commit/06fff2f40ec4a5cd2c9e064bc7fde22130ecd4bb)), closes [#342](https://github.com/catppuccin/tmux/issues/342) +* typo in readme config example ([#362](https://github.com/catppuccin/tmux/issues/362)) ([41ee0b8](https://github.com/catppuccin/tmux/commit/41ee0b89acb3f4afe531209558d6b8e4d7d4ae1a)) +* **window:** middle separator colors ([#369](https://github.com/catppuccin/tmux/issues/369)) ([c59df83](https://github.com/catppuccin/tmux/commit/c59df83d68e64feb8d015c2eb3f8b90febc95a53)) + +## [1.0.1](https://github.com/catppuccin/tmux/compare/v1.0.0...v1.0.1) (2024-10-05) + + +### Bug Fixes + +* **readme:** fix the example configurations ([#343](https://github.com/catppuccin/tmux/issues/343)) ([06183b3](https://github.com/catppuccin/tmux/commit/06183b31216b4ed917760b3d59565e242eee6a64)) +* **readme:** fix the version number, and fix escaping in the custom status line module docs ([#357](https://github.com/catppuccin/tmux/issues/357)) ([db466f8](https://github.com/catppuccin/tmux/commit/db466f8c2dbcfdd84e501ee8274bdfdcf049d65d)) + +## [1.0.0](https://github.com/catppuccin/tmux/compare/v0.4.0...v1.0.0) (2024-10-02) + + +### Bug Fixes + +* **readme:** remove -F when setting the status line ([#333](https://github.com/catppuccin/tmux/issues/333)) ([b38421f](https://github.com/catppuccin/tmux/commit/b38421fa15d8dfafecaf6f438115cfe3c1259bf0)) + +## [0.4.0](https://github.com/catppuccin/tmux/compare/v0.3.0...v0.4.0) (2024-10-01) + + +### ⚠ BREAKING CHANGES + +* rewrite to use tmux native rather than bash ([#328](https://github.com/catppuccin/tmux/issues/328)) + +### Bug Fixes + +* **readme:** update the readme to include upgrade instructions ([1bcad05](https://github.com/catppuccin/tmux/commit/1bcad05f206fb4bb9706403da24b97d2cdb64bad)) +* **window:** ensure the window formats are set correctly ([#331](https://github.com/catppuccin/tmux/issues/331)) ([1bcad05](https://github.com/catppuccin/tmux/commit/1bcad05f206fb4bb9706403da24b97d2cdb64bad)) + + +### Code Refactoring + +* rewrite to use tmux native rather than bash ([#328](https://github.com/catppuccin/tmux/issues/328)) ([87fa4a0](https://github.com/catppuccin/tmux/commit/87fa4a08c5a7fdbef3130f05a8b12f0ca26d4a46)) + +## [0.3.0](https://github.com/catppuccin/tmux/compare/v0.2.0...v0.3.0) (2024-09-17) + + +### Features + +* **status:** Add support for status module middle separators ([#310](https://github.com/catppuccin/tmux/issues/310)) ([1612a23](https://github.com/catppuccin/tmux/commit/1612a23174a6771ac466312eb156f83b8b89d907)) +* **status:** window specific separator config ([#198](https://github.com/catppuccin/tmux/issues/198)) ([8276c5a](https://github.com/catppuccin/tmux/commit/8276c5a5e33dbbbae3d370db2f6129e20b402f8a)) + + +### Bug Fixes + +* **kube:** escape env var ([c31b9b2](https://github.com/catppuccin/tmux/commit/c31b9b2c6c7c50abbebd02b80c4fd32b2782a011)) + +## [0.2.0](https://github.com/catppuccin/tmux/compare/v0.1.0...v0.2.0) (2024-08-23) + + +### Features + +* error/warning messages on first load ([#278](https://github.com/catppuccin/tmux/issues/278)) ([a2dda02](https://github.com/catppuccin/tmux/commit/a2dda02b43194aec5deddf2890c28c76b4c11ed4)) +* warn users of whitespace in module lists ([#266](https://github.com/catppuccin/tmux/issues/266)) ([362a306](https://github.com/catppuccin/tmux/commit/362a306db71794f04d0995fc058bcaa094d1af70)) + + +### Bug Fixes + +* add missing batch options `catppuccin_pane{,_active}_border_style` ([3ffbc37](https://github.com/catppuccin/tmux/commit/3ffbc3700b4c1c3e2c4d015c5a51ccef555dabaf)) +* add missing batch options catppuccin_pane{,_active}_border_style ([3ffbc37](https://github.com/catppuccin/tmux/commit/3ffbc3700b4c1c3e2c4d015c5a51ccef555dabaf)) +* escaping in options ([#298](https://github.com/catppuccin/tmux/issues/298)) ([9b57c20](https://github.com/catppuccin/tmux/commit/9b57c2002081fff8af16b878f1369d46788c0409)) +* **pomodoro_plus:** option names ([#273](https://github.com/catppuccin/tmux/issues/273)) ([51dde6e](https://github.com/catppuccin/tmux/commit/51dde6e8d4d3d8da97d915b01594a08aa4ac0cca)) +* warning `[@catppuccin](https://github.com/catppuccin)_flavour` ([#296](https://github.com/catppuccin/tmux/issues/296)) ([a71f3c0](https://github.com/catppuccin/tmux/commit/a71f3c039bed8a7c49fc390a50befec5db2c4af9)) +* warning `[@catppuccin](https://github.com/catppuccin)_window_status` ([9ee1695](https://github.com/catppuccin/tmux/commit/9ee1695d757c16e2f236858b8d3f88be9fb666fa)) + + +### Performance Improvements + +* batch tmux show ([#288](https://github.com/catppuccin/tmux/issues/288)) ([99013fa](https://github.com/catppuccin/tmux/commit/99013fafe6a98416079b3b84751f2eb540e17c79)), closes [#281](https://github.com/catppuccin/tmux/issues/281) +* batch tmux show-options ([3c6f6f2](https://github.com/catppuccin/tmux/commit/3c6f6f282b3bb17554dc2b4b80760b6507acfd65)) + +## [0.1.0](https://github.com/catppuccin/tmux/compare/v0.0.1...v0.1.0) (2024-08-04) + + +### Features + +* releases ([#260](https://github.com/catppuccin/tmux/issues/260)) ([5fbacdf](https://github.com/catppuccin/tmux/commit/5fbacdf3559cf4496eef02aead087b3bb715e570)) diff --git a/config/tmux/plugins/catppuccin/tmux/CONTRIBUTING.md b/config/tmux/plugins/catppuccin/tmux/CONTRIBUTING.md new file mode 100644 index 00000000..c86496f5 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/CONTRIBUTING.md @@ -0,0 +1,40 @@ +# Contributing + +## Design + +To understand our mindset in developing this plugin and how to ensure your +changes align with that mindset, check out the "[Design Philosophy](./docs/explanation/design.md)." + +## Commit messages + +This repository uses [Conventional Commits](https://conventionalcommits.org). +Commit headers should be lowercase. Most commits should include a body that briefly +describes the motivation and content of the commit. + +### Commit types + +- `fix`: A bug fix that doesn't modify the public API +- `feat`: A code change that adds functionality +- `change`: A modification to the public API +- `deprecate`: Something in the public API has been deprecated +- `remove`: A part of the public API has been removed +- `refactor`: A code change that doesn't change behavior +- `style`: A style fix or change +- `docs`: Any change to documentation +- `revert`: A revert commit. The message should describe the reasoning and the + commit should include the `Refs:` footer with the short hashes of the commits + being reverted. +- `chore`: catch-all type + +### Breaking changes + +All breaking changes should be documented in the commit footer in the format +described by Conventional Commits. Use the `!` syntax in order to distinguish +breaking commits in the log, but include the footer to provide a better description +for the changelog generator. + +```text +feat(bar)!: foo the bars + +BREAKING CHANGE: bars are now foo'ed +``` diff --git a/config/tmux/plugins/catppuccin/tmux/LICENSE b/config/tmux/plugins/catppuccin/tmux/LICENSE new file mode 100644 index 00000000..006383b8 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Catppuccin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/config/tmux/plugins/catppuccin/tmux/README.md b/config/tmux/plugins/catppuccin/tmux/README.md new file mode 100644 index 00000000..50eaaaa5 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/README.md @@ -0,0 +1,199 @@ + +

+ Logo
+ + Catppuccin for Tmux + +

+ +

+ + + +

+ +

+ +

+ + +## Themes + +
+🌻 Latte + +![Latte Flavor Preview](./assets/latte.webp) + +
+
+🪴 Frappé + +![Frappe Flavor Preview](./assets/frappe.webp) + +
+
+🌺 Macchiato + +![Macchiato Flavor Preview](./assets/macchiato.webp) + +
+
+🌿 Mocha + +![Mocha Flavor Preview](./assets/mocha.webp) + +
+ +## Installation + +In order to have the icons displayed correctly please use/update your favorite +[nerd font](https://www.nerdfonts.com/font-downloads). +If you do not have a patched font installed, you can override or remove any +icon. Check the [documentation](./docs/reference/configuration.md) on the +options available. + +### Manual (Recommended) + +This method is recommended as TPM has some issues with name conflicts. + + + +1. Clone this repository to your desired location (e.g. + `~/.config/tmux/plugins/catppuccin`). + + ```bash + mkdir -p ~/.config/tmux/plugins/catppuccin + git clone -b v2.1.3 https://github.com/catppuccin/tmux.git ~/.config/tmux/plugins/catppuccin/tmux + ``` + +1. Add the following line to your `tmux.conf` file: + `run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux`. +1. Reload Tmux by either restarting or reloading with `tmux source ~/.tmux.conf`. + + +Check out what to do next in the "[Getting Started Guide](./docs/tutorials/01-getting-started.md)". + +### TPM + + + +1. Install [TPM](https://github.com/tmux-plugins/tpm) +1. Add the Catppuccin plugin: + + ```bash + set -g @plugin 'catppuccin/tmux#v2.1.3' # See https://github.com/catppuccin/tmux/tags for additional tags + # ...alongside + set -g @plugin 'tmux-plugins/tpm' + ``` + +1. (Optional) Set your preferred flavor, it defaults to `"mocha"`: + + ```bash + set -g @catppuccin_flavor 'mocha' # latte, frappe, macchiato or mocha + ``` + + + +> [!IMPORTANT] +> You may have to run `~/.config/tmux/plugins/tpm/bin/clean_plugins` +> if upgrading from an earlier version +> (especially from `v0.3.0`). + +### For TMUX versions prior to 3.2 + +This plugin uses features that were only introduced into tmux in version 3.2. +If you are using a version earlier than this, you can still have lovely +catppuccin colors, the installation method just looks a little different. + +```sh +# In your ~/.tmux.conf + +# Add the colors from the pallete. Check the themes/ directory for all options. + +# Some basic mocha colors. +set -g @ctp_bg "#24273a" +set -g @ctp_surface_1 "#494d64" +set -g @ctp_fg "#cad3f5" +set -g @ctp_mauve "#c6a0f6" +set -g @ctp_crust "#181926" + +# status line +set -gF status-style "bg=#{@ctp_bg},fg=#{@ctp_fg}" + +# windows +set -gF window-status-format "#[bg=#{@ctp_surface_1},fg=#{@ctp_fg}] ##I ##T " +set -gF window-status-current-format "#[bg=#{@ctp_mauve},fg=#{@ctp_crust}] ##I ##T " +``` + +### Upgrading from v0.3 + +Breaking changes have been introduced since 0.3, to understand how to migrate +your configuration, see pinned issue [#487](https://github.com/catppuccin/tmux/issues/487). + +## Recommended Default Configuration + +This configuration shows some customisation options, that can be further +extended as desired. +This is what is used for the previews above. + +![Example configuration](./assets/mocha.webp) + +```bash +# ~/.tmux.conf + +# Options to make tmux more pleasant +set -g mouse on +set -g default-terminal "tmux-256color" + +# Configure the catppuccin plugin +set -g @catppuccin_flavor "mocha" +set -g @catppuccin_window_status_style "rounded" + +# Load catppuccin +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux +# For TPM, instead use `run ~/.tmux/plugins/tmux/catppuccin.tmux` + +# Make the status line pretty and add some modules +set -g status-right-length 100 +set -g status-left-length 100 +set -g status-left "" +set -g status-right "#{E:@catppuccin_status_application}" +set -agF status-right "#{E:@catppuccin_status_cpu}" +set -ag status-right "#{E:@catppuccin_status_session}" +set -ag status-right "#{E:@catppuccin_status_uptime}" +set -agF status-right "#{E:@catppuccin_status_battery}" + +run ~/.config/tmux/plugins/tmux-plugins/tmux-cpu/cpu.tmux +run ~/.config/tmux/plugins/tmux-plugins/tmux-battery/battery.tmux +# Or, if using TPM, just run TPM +``` + +## Documentation + +### Guides + +- [Getting Started](./docs/tutorials/01-getting-started.md) +- [Custom Status Line Segments](./docs/tutorials/02-custom-status.md) +- [Troubleshooting](./docs/guides/troubleshooting.md) + +### Reference + +- [Status Line](./docs/reference/status-line.md) +- [Configuration Options Reference](./docs/reference/configuration.md) +- [Tmux Configuration Showcase](https://github.com/catppuccin/tmux/discussions/317) + +## 💝 Thanks to + +- [Pocco81](https://github.com/Pocco81) +- [vinnyA3](https://github.com/vinnyA3) +- [rogeruiz](https://github.com/rogeruiz) +- [kales](https://github.com/kjnsn) + +  + + +

+

+

Copyright © 2021-present Catppuccin Org +

+ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/config1.png b/config/tmux/plugins/catppuccin/tmux/assets/config1.png new file mode 100644 index 00000000..6eede6d8 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/config1.png differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/config2.png b/config/tmux/plugins/catppuccin/tmux/assets/config2.png new file mode 100644 index 00000000..56958902 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/config2.png differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/config3.png b/config/tmux/plugins/catppuccin/tmux/assets/config3.png new file mode 100644 index 00000000..e7a5af45 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/config3.png differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.conf b/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.conf new file mode 100644 index 00000000..47d811cc --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.conf @@ -0,0 +1,13 @@ +set -g @catppuccin_flavor 'frappe' + +run "#{d:current_file}/../../catppuccin.tmux" + +# Make the status line more pleasant. +set -g status-left "" +set -g status-right '#[fg=#{@thm_crust},bg=#{@thm_teal}] session: #S ' + +# Ensure that everything on the right side of the status line +# is included. +set -g status-right-length 100 + +set -g default-shell '/opt/homebrew/bin/fish' diff --git a/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.gif b/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.gif new file mode 100644 index 00000000..5252409d Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.gif differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.tape b/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.tape new file mode 100644 index 00000000..cdf20028 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/assets/demos/basic.tape @@ -0,0 +1,19 @@ +Output assets/demos/basic.gif + +Require echo +Require tmux + +Set Shell "bash" +Set FontSize 30 +Set FontFamily "SFMono Nerd Font" +Set Width 1200 +Set Height 600 + +Type "tmux -f assets/demos/basic.conf" Sleep 500ms Enter + +Sleep 3s + +Ctrl+b +Type "c" + +Sleep 5s diff --git a/config/tmux/plugins/catppuccin/tmux/assets/example-config.webp b/config/tmux/plugins/catppuccin/tmux/assets/example-config.webp new file mode 100644 index 00000000..73d997ca Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/example-config.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/frappe.webp b/config/tmux/plugins/catppuccin/tmux/assets/frappe.webp new file mode 100644 index 00000000..dd7f339b Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/frappe.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/generate_preview.fish b/config/tmux/plugins/catppuccin/tmux/assets/generate_preview.fish new file mode 100644 index 00000000..b659dee8 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/assets/generate_preview.fish @@ -0,0 +1,11 @@ +set -l flavors latte frappe macchiato mocha + +for flavor in $flavors + magick $flavor.webp -crop '1320x50+0+464' +repage $flavor-crop.webp +end + +catwalk {latte,frappe,macchiato,mocha}-crop.webp --output preview.webp --layout column + +for flavor in $flavors + rm $flavor-crop.webp +end diff --git a/config/tmux/plugins/catppuccin/tmux/assets/latte.webp b/config/tmux/plugins/catppuccin/tmux/assets/latte.webp new file mode 100644 index 00000000..3a5fe134 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/latte.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/macchiato.webp b/config/tmux/plugins/catppuccin/tmux/assets/macchiato.webp new file mode 100644 index 00000000..f752424a Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/macchiato.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/mocha.webp b/config/tmux/plugins/catppuccin/tmux/assets/mocha.webp new file mode 100644 index 00000000..49f447a0 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/mocha.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/preview.webp b/config/tmux/plugins/catppuccin/tmux/assets/preview.webp new file mode 100644 index 00000000..97d75de4 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/preview.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/ram-example.webp b/config/tmux/plugins/catppuccin/tmux/assets/ram-example.webp new file mode 100644 index 00000000..9bbf4e79 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/ram-example.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/structure.svg b/config/tmux/plugins/catppuccin/tmux/assets/structure.svg new file mode 100644 index 00000000..fa0878b2 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/assets/structure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config/tmux/plugins/catppuccin/tmux/assets/window-basic.webp b/config/tmux/plugins/catppuccin/tmux/assets/window-basic.webp new file mode 100644 index 00000000..19b5f439 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/window-basic.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/window-none.webp b/config/tmux/plugins/catppuccin/tmux/assets/window-none.webp new file mode 100644 index 00000000..cedbdec2 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/window-none.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/window-rounded.webp b/config/tmux/plugins/catppuccin/tmux/assets/window-rounded.webp new file mode 100644 index 00000000..9c746b10 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/window-rounded.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/assets/window-slanted.webp b/config/tmux/plugins/catppuccin/tmux/assets/window-slanted.webp new file mode 100644 index 00000000..ecb751f8 Binary files /dev/null and b/config/tmux/plugins/catppuccin/tmux/assets/window-slanted.webp differ diff --git a/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux b/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux new file mode 100755 index 00000000..40050ba2 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Set path of script +PLUGIN_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +tmux source "${PLUGIN_DIR}/catppuccin_options_tmux.conf" +tmux source "${PLUGIN_DIR}/catppuccin_tmux.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/catppuccin_options_tmux.conf b/config/tmux/plugins/catppuccin/tmux/catppuccin_options_tmux.conf new file mode 100644 index 00000000..0cb51aae --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/catppuccin_options_tmux.conf @@ -0,0 +1,70 @@ +# All options and their defaults. +# +# This is executed separately to the main configuration +# so that options are set before parsing the rest of the config. + +set -ogq @catppuccin_flavor "mocha" + +set -ogq @catppuccin_status_background "default" + +# Menu styling options +set -ogq @catppuccin_menu_selected_style "fg=#{@thm_fg},bold,bg=#{@thm_overlay_0}" + +# Pane styling options +set -ogq @catppuccin_pane_status_enabled "no" # set to "yes" to enable +set -ogq @catppuccin_pane_border_status "off" # set to "yes" to enable +set -ogq @catppuccin_pane_border_style "fg=#{@thm_overlay_0}" +set -ogq @catppuccin_pane_active_border_style "##{?pane_in_mode,fg=#{@thm_lavender},##{?pane_synchronized,fg=#{@thm_mauve},fg=#{@thm_lavender}}}" +set -ogq @catppuccin_pane_left_separator "█" +set -ogq @catppuccin_pane_middle_separator "█" +set -ogq @catppuccin_pane_right_separator "█" +set -ogq @catppuccin_pane_color "#{@thm_green}" +set -ogq @catppuccin_pane_background_color "#{@thm_surface_0}" +set -ogq @catppuccin_pane_default_text "##{b:pane_current_path}" +set -ogq @catppuccin_pane_default_fill "number" +set -ogq @catppuccin_pane_number_position "left" # right, left + +# NOTE: Changes to make the option names more intuitive and more closely follow +# the tmux naming conventions. +# @catppuccin_window_current_background -> @catppuccin_window_current_number_color +# @catppuccin_window_current_color -> @catppuccin_window_current_text_color +# @catppuccin_window_default_background -> @catppuccin_window_number_color +# @catppuccin_window_default_color -> @catppuccin_window_text_color +# @catppuccin_window_status -> @catppuccin_window_flags +# +# Removed: +# @catppuccin_window_default_fill, @catppuccin_window_current_fill +# Just set the number and text colors. + +# Window options +set -ogq @catppuccin_window_status_style "basic" # basic, rounded, slanted, custom, or none +set -ogq @catppuccin_window_text_color "#{@thm_surface_0}" +set -ogq @catppuccin_window_number_color "#{@thm_overlay_2}" +set -ogq @catppuccin_window_text " #T" +set -ogq @catppuccin_window_number "#I" +set -ogq @catppuccin_window_current_text_color "#{@thm_surface_1}" +set -ogq @catppuccin_window_current_number_color "#{@thm_mauve}" +set -ogq @catppuccin_window_current_text " #T" +set -ogq @catppuccin_window_current_number "#I" +set -ogq @catppuccin_window_number_position "left" + +# Window flags +set -ogq @catppuccin_window_flags "none" +set -ogq @catppuccin_window_flags_icon_last " 󰖰" # - +set -ogq @catppuccin_window_flags_icon_current " 󰖯" # * +set -ogq @catppuccin_window_flags_icon_zoom " 󰁌" # Z +set -ogq @catppuccin_window_flags_icon_mark " 󰃀" # M +set -ogq @catppuccin_window_flags_icon_silent " 󰂛" # ~ +set -ogq @catppuccin_window_flags_icon_activity " 󱅫" # # +set -ogq @catppuccin_window_flags_icon_bell " 󰂞" # ! +# Matches icon order when using `#F` (`#!~[*-]MZ`) +set -ogq @catppuccin_window_flags_icon_format "##{?window_activity_flag,#{E:@catppuccin_window_flags_icon_activity},}##{?window_bell_flag,#{E:@catppuccin_window_flags_icon_bell},}##{?window_silence_flag,#{E:@catppuccin_window_flags_icon_silent},}##{?window_active,#{E:@catppuccin_window_flags_icon_current},}##{?window_last_flag,#{E:@catppuccin_window_flags_icon_last},}##{?window_marked_flag,#{E:@catppuccin_window_flags_icon_mark},}##{?window_zoomed_flag,#{E:@catppuccin_window_flags_icon_zoom},} " + +# Status line options +set -ogq @catppuccin_status_left_separator "" +set -ogq @catppuccin_status_middle_separator "" +set -ogq @catppuccin_status_right_separator " " +set -ogq @catppuccin_status_connect_separator "yes" # yes, no + +# Maintain backwards compatibility. Use @catppuccin_status_module_bg_color if it is set. +set -ogq @catppuccin_status_module_text_bg "#{?@catppuccin_status_module_bg_color,#{E:@catppuccin_status_module_bg_color},#{@thm_surface_0}}" diff --git a/config/tmux/plugins/catppuccin/tmux/catppuccin_tmux.conf b/config/tmux/plugins/catppuccin/tmux/catppuccin_tmux.conf new file mode 100644 index 00000000..ffa8d0de --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/catppuccin_tmux.conf @@ -0,0 +1,223 @@ +source -F "#{d:current_file}/themes/catppuccin_#{@catppuccin_flavor}_tmux.conf" + +%if "#{==:#{@catppuccin_status_background},default}" + set -gF @_ctp_status_bg "#{@thm_mantle}" + set -gF status-style "bg=#{@_ctp_status_bg},fg=#{@thm_fg}" + + %hidden CTP_MESSAGE_BACKGROUND="#{@thm_overlay_0}" +%elif "#{==:#{@catppuccin_status_background},none}" + set -g status-style "default" + set -g @_ctp_status_bg "none" + + %hidden CTP_MESSAGE_BACKGROUND="default" +%else + # Treat @catppuccin_status_background as a format string. + set -gF status-style "bg=#{E:@catppuccin_status_background},fg=#{@thm_fg}" + set -gF @_ctp_status_bg "#{E:@catppuccin_status_background}" + + %hidden CTP_MESSAGE_BACKGROUND="#{E:@catppuccin_status_background}" +%endif + +source -F "#{d:current_file}/status/application.conf" +source -F "#{d:current_file}/status/battery.conf" +source -F "#{d:current_file}/status/clima.conf" +source -F "#{d:current_file}/status/cpu.conf" +source -F "#{d:current_file}/status/date_time.conf" +source -F "#{d:current_file}/status/directory.conf" +source -F "#{d:current_file}/status/gitmux.conf" +source -F "#{d:current_file}/status/host.conf" +source -F "#{d:current_file}/status/kube.conf" +source -F "#{d:current_file}/status/load.conf" +source -F "#{d:current_file}/status/pomodoro_plus.conf" +source -F "#{d:current_file}/status/session.conf" +source -F "#{d:current_file}/status/uptime.conf" +source -F "#{d:current_file}/status/user.conf" +source -F "#{d:current_file}/status/weather.conf" + +# messages +set -gF message-style "fg=#{@thm_teal},bg=$CTP_MESSAGE_BACKGROUND,align=centre" +set -gF message-command-style "fg=#{@thm_teal},bg=$CTP_MESSAGE_BACKGROUND,align=centre" + +# menu +%if "#{>=:#{version},3.4}" + set -gF menu-selected-style "#{E:@catppuccin_menu_selected_style}" +%endif + +# panes +set -wgF pane-active-border-style "#{E:@catppuccin_pane_active_border_style}" +set -wgF pane-border-style "#{E:@catppuccin_pane_border_style}" + +%if "#{==:#{@catppuccin_pane_status_enabled},yes}" + # "internal" variables are kept as @_ctp_p_.* + # and then unset at the end. + set -gq @_ctp_p_left "" # the content on the left, usually a separator + set -gq @_ctp_p_middle "" + set -gq @_ctp_p_right "" + set -gq @_ctp_p_number "" + set -gq @_ctp_p_text "" + + %if "#{==:#{@catppuccin_pane_default_fill},none}" + set -g @_ctp_p_left \ + "#[fg=#{@thm_surface_0},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_middle \ + "#[fg=#{@thm_fg},bg=#{@thm_surface_0}]#{@catppuccin_pane_middle_separator}" + set -g @_ctp_p_right \ + "#[fg=#{@thm_surface_0},bg=default]#{@catppuccin_pane_right_separator}" + + set -g @_ctp_p_number \ + "#[fg=#{@thm_fg},bg=#{@thm_surface_0}]##{pane_index}" + set -g @_ctp_p_text \ + "#[fg=#{@thm_fg},bg=#{@thm_surface_0}]#{E:@catppuccin_pane_default_text}" + + %elif "#{==:#{@catppuccin_pane_default_fill},all}" + + set -g @_ctp_p_left \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_middle \ + "#[fg=#{E:@catppuccin_pane_color},bg=#{E:@catppuccin_pane_background_color}]#{@catppuccin_pane_middle_separator}" + set -g @_ctp_p_right \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_right_separator}" + + set -g @_ctp_p_number \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=#{E:@catppuccin_pane_color}]##{pane_index}" + set -g @_ctp_p_text \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=#{E:@catppuccin_pane_color}]#{E:@catppuccin_pane_default_text}" + + %elif "#{==:#{@catppuccin_pane_default_fill},number}" + + %if "#{==:#{@catppuccin_pane_number_position},left}" + set -g @_ctp_p_left \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_right \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=default]#{@catppuccin_pane_right_separator}" + %else + set -g @_ctp_p_left \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=default]#{@catppuccin_pane_left_separator}" + set -g @_ctp_p_right \ + "#[fg=#{E:@catppuccin_pane_color},bg=default]#{@catppuccin_pane_right_separator}" + %endif + + set -g @_ctp_p_middle \ + "#[fg=#{E:@catppuccin_pane_color},bg=#{E:@catppuccin_pane_background_color}]#{@catppuccin_pane_middle_separator}" + + set -g @_ctp_p_number \ + "#[fg=#{E:@catppuccin_pane_background_color},bg=#{E:@catppuccin_pane_color}]##{pane_index}" + set -g @_ctp_p_text \ + "#[fg=#{E:@catppuccin_pane_color},bg=#{E:@catppuccin_pane_background_color}]#{E:@catppuccin_pane_default_text}" + + %endif + + %if "#{==:#{@catppuccin_pane_number_position},left}" + set -wgF pane-border-format \ + "#{E:@_ctp_p_left}#{E:@_ctp_p_number}#{E:@_ctp_p_middle} #{E:@_ctp_p_text}#{E:@_ctp_p_right}" + %else + set -wgF pane-border-format \ + "#{E:@_ctp_p_left}#{E:@_ctp_p_text} #{E:@_ctp_p_middle}#{E:@_ctp_p_number}#{E:@_ctp_p_right}" + %endif + + set -ug @_ctp_p_left + set -ug @_ctp_p_middle + set -ug @_ctp_p_right + set -ug @_ctp_p_number + set -ug @_ctp_p_text +%endif + +# popups +%if "#{>=:#{version},3.4}" + set -gF popup-style "bg=#{@thm_bg},fg=#{@thm_fg}" + set -gF popup-border-style "fg=#{@thm_surface_1}" +%endif + +%if "#{==:#{@catppuccin_window_status_style},basic}" + + set -gq @catppuccin_window_left_separator " " + set -gq @catppuccin_window_middle_separator " " + set -gq @catppuccin_window_right_separator " " + +%elif "#{==:#{@catppuccin_window_status_style},rounded}" + + set -gq @catppuccin_window_left_separator "#[fg=#{@_ctp_status_bg},reverse]#[none]" + set -gq @catppuccin_window_middle_separator " " + set -gq @catppuccin_window_right_separator "#[fg=#{@_ctp_status_bg},reverse]#[none]" + +%elif "#{==:#{@catppuccin_window_status_style},slanted}" + + set -gq @catppuccin_window_left_separator "#[fg=#{@_ctp_status_bg},reverse]#[none]" + + %if "#{==:#{@catppuccin_window_number_position},left}" + set -gq @catppuccin_window_middle_separator "#[fg=#{@catppuccin_window_number_color},bg=#{@catppuccin_window_text_color}]" + set -gq @catppuccin_window_current_middle_separator \ + "#[fg=#{@catppuccin_window_current_number_color},bg=#{@catppuccin_window_current_text_color}]" + %else + set -gq @catppuccin_window_middle_separator " #[fg=#{@catppuccin_window_number_color},bg=#{@catppuccin_window_text_color}]" + set -gq @catppuccin_window_current_middle_separator \ + " #[fg=#{@catppuccin_window_current_number_color},bg=#{@catppuccin_window_current_text_color}]" + %endif + + set -gq @catppuccin_window_right_separator "#[fg=#{@_ctp_status_bg},reverse]█#[none]" + +%endif + +set -ogqF @catppuccin_window_current_left_separator "#{@catppuccin_window_left_separator}" +set -ogqF @catppuccin_window_current_middle_separator "#{@catppuccin_window_middle_separator}" +set -ogqF @catppuccin_window_current_right_separator "#{@catppuccin_window_right_separator}" + +# window status +%if "#{!=:#{@catppuccin_window_status_style},none}" + set -gF window-status-activity-style "bg=#{@thm_lavender},fg=#{@thm_crust}" + set -gF window-status-bell-style "bg=#{@thm_yellow},fg=#{@thm_crust}" + + %if "#{==:#{@catppuccin_window_flags},icon}" + set -gqF @_ctp_w_flags "#{E:@catppuccin_window_flags_icon_format}" + %elif "#{==:#{@catppuccin_window_flags},text}" + set -gq @_ctp_w_flags "#F" + %else + set -gq @_ctp_w_flags "" + %endif + + set -g @_ctp_w_number_style "#[fg=#{@thm_crust},bg=#{@catppuccin_window_number_color}]" + set -g @_ctp_w_text_style "#[fg=#{@thm_fg},bg=#{@catppuccin_window_text_color}]" + %if "#{==:#{@catppuccin_window_number_position},left}" + set -gF window-status-format \ + "#{E:@_ctp_w_number_style}#{E:@catppuccin_window_left_separator}#{@catppuccin_window_number}" + set -agF window-status-format "#{E:@catppuccin_window_middle_separator}" + set -agF window-status-format \ + "#{E:@_ctp_w_text_style}#{@catppuccin_window_text}#{@_ctp_w_flags}#{E:@catppuccin_window_right_separator}" + %else + set -gF window-status-format \ + "#{E:@_ctp_w_text_style}#{E:@catppuccin_window_left_separator}#{E:@_ctp_w_text_style}#{@catppuccin_window_text}#{@_ctp_w_flags}" + set -agF window-status-format "#{E:@catppuccin_window_middle_separator}" + set -agF window-status-format \ + "#{E:@_ctp_w_number_style} #{@catppuccin_window_number}#{E:@catppuccin_window_right_separator}" + %endif + + # ======================================= + # And do the same for the current window. + # ======================================= + + set -g @_ctp_w_number_style "#[fg=#{@thm_crust},bg=#{@catppuccin_window_current_number_color}]" + set -g @_ctp_w_text_style "#[fg=#{@thm_fg},bg=#{@catppuccin_window_current_text_color}]" + %if "#{==:#{@catppuccin_window_number_position},left}" + set -gF window-status-current-format \ + "#{E:@_ctp_w_number_style}#{E:@catppuccin_window_current_left_separator}#{@catppuccin_window_current_number}" + set -agF window-status-current-format "#{E:@catppuccin_window_current_middle_separator}" + set -agF window-status-current-format \ + "#{E:@_ctp_w_text_style}#{@catppuccin_window_current_text}#{@_ctp_w_flags}#{E:@catppuccin_window_current_right_separator}" + %else + set -gF window-status-current-format \ + "#{E:@_ctp_w_text_style}#{E:@catppuccin_window_current_left_separator}#{E:@_ctp_w_text_style}#{@catppuccin_window_current_text}#{@_ctp_w_flags}" + set -agF window-status-current-format "#{E:@catppuccin_window_current_middle_separator}" + set -agF window-status-current-format \ + "#{E:@_ctp_w_number_style} #{@catppuccin_window_current_number}#{E:@catppuccin_window_current_right_separator}" + %endif + + + # Cleanup (unset) all of the internal variables. + set -ug @_ctp_w_number_style + set -ug @_ctp_w_text_style + set -ug @_ctp_w_flags +%endif + +# Mode style. This is used for copy mode highlighting to style the current selection. +set -gF mode-style "bg=#{@thm_surface_0},bold" +set -gF clock-mode-colour "#{@thm_blue}" diff --git a/config/tmux/plugins/catppuccin/tmux/renovate.json b/config/tmux/plugins/catppuccin/tmux/renovate.json new file mode 100644 index 00000000..a2220005 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "local>catppuccin/renovate-config" + ] +} diff --git a/config/tmux/plugins/catppuccin/tmux/run_tests.sh b/config/tmux/plugins/catppuccin/tmux/run_tests.sh new file mode 100755 index 00000000..3e4bc05c --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/run_tests.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -Eeuo pipefail + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) + +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/default_options.sh --expected "${script_dir}"/tests/default_options_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/window_status_styling.sh --expected "${script_dir}"/tests/window_status_styling_expected.txt "$@" + +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/application_module.sh --expected "${script_dir}"/tests/application_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/battery_module.sh --expected "${script_dir}"/tests/battery_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/cpu_module.sh --expected "${script_dir}"/tests/cpu_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/load_module.sh --expected "${script_dir}"/tests/load_module_expected.txt "$@" +"${script_dir}"/tests/harness.sh --test "${script_dir}"/tests/pane_styling.sh --expected "${script_dir}"/tests/pane_styling_expected.txt "$@" diff --git a/config/tmux/plugins/catppuccin/tmux/status/application.conf b/config/tmux/plugins/catppuccin/tmux/status/application.conf new file mode 100644 index 00000000..16753eda --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/application.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="application" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_maroon}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{pane_current_command}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/battery.conf b/config/tmux/plugins/catppuccin/tmux/status/battery.conf new file mode 100644 index 00000000..090bb736 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/battery.conf @@ -0,0 +1,22 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="battery" + +set -ogq @batt_icon_charge_tier8 "󰁹" +set -ogq @batt_icon_charge_tier7 "󰂁" +set -ogq @batt_icon_charge_tier6 "󰁿" +set -ogq @batt_icon_charge_tier5 "󰁾" +set -ogq @batt_icon_charge_tier4 "󰁽" +set -ogq @batt_icon_charge_tier3 "󰁼" +set -ogq @batt_icon_charge_tier2 "󰁻" +set -ogq @batt_icon_charge_tier1 "󰁺" +set -ogq @batt_icon_status_charged "󰚥" +set -ogq @batt_icon_status_charging "󰂄" +set -ogq @batt_icon_status_discharging "󰂃" +set -ogq @batt_icon_status_unknown "󰂑" +set -ogq @batt_icon_status_attached "󱈑" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "#{l:#{battery_icon}} " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_lavender}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{battery_percentage}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/clima.conf b/config/tmux/plugins/catppuccin/tmux/status/clima.conf new file mode 100644 index 00000000..36900d62 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/clima.conf @@ -0,0 +1,9 @@ +# vim:set ft=tmux: +# Requires https://github.com/vascomfnunes/tmux-clima +%hidden MODULE_NAME="clima" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_yellow}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{clima}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/cpu.conf b/config/tmux/plugins/catppuccin/tmux/status/cpu.conf new file mode 100644 index 00000000..ecae5c4c --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/cpu.conf @@ -0,0 +1,18 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="cpu" + +set -ogq @cpu_low_fg_color "#{E:@thm_fg}" +set -ogq @cpu_medium_fg_color "#{E:@thm_fg}" +set -ogq @cpu_high_fg_color "#{E:@thm_crust}" + +set -ogq @cpu_low_bg_color "#{E:@catppuccin_status_module_text_bg}" +set -ogq @cpu_medium_bg_color "#{E:@catppuccin_status_module_text_bg}" +set -ogq @cpu_high_bg_color "#{E:@thm_red}" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_yellow}" +set -ogq "@catppuccin_status_${MODULE_NAME}_text_fg" "#{l:#{cpu_fg_color}}" +set -ogq "@catppuccin_status_${MODULE_NAME}_text_bg" "#{l:#{cpu_bg_color}}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{cpu_percentage}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/date_time.conf b/config/tmux/plugins/catppuccin/tmux/status/date_time.conf new file mode 100644 index 00000000..7d094951 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/date_time.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="date_time" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰃰 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_sapphire}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " %Y-%m-%d %H:%M" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/directory.conf b/config/tmux/plugins/catppuccin/tmux/status/directory.conf new file mode 100644 index 00000000..55dacd18 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/directory.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="directory" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_rosewater}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{b:pane_current_path}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/gitmux.conf b/config/tmux/plugins/catppuccin/tmux/status/gitmux.conf new file mode 100644 index 00000000..233ab0e4 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/gitmux.conf @@ -0,0 +1,9 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="gitmux" + +# Requires https://github.com/arl/gitmux +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰊢 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_teal}" +set -gq "@catppuccin_${MODULE_NAME}_text" ' #(gitmux -cfg $HOME/.gitmux.conf "#{pane_current_path}")' + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/host.conf b/config/tmux/plugins/catppuccin/tmux/status/host.conf new file mode 100644 index 00000000..c78c1a9d --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/host.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="host" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰒋 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_mauve}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #H" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/kube.conf b/config/tmux/plugins/catppuccin/tmux/status/kube.conf new file mode 100644 index 00000000..f2fef85e --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/kube.conf @@ -0,0 +1,13 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="kube" + +# Requires https://github.com/jonmosco/kube-tmux + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󱃾 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_blue}" +set -ogqF "@catppuccin_kube_context_color" "#{E:@thm_red}" +set -ogqF "@catppuccin_kube_namespace_color" "#{E:@thm_sky}" +set -ogq "@catppuccin_${MODULE_NAME}_text" \ + " #(\${TMUX_PLUGIN_MANAGER_PATH}kube-tmux/kube.tmux 250 #{@catppuccin_kube_context_color} #{@catppuccin_kube_namespace_color})" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/load.conf b/config/tmux/plugins/catppuccin/tmux/status/load.conf new file mode 100644 index 00000000..0cb6a960 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/load.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="load" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" "󰊚 " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_blue}" +set -ogq "@catppuccin_${MODULE_NAME}_text" "#{l:#(uptime | awk '{split(substr($0, index($0, \"load\")), a, \":\"); print a[2]\}}')" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/pomodoro_plus.conf b/config/tmux/plugins/catppuccin/tmux/status/pomodoro_plus.conf new file mode 100644 index 00000000..bc17e26e --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/pomodoro_plus.conf @@ -0,0 +1,9 @@ +# vim:set ft=tmux: +# Requires https://github.com/olimorris/tmux-pomodoro-plus +%hidden MODULE_NAME="pomodoro_plus" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogqF "@catppuccin_${MODULE_NAME}_color" "#{E:@thm_peach}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #{l:#{pomodoro_status}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/session.conf b/config/tmux/plugins/catppuccin/tmux/status/session.conf new file mode 100644 index 00000000..50f878d2 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/session.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="session" + +set -ogq "@catppuccin_${MODULE_NAME}_icon" " " +set -ogq "@catppuccin_${MODULE_NAME}_color" "#{?client_prefix,#{E:@thm_red},#{E:@thm_green}}" +set -ogq "@catppuccin_${MODULE_NAME}_text" " #S" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/uptime.conf b/config/tmux/plugins/catppuccin/tmux/status/uptime.conf new file mode 100644 index 00000000..c86787fb --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/uptime.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="uptime" + +set -ogq @catppuccin_uptime_icon "󰔟 " +set -ogqF @catppuccin_uptime_color "#{E:@thm_sapphire}" +set -ogq @catppuccin_uptime_text " #(uptime | sed 's/^[^,]*up *//; s/, *[[:digit:]]* user.*//; s/ day.*, */d /; s/ hr\\(s*\\).*/h/; s/ min\\(s*\\).*/m/; s/ sec\\(s*\\).*/s/; s/\\([0-9]\\{1,2\\}\\):\\([0-9]\\{1,2\\}\\)/\\1h \\2m/;')" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/user.conf b/config/tmux/plugins/catppuccin/tmux/status/user.conf new file mode 100644 index 00000000..85e6130a --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/user.conf @@ -0,0 +1,8 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="user" + +set -ogq @catppuccin_user_icon " " +set -ogqF @catppuccin_user_color "#{E:@thm_sky}" +set -ogq @catppuccin_user_text " #(whoami)" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/status/weather.conf b/config/tmux/plugins/catppuccin/tmux/status/weather.conf new file mode 100644 index 00000000..b55146c8 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/status/weather.conf @@ -0,0 +1,10 @@ +# vim:set ft=tmux: +%hidden MODULE_NAME="weather" + +# Requires https://github.com/xamut/tmux-weather. + +set -ogq @catppuccin_weather_icon " " +set -ogqF @catppuccin_weather_color "#{E:@thm_yellow}" +set -ogq @catppuccin_weather_text " #{l:#{weather}}" + +source -F "#{d:current_file}/../utils/status_module.conf" diff --git a/config/tmux/plugins/catppuccin/tmux/tests/application_module.sh b/config/tmux/plugins/catppuccin/tmux/tests/application_module.sh new file mode 100644 index 00000000..81592202 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/application_module.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option @catppuccin_status_application | grep -q "@thm_" && + echo "@catppuccin_status_application did not expand all colors" + +print_option @catppuccin_status_application | sed -E 's/(bash|fish|zsh)//' diff --git a/config/tmux/plugins/catppuccin/tmux/tests/application_module_expected.txt b/config/tmux/plugins/catppuccin/tmux/tests/application_module_expected.txt new file mode 100644 index 00000000..75f40826 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/application_module_expected.txt @@ -0,0 +1 @@ +@catppuccin_status_application #[fg=#eba0ac]#[fg=#11111b,bg=#eba0ac] #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_application_text}#[fg=#313244] diff --git a/config/tmux/plugins/catppuccin/tmux/tests/battery_module.sh b/config/tmux/plugins/catppuccin/tmux/tests/battery_module.sh new file mode 100644 index 00000000..92439596 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/battery_module.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option @catppuccin_status_battery diff --git a/config/tmux/plugins/catppuccin/tmux/tests/battery_module_expected.txt b/config/tmux/plugins/catppuccin/tmux/tests/battery_module_expected.txt new file mode 100644 index 00000000..c29e485f --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/battery_module_expected.txt @@ -0,0 +1 @@ +@catppuccin_status_battery #[fg=#b4befe]#[fg=#11111b,bg=#b4befe]#{l:#{battery_icon}} #[fg=#cdd6f4,bg=#313244]#{E:@catppuccin_battery_text}#[fg=#313244] diff --git a/config/tmux/plugins/catppuccin/tmux/tests/cpu_module.sh b/config/tmux/plugins/catppuccin/tmux/tests/cpu_module.sh new file mode 100644 index 00000000..f6d30cca --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/cpu_module.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option E:@catppuccin_status_cpu diff --git a/config/tmux/plugins/catppuccin/tmux/tests/cpu_module_expected.txt b/config/tmux/plugins/catppuccin/tmux/tests/cpu_module_expected.txt new file mode 100644 index 00000000..61695f5a --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/cpu_module_expected.txt @@ -0,0 +1 @@ +E:@catppuccin_status_cpu #[fg=#f9e2af]#[fg=#11111b,bg=#f9e2af] #[fg=#{cpu_fg_color},bg=#{cpu_bg_color}] #{cpu_percentage}#[fg=#{cpu_bg_color}] diff --git a/config/tmux/plugins/catppuccin/tmux/tests/default_options.sh b/config/tmux/plugins/catppuccin/tmux/tests/default_options.sh new file mode 100755 index 00000000..9d94c0ed --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/default_options.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option @catppuccin_flavor +print_option @catppuccin_menu_selected_style +print_option @catppuccin_pane_active_border_style diff --git a/config/tmux/plugins/catppuccin/tmux/tests/default_options_expected.txt b/config/tmux/plugins/catppuccin/tmux/tests/default_options_expected.txt new file mode 100644 index 00000000..4544de4c --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/default_options_expected.txt @@ -0,0 +1,3 @@ +@catppuccin_flavor mocha +@catppuccin_menu_selected_style fg=#{@thm_fg},bold,bg=#{@thm_overlay_0} +@catppuccin_pane_active_border_style ##{?pane_in_mode,fg=#{@thm_lavender},##{?pane_synchronized,fg=#{@thm_mauve},fg=#{@thm_lavender}}} diff --git a/config/tmux/plugins/catppuccin/tmux/tests/harness.sh b/config/tmux/plugins/catppuccin/tmux/tests/harness.sh new file mode 100755 index 00000000..ed76b968 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/harness.sh @@ -0,0 +1,153 @@ +#!/usr/bin/env bash + +set -Euo pipefail +trap cleanup SIGINT SIGTERM ERR EXIT + +usage() { + trap - EXIT + cat <&2 -e "${1-}" +} + +msg_verbose() { + if [ "$VERBOSE" = true ]; then + msg "$@" + fi +} + +SOCKET_NAME="${SOCKET_NAME:-test}" +SESSION_NAME="test-session" + +tmux() { + command tmux -L "$SOCKET_NAME" -f /dev/null "$@" +} + +start_tmux_server() { + msg_verbose "${CYAN}Starting tmux server on socket ${SOCKET_NAME}${NOFORMAT}" + tmux new -s "$SESSION_NAME" -d "$(which bash)" +} + +kill_tmux_server() { + msg_verbose "${CYAN}Stopping tmux server${NOFORMAT}" + tmux kill-session "$SESSION_NAME" 2>/dev/null + tmux kill-server 2>/dev/null +} + +cleanup() { + trap - SIGINT SIGTERM ERR EXIT + + # If the session is still running then stop it. + tmux has-session -t "$SESSION_NAME" 2>/dev/null + if test $? -eq 0; then + kill_tmux_server + fi +} + +die() { + local msg=$1 + local code=${2-1} # default exit status 1 + msg "$msg" + + cleanup + + exit "$code" +} + +parse_params() { + # default values of variables set from params + test_script='' + expected_output='' + + while :; do + case "${1-}" in + -h | --help) usage ;; + --no-color) NO_COLOR=1 ;; + -t | --test) + test_script="${2-}" + shift + ;; + -e | --expected) + expected_output="${2-}" + shift + ;; + -v | --verbose) + VERBOSE=true + shift + ;; + -?*) die "Unknown option: $1" ;; + *) break ;; + esac + shift + done + + # shellcheck disable=SC2034 + args=("$@") + + # check required params and arguments + [[ -z "${test_script-}" ]] && die "Missing required parameter: -t|--test" + [[ -z "${expected_output-}" ]] && die "Missing required parameter: -e|--expected" + + return 0 +} + +parse_params "$@" +setup_colors + +run_test() { + msg_verbose "Running test ${test_script} and checking the output against ${expected_output}" + + start_tmux_server + + local script_name + script_name=$(basename "${test_script}") + + local output + # shellcheck disable=SC1090 + output=$(source "${test_script}") + test_exit_code="$?" + + if test $test_exit_code -ne 0; then + die "\n${RED}Test ${script_name} exited with code $test_exit_code ${NOFORMAT}" + fi + + echo -e "${output}" | diff -abB --color=${DIFFCOLORS} "${expected_output}" - + + if test $? -eq 0; then + msg "${GREEN}Test ${script_name} passed${NOFORMAT}" + else + die "\n${RED}Test ${script_name} failed${NOFORMAT}" + fi + + cleanup +} + +run_test diff --git a/config/tmux/plugins/catppuccin/tmux/tests/helpers.sh b/config/tmux/plugins/catppuccin/tmux/tests/helpers.sh new file mode 100644 index 00000000..38ae83cf --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/helpers.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Returns the value of given tmux option. +# First argument is the option name, e.g. @catppuccin_flavor. +# +# Usage: `get_option @catppuccin_flavor` +# Would return: `mocha` +# +# The option is given as a format string. +get_option() { + local option + option=$1 + + tmux display-message -p "#{${option}}" +} + +# Prints the given tmux option to stdout. +# First argument is the option name, e.g. @catppuccin_flavor. +# +# Usage: `print_option @catppuccin_flavor` +# Would print: `@catppuccin_flavor mocha` +# +# The option is given as a format string. +print_option() { + local option + option=$1 + + printf "\n%s " "${option}" + get_option "$option" +} diff --git a/config/tmux/plugins/catppuccin/tmux/tests/load_module.sh b/config/tmux/plugins/catppuccin/tmux/tests/load_module.sh new file mode 100644 index 00000000..a1d876c3 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/load_module.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +# Tests that the default options are set correctly +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option E:@catppuccin_status_load diff --git a/config/tmux/plugins/catppuccin/tmux/tests/load_module_expected.txt b/config/tmux/plugins/catppuccin/tmux/tests/load_module_expected.txt new file mode 100644 index 00000000..e984dc23 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/load_module_expected.txt @@ -0,0 +1,3 @@ + +E:@catppuccin_status_load #[fg=#89b4fa]#[fg=#11111b,bg=#89b4fa]󰊚 #[fg=#cdd6f4,bg=#313244]#(uptime | awk '{split(substr($0, index($0, "load")), a, ":"); print a[2]}')#[fg=#313244] + diff --git a/config/tmux/plugins/catppuccin/tmux/tests/pane_styling.sh b/config/tmux/plugins/catppuccin/tmux/tests/pane_styling.sh new file mode 100644 index 00000000..4f5e0152 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/pane_styling.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +tmux set -g @catppuccin_pane_status_enabled "yes" + +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option pane-border-format + +# Switch the number position to the right +tmux set -g @catppuccin_pane_number_position "right" +tmux source "${script_dir}/../catppuccin_tmux.conf" +print_option pane-border-format + +tmux set -g @catppuccin_pane_number_position "left" # reset + +# Fill option "all" +tmux set -g @catppuccin_pane_default_fill "all" +tmux source "${script_dir}/../catppuccin_tmux.conf" +print_option pane-border-format + +tmux set -g @catppuccin_pane_default_fill "number" # reset + +# Fill option "none" +tmux set -g @catppuccin_pane_default_fill "none" +tmux source "${script_dir}/../catppuccin_tmux.conf" +print_option pane-border-format diff --git a/config/tmux/plugins/catppuccin/tmux/tests/pane_styling_expected.txt b/config/tmux/plugins/catppuccin/tmux/tests/pane_styling_expected.txt new file mode 100644 index 00000000..d57e36f0 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/pane_styling_expected.txt @@ -0,0 +1,4 @@ +pane-border-format #[fg=#a6e3a1,bg=default]█#[fg=#313244,bg=#a6e3a1]#{pane_index}#[fg=#a6e3a1,bg=#313244]█ #[fg=#a6e3a1,bg=#313244]#{b:pane_current_path}#[fg=#313244,bg=default]█ +pane-border-format #[fg=#313244,bg=default]█#[fg=#a6e3a1,bg=#313244]#{b:pane_current_path} #[fg=#a6e3a1,bg=#313244]█#[fg=#313244,bg=#a6e3a1]#{pane_index}#[fg=#a6e3a1,bg=default]█ +pane-border-format #[fg=#a6e3a1,bg=default]█#[fg=#313244,bg=#a6e3a1]#{pane_index}#[fg=#a6e3a1,bg=#313244]█ #[fg=#313244,bg=#a6e3a1]#{b:pane_current_path}#[fg=#a6e3a1,bg=default]█ +pane-border-format #[fg=#313244,bg=default]█#[fg=#cdd6f4,bg=#313244]#{pane_index}#[fg=#cdd6f4,bg=#313244]█ #[fg=#cdd6f4,bg=#313244]#{b:pane_current_path}#[fg=#313244,bg=default]█ diff --git a/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling.sh b/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling.sh new file mode 100644 index 00000000..069a012a --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +# Unsets (removes) any styling options that will contaminate +# subsequent test runs. +function reset() { + tmux set -gu @catppuccin_window_current_left_separator + tmux set -gu @catppuccin_window_current_middle_separator + tmux set -gu @catppuccin_window_current_right_separator + tmux set -gu @catppuccin_window_status_style +} + +script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P) +# shellcheck disable=SC1091 +source "${script_dir}/helpers.sh" + +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option window-status-format +print_option window-status-current-format + +# Test the rounded style +reset +tmux set -g @catppuccin_window_status_style "rounded" +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option window-status-format +print_option window-status-current-format + +# Test the basic style with the number on the right +reset +tmux set -g @catppuccin_window_number_position "right" +tmux source "${script_dir}/../catppuccin_options_tmux.conf" +tmux source "${script_dir}/../catppuccin_tmux.conf" + +print_option window-status-format +print_option window-status-current-format diff --git a/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling_expected.txt b/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling_expected.txt new file mode 100644 index 00000000..2bc69b89 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tests/window_status_styling_expected.txt @@ -0,0 +1,6 @@ +window-status-format #[fg=#11111b,bg=#{@thm_overlay_2}] #I #[fg=#cdd6f4,bg=#{@thm_surface_0}] #T +window-status-current-format #[fg=#11111b,bg=#{@thm_mauve}] #I #[fg=#cdd6f4,bg=#{@thm_surface_1}] #T +window-status-format #[fg=#11111b,bg=#{@thm_overlay_2}]#[fg=#181825,reverse]#[none]#I #[fg=#cdd6f4,bg=#{@thm_surface_0}] #T#[fg=#181825,reverse]#[none] +window-status-current-format #[fg=#11111b,bg=#{@thm_mauve}]#[fg=#181825,reverse]#[none]#I #[fg=#cdd6f4,bg=#{@thm_surface_1}] #T#[fg=#181825,reverse]#[none] +window-status-format #[fg=#cdd6f4,bg=#{@thm_surface_0}] #[fg=#cdd6f4,bg=#{@thm_surface_0}] #T #[fg=#11111b,bg=#{@thm_overlay_2}] #I +window-status-current-format #[fg=#cdd6f4,bg=#{@thm_surface_1}] #[fg=#cdd6f4,bg=#{@thm_surface_1}] #T #[fg=#11111b,bg=#{@thm_mauve}] #I diff --git a/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_frappe_tmux.conf b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_frappe_tmux.conf new file mode 100644 index 00000000..0c9435d0 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_frappe_tmux.conf @@ -0,0 +1,35 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Frappe) +set -ogq @thm_bg "#303446" +set -ogq @thm_fg "#c6d0f5" + +# Colors +set -ogq @thm_rosewater "#f2d5cf" +set -ogq @thm_flamingo "#eebebe" +set -ogq @thm_rosewater "#f2d5cf" +set -ogq @thm_pink "#f4b8e4" +set -ogq @thm_mauve "#ca9ee6" +set -ogq @thm_red "#e78284" +set -ogq @thm_maroon "#ea999c" +set -ogq @thm_peach "#ef9f76" +set -ogq @thm_yellow "#e5c890" +set -ogq @thm_green "#a6d189" +set -ogq @thm_teal "#81c8be" +set -ogq @thm_sky "#99d1db" +set -ogq @thm_sapphire "#85c1dc" +set -ogq @thm_blue "#8caaee" +set -ogq @thm_lavender "#babbf1" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#a5adce" +set -ogq @thm_subtext_0 "#b5bfe2" +set -ogq @thm_overlay_2 "#949cbb" +set -ogq @thm_overlay_1 "#838ba7" +set -ogq @thm_overlay_0 "#737994" +set -ogq @thm_surface_2 "#626880" +set -ogq @thm_surface_1 "#51576d" +set -ogq @thm_surface_0 "#414559" +set -ogq @thm_mantle "#292c3c" +set -ogq @thm_crust "#232634" + diff --git a/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_latte_tmux.conf b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_latte_tmux.conf new file mode 100644 index 00000000..8ef5b435 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_latte_tmux.conf @@ -0,0 +1,35 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Latte) +set -ogq @thm_bg "#eff1f5" +set -ogq @thm_fg "#4c4f69" + +# Colors +set -ogq @thm_rosewater "#dc8a78" +set -ogq @thm_flamingo "#dd7878" +set -ogq @thm_rosewater "#dc8a78" +set -ogq @thm_pink "#ea76cb" +set -ogq @thm_mauve "#8839ef" +set -ogq @thm_red "#d20f39" +set -ogq @thm_maroon "#e64553" +set -ogq @thm_peach "#fe640b" +set -ogq @thm_yellow "#df8e1d" +set -ogq @thm_green "#40a02b" +set -ogq @thm_teal "#179299" +set -ogq @thm_sky "#04a5e5" +set -ogq @thm_sapphire "#209fb5" +set -ogq @thm_blue "#1e66f5" +set -ogq @thm_lavender "#7287fd" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#6c6f85" +set -ogq @thm_subtext_0 "#5c5f77" +set -ogq @thm_overlay_2 "#7c7f93" +set -ogq @thm_overlay_1 "#8c8fa1" +set -ogq @thm_overlay_0 "#9ca0b0" +set -ogq @thm_surface_2 "#acb0be" +set -ogq @thm_surface_1 "#bcc0cc" +set -ogq @thm_surface_0 "#ccd0da" +set -ogq @thm_mantle "#e6e9ef" +set -ogq @thm_crust "#dce0e8" + diff --git a/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_macchiato_tmux.conf b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_macchiato_tmux.conf new file mode 100644 index 00000000..c76e2a81 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_macchiato_tmux.conf @@ -0,0 +1,35 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Macchiato) +set -ogq @thm_bg "#24273a" +set -ogq @thm_fg "#cad3f5" + +# Colors +set -ogq @thm_rosewater "#f4dbd6" +set -ogq @thm_flamingo "#f0c6c6" +set -ogq @thm_rosewater "#f4dbd6" +set -ogq @thm_pink "#f5bde6" +set -ogq @thm_mauve "#c6a0f6" +set -ogq @thm_red "#ed8796" +set -ogq @thm_maroon "#ee99a0" +set -ogq @thm_peach "#f5a97f" +set -ogq @thm_yellow "#eed49f" +set -ogq @thm_green "#a6da95" +set -ogq @thm_teal "#8bd5ca" +set -ogq @thm_sky "#91d7e3" +set -ogq @thm_sapphire "#7dc4e4" +set -ogq @thm_blue "#8aadf4" +set -ogq @thm_lavender "#b7bdf8" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#a5adcb" +set -ogq @thm_subtext_0 "#b8c0e0" +set -ogq @thm_overlay_2 "#939ab7" +set -ogq @thm_overlay_1 "#8087a2" +set -ogq @thm_overlay_0 "#6e738d" +set -ogq @thm_surface_2 "#5b6078" +set -ogq @thm_surface_1 "#494d64" +set -ogq @thm_surface_0 "#363a4f" +set -ogq @thm_mantle "#1e2030" +set -ogq @thm_crust "#181926" + diff --git a/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_mocha_tmux.conf b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_mocha_tmux.conf new file mode 100644 index 00000000..0940af21 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/themes/catppuccin_mocha_tmux.conf @@ -0,0 +1,35 @@ +# vim:set ft=tmux: + +# --> Catppuccin (Mocha) +set -ogq @thm_bg "#1e1e2e" +set -ogq @thm_fg "#cdd6f4" + +# Colors +set -ogq @thm_rosewater "#f5e0dc" +set -ogq @thm_flamingo "#f2cdcd" +set -ogq @thm_rosewater "#f5e0dc" +set -ogq @thm_pink "#f5c2e7" +set -ogq @thm_mauve "#cba6f7" +set -ogq @thm_red "#f38ba8" +set -ogq @thm_maroon "#eba0ac" +set -ogq @thm_peach "#fab387" +set -ogq @thm_yellow "#f9e2af" +set -ogq @thm_green "#a6e3a1" +set -ogq @thm_teal "#94e2d5" +set -ogq @thm_sky "#89dceb" +set -ogq @thm_sapphire "#74c7ec" +set -ogq @thm_blue "#89b4fa" +set -ogq @thm_lavender "#b4befe" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#a6adc8" +set -ogq @thm_subtext_0 "#bac2de" +set -ogq @thm_overlay_2 "#9399b2" +set -ogq @thm_overlay_1 "#7f849c" +set -ogq @thm_overlay_0 "#6c7086" +set -ogq @thm_surface_2 "#585b70" +set -ogq @thm_surface_1 "#45475a" +set -ogq @thm_surface_0 "#313244" +set -ogq @thm_mantle "#181825" +set -ogq @thm_crust "#11111b" + diff --git a/config/tmux/plugins/catppuccin/tmux/tmux.tera b/config/tmux/plugins/catppuccin/tmux/tmux.tera new file mode 100644 index 00000000..318931eb --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/tmux.tera @@ -0,0 +1,43 @@ +--- +whiskers: + version: "2.1.1" + matrix: + - flavor + filename: "themes/catppuccin_{{flavor.identifier}}_tmux.conf" +--- +{%- set palette = flavor.colors -%} +# vim:set ft=tmux: + +# --> Catppuccin ({{ flavor.identifier | capitalize }}) +set -ogq @thm_bg "#{{ palette.base.hex | lower }}" +set -ogq @thm_fg "#{{ palette.text.hex | lower }}" + +# Colors +set -ogq @thm_rosewater "#{{ palette.rosewater.hex | lower }}" +set -ogq @thm_flamingo "#{{ palette.flamingo.hex | lower }}" +set -ogq @thm_rosewater "#{{ palette.rosewater.hex | lower }}" +set -ogq @thm_pink "#{{ palette.pink.hex | lower }}" +set -ogq @thm_mauve "#{{ palette.mauve.hex | lower }}" +set -ogq @thm_red "#{{ palette.red.hex | lower }}" +set -ogq @thm_maroon "#{{ palette.maroon.hex | lower }}" +set -ogq @thm_peach "#{{ palette.peach.hex | lower }}" +set -ogq @thm_yellow "#{{ palette.yellow.hex | lower }}" +set -ogq @thm_green "#{{ palette.green.hex | lower }}" +set -ogq @thm_teal "#{{ palette.teal.hex | lower }}" +set -ogq @thm_sky "#{{ palette.sky.hex | lower }}" +set -ogq @thm_sapphire "#{{ palette.sapphire.hex | lower }}" +set -ogq @thm_blue "#{{ palette.blue.hex | lower }}" +set -ogq @thm_lavender "#{{ palette.lavender.hex | lower }}" + +# Surfaces and overlays +set -ogq @thm_subtext_1 "#{{ palette.subtext0.hex | lower }}" +set -ogq @thm_subtext_0 "#{{ palette.subtext1.hex | lower }}" +set -ogq @thm_overlay_2 "#{{ palette.overlay2.hex | lower }}" +set -ogq @thm_overlay_1 "#{{ palette.overlay1.hex | lower }}" +set -ogq @thm_overlay_0 "#{{ palette.overlay0.hex | lower }}" +set -ogq @thm_surface_2 "#{{ palette.surface2.hex | lower }}" +set -ogq @thm_surface_1 "#{{ palette.surface1.hex | lower }}" +set -ogq @thm_surface_0 "#{{ palette.surface0.hex | lower }}" +set -ogq @thm_mantle "#{{ palette.mantle.hex | lower }}" +set -ogq @thm_crust "#{{ palette.crust.hex | lower }}" + diff --git a/config/tmux/plugins/catppuccin/tmux/utils/status_module.conf b/config/tmux/plugins/catppuccin/tmux/utils/status_module.conf new file mode 100644 index 00000000..fc725787 --- /dev/null +++ b/config/tmux/plugins/catppuccin/tmux/utils/status_module.conf @@ -0,0 +1,47 @@ +# vim:set ft=tmux: + +# Embedded style that ensures that modules look "connected" +# when required. +set -gqF @_ctp_connect_style \ + "#{?#{==:#{@catppuccin_status_connect_separator},yes},,#[bg=default]}" + +# There are four colors involved: +# +# - Icon +# - fg: @catppuccin_status_[module]_icon_fg [default = crust] +# - bg: @catppuccin_status_[module]_icon_bg [required] +# - Text +# - fg: @catppuccin_status_[module]_text_fg [default = foreground] +# - bg: @catppuccin_status_[module]_text_bg [default = @catppuccin_status_module_text_bg] + +set -ogqF "@catppuccin_status_${MODULE_NAME}_icon_fg" "#{E:@thm_crust}" +set -ogqF "@catppuccin_status_${MODULE_NAME}_text_fg" "#{E:@thm_fg}" + +%if "#{==:#{@catppuccin_status_${MODULE_NAME}_icon_bg},}" + set -gqF "@catppuccin_status_${MODULE_NAME}_icon_bg" "#{@catppuccin_${MODULE_NAME}_color}" +%endif + +%if "#{==:#{@catppuccin_status_${MODULE_NAME}_text_bg},}" + set -gqF @_ctp_module_text_bg "#{E:@catppuccin_status_module_text_bg}" +%else + set -gqF @_ctp_module_text_bg "#{@catppuccin_status_${MODULE_NAME}_text_bg}" +%endif + +set -gF "@catppuccin_status_${MODULE_NAME}" \ + "#[fg=#{@catppuccin_status_${MODULE_NAME}_icon_bg}]#{@_ctp_connect_style}#{@catppuccin_status_left_separator}" + +set -agF "@catppuccin_status_${MODULE_NAME}" \ + "#[fg=#{@catppuccin_status_${MODULE_NAME}_icon_fg},bg=#{@catppuccin_status_${MODULE_NAME}_icon_bg}]#{@catppuccin_${MODULE_NAME}_icon}" + +set -agF "@catppuccin_status_${MODULE_NAME}" \ + "#{@catppuccin_status_middle_separator}" + +set -agF "@catppuccin_status_${MODULE_NAME}" \ + "#[fg=#{@catppuccin_status_${MODULE_NAME}_text_fg},bg=#{@_ctp_module_text_bg}]" + +set -ag "@catppuccin_status_${MODULE_NAME}" "#{E:@catppuccin_${MODULE_NAME}_text}" + +set -agF "@catppuccin_status_${MODULE_NAME}" "#[fg=#{@_ctp_module_text_bg}]#{@_ctp_connect_style}#{@catppuccin_status_right_separator}" + +set -ug @_ctp_connect_style +set -ug @_ctp_module_text_bg diff --git a/.config/tmux/.tmux.conf b/config/tmux/tmux.conf similarity index 93% rename from .config/tmux/.tmux.conf rename to config/tmux/tmux.conf index 707375d8..9d23f22e 100644 --- a/.config/tmux/.tmux.conf +++ b/config/tmux/tmux.conf @@ -49,8 +49,8 @@ bind-key -T copy-mode-vi v send-keys -X begin-selection bind-key -T copy-mode-vi y send-keys -X rectangle-toggle unbind -T copy-mode-vi Enter -bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i' -bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i' +bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel wl-copy +bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel wl-copy # ------------------------------- @@ -61,3 +61,4 @@ set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'christoomey/vim-tmux-navigator' run '~/.tmux/plugins/tpm/tpm' +run ~/.config/tmux/plugins/catppuccin/tmux/catppuccin.tmux diff --git a/.config/waybar/config b/config/waybar/config similarity index 100% rename from .config/waybar/config rename to config/waybar/config diff --git a/.config/waybar/mocha.css b/config/waybar/mocha.css similarity index 100% rename from .config/waybar/mocha.css rename to config/waybar/mocha.css diff --git a/.config/waybar/style.css b/config/waybar/style.css similarity index 100% rename from .config/waybar/style.css rename to config/waybar/style.css diff --git a/scripts/add-package.bash b/scripts/add-package.bash index 77aac7b8..31d5fef6 100644 --- a/scripts/add-package.bash +++ b/scripts/add-package.bash @@ -6,8 +6,8 @@ if [ -z $@ ]; then exit 1 fi -echo "metapac add --backend arch --package $@" -metapac add --backend arch --package $@ +echo "metapac add --backend arch --packages $@" +metapac add --backend arch --packages $@ rsync -av ~/.config/metapac .config --delete