the great colorscheme migration

25 files changed, 659 insertions, 279 deletions

diff --git a/config.fish b/config.fish
index fc69f93..aa362fb 100644
--- a/config.fish
+++ b/config.fish
@@ -29,6 +29,8 @@ if status is-interactive
     alias nv=nvim
     alias lg=lazygit
 
+    source ~/.config/fish/colors.fish
+
     fish_vi_key_bindings
     enable_transience
 end
diff --git a/configs.toml b/configs.toml
index a49bcaf..163e99a 100644
--- a/configs.toml
+++ b/configs.toml
@@ -1,63 +1,59 @@
-[rofi]
-file = "rofi"
-parent = "~/.config"
+[fish]
+file = "config.fish"
+parent = "/home/josh/.config/fish"
 
-[swaylock]
-file = "swaylock"
-parent = "~/.config"
+[wallust]
+file = "wallust"
+parent = "/home/josh/.config"
 
-[xplr]
-file = "xplr"
-parent = "~/.config"
-
-[lectern]
-file = "lectern"
-parent = "~/.config"
+[kitty]
+file = "kitty.conf"
+parent = "/home/josh/.config"
 
 [kanata]
 file = "keybs"
-parent = "~/.config"
+parent = "/home/josh/.config"
+
+[zathura]
+file = "zathura"
+parent = "/home/josh/.config"
 
 [tmux]
 file = ".tmux.conf"
-parent = "~/"
-
-[starship]
-file = "starship"
-parent = "~/.config"
+parent = "/home/josh"
 
 [tex]
 file = "texmf"
-parent = "~/"
+parent = "/home/josh"
 
 [waybar]
 file = "waybar"
-parent = "~/.config"
+parent = "/home/josh/.config"
 
-[fish]
-file = "config.fish"
-parent = "~/.config/fish"
+[sway]
+file = "sway"
+parent = "/home/josh/.config"
 
 [nvim]
 file = "nvim"
-parent = "~/.config"
+parent = "/home/josh/.config"
+
+[vim]
+file = ".vimrc"
+parent = "/home/josh"
 
 [wezterm]
 file = ".wezterm.lua"
-parent = "~/"
-
-[sway]
-file = "sway"
-parent = "~/.config"
+parent = "/home/josh"
 
-[zathura]
-file = "zathura"
-parent = "~/.config"
+[xplr]
+file = "xplr"
+parent = "/home/josh/.config"
 
-[vim]
-file = ".vimrc"
-parent = "~/"
+[lectern]
+file = "lectern"
+parent = "/home/josh/.config"
 
-[dunst]
-file = "dunst"
-parent = "~/.config"
+[rofi]
+file = "rofi"
+parent = "/home/josh/.config"
diff --git a/kitty.conf b/kitty.conf
new file mode 100644
index 0000000..b8a702d
--- /dev/null
+++ b/kitty.conf
@@ -0,0 +1,14 @@
+include colors.conf
+
+# BEGIN_KITTY_FONTS
+font_family      family='FiraCode Nerd Font' postscript_name=FiraCodeNF-Reg
+bold_font        auto
+italic_font      family='FiraCode Nerd Font' style=Regular
+bold_italic_font family='FiraCode Nerd Font' style=SemiBold
+# END_KITTY_FONTS
+
+font_size 11.0
+
+background_opacity 0.95
+
+window_padding_width 2
diff --git a/rofi/config.rasi b/rofi/config.rasi
index f8db5d4..80a7b9c 100644
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@@ -2,7 +2,7 @@ configuration{
     modi: "run,drun";
     icon-theme: "Papirus";
     show-icons: true;
-    terminal: "wezterm";
+    terminal: "kitty";
     drun-display-format: "{icon} {name}";
     location: 0;
     disable-history: false;
@@ -14,5 +14,4 @@ configuration{
     sidebar-mode: false;
 }
 
-@theme "catppuccin-mocha"
-
+@theme "theme"
diff --git a/rofi/theme.rasi b/rofi/theme.rasi
new file mode 100644
index 0000000..2ccfa97
--- /dev/null
+++ b/rofi/theme.rasi
@@ -0,0 +1,105 @@
+@theme "colors"
+
+* {
+    width: 600;
+    font: "Fira Code Nerd Font 14";
+}
+
+element-text, element-icon , mode-switcher {
+    background-color: inherit;
+    text-color:       inherit;
+}
+
+window {
+    height: 360px;
+    border: 3px;
+    border-color: @border-col;
+    background-color: @bg-col;
+}
+
+mainbox {
+    background-color: @bg-col;
+}
+
+inputbar {
+    children: [prompt,entry];
+    background-color: @bg-col;
+    border-radius: 5px;
+    padding: 2px;
+}
+
+prompt {
+    background-color: @blue;
+    padding: 6px;
+    text-color: @bg-col;
+    border-radius: 3px;
+    margin: 20px 0px 0px 20px;
+}
+
+textbox-prompt-colon {
+    expand: false;
+    str: ":";
+}
+
+entry {
+    padding: 6px;
+    margin: 20px 0px 0px 10px;
+    text-color: @fg-col;
+    background-color: @bg-col;
+}
+
+listview {
+    border: 0px 0px 0px;
+    padding: 6px 0px 0px;
+    margin: 10px 0px 0px 20px;
+    columns: 2;
+    lines: 5;
+    background-color: @bg-col;
+}
+
+element {
+    padding: 5px;
+    background-color: @bg-col;
+    text-color: @fg-col  ;
+}
+
+element-icon {
+    size: 25px;
+}
+
+element selected {
+    background-color:  @selected-col ;
+    text-color: @fg-col2  ;
+}
+
+mode-switcher {
+    spacing: 0;
+  }
+
+button {
+    padding: 10px;
+    background-color: @bg-col-light;
+    text-color: @grey;
+    vertical-align: 0.5; 
+    horizontal-align: 0.5;
+}
+
+button selected {
+  background-color: @bg-col;
+  text-color: @blue;
+}
+
+message {
+    background-color: @bg-col-light;
+    margin: 2px;
+    padding: 2px;
+    border-radius: 5px;
+}
+
+textbox {
+    padding: 6px;
+    margin: 20px 0px 0px 20px;
+    text-color: @blue;
+    background-color: @bg-col-light;
+}
+
diff --git a/sway/catppuccin-macchiato b/sway/catppuccin-macchiato
deleted file mode 100644
index c557121..0000000
--- a/sway/catppuccin-macchiato
+++ /dev/null
@@ -1,25 +0,0 @@
-set $rosewater #f4dbd6
-set $flamingo  #f0c6c6
-set $pink      #f5bde6
-set $mauve     #c6a0f6
-set $red       #ed8796
-set $maroon    #ee99a0
-set $peach     #f5a97f
-set $green     #a6da95
-set $teal      #8bd5ca
-set $sky       #91d7e3
-set $sapphire  #7dc4e4
-set $blue      #8aadf4
-set $lavender  #b7bdf8
-set $text      #cad3f5
-set $subtext1  #b8c0e0
-set $subtext0  #a5adcb
-set $overlay2  #939ab7
-set $overlay1  #8087a2
-set $overlay0  #6e738d
-set $surface2  #5b6078
-set $surface1  #494d64
-set $surface0  #363a4f
-set $base      #24273a
-set $mantle    #1e2030
-set $crust     #181926
diff --git a/sway/config b/sway/config
index a91b1f1..505d021 100644
--- a/sway/config
+++ b/sway/config
@@ -2,7 +2,7 @@ exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
 exec hash dbus-update-activation-environment 2>/dev/null && \
      dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
-include catppuccin-macchiato
+include colors
 
 exec --no-startup-id dex -ae sway
 
@@ -16,14 +16,14 @@ set $down e
 set $up i
 set $right o
 
-set $term wezterm
+set $term kitty
 
 set $menu rofi -show drun | xargs swaymsg exec --
 
 ### Output configuration
-exec way-displays > /tmp/way-displays.${XDG_VTNR}.${USER}.log 2>&1
+output "AOC Q27G1WG4 0x00020A32" mode 2560x1440@143.912Hz
 
-exec swaybg --image ~/Pictures/backgrounds/arch-rainbow-1920x1080.png --mode center --color=#302d41
+output "*" background $wallpaper fill
 
 ### Idle configuration
 
@@ -177,20 +177,20 @@ bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
 
 bindsym $mod+b exec zen-browser
 bindsym $mod+x exec xournalpp
-# bindsym $mod+c exec "wezterm start --cwd ~/nextcloud/notebook/tex xch nvim"
-bindsym $mod+c exec "lectern open"
-bindsym $mod+d exec "wezterm start --cwd ~/nextcloud/escritoire xch nvim"
-bindsym $mod+Shift+t exec "wezterm start --class 'float'"
-bindsym $mod+Shift+c exec "wezterm start --class 'numbat' numbat"
-bindsym $mod+Shift+g exec "feh -Z -F -B black /home/josh/Pictures/game.png"
+bindsym $mod+c exec lectern open
+bindsym $mod+d exec kitty --directory ~/nextcloud/escritoire xch nvim
+bindsym $mod+Shift+t exec kitty --app-id 'float'
+bindsym $mod+Shift+c exec kitty --app-id 'numbat' numbat
+bindsym $mod+Shift+g exec feh -Z -F -B black /home/josh/Pictures/game.png
+bindsym $mod+Shift+w exec wallpicker
 
-# target                 title     bg      text   indicator  border
-client.focused           $flamingo $crust  $text  $rosewater $flamingo
-client.focused_inactive  00000000  $base   $text  00000000   00000000
-client.unfocused         00000000  $mantle $text  00000000   00000000
-client.urgent            $peach    $base   $peach $overlay0  $peach
-client.placeholder       $overlay0 $base   $text  $overlay0  $overlay0
-client.background        $base
+# target                 title     bg           text        indicator  border
+client.focused           $color7   $background  $foreground $color15   $color7
+client.focused_inactive  $color0   $color0      $foreground 00000000   00000000
+client.unfocused         $color0   $color0      $foreground 00000000   00000000
+client.urgent            $color13  $background  $color13    $color8    $color13
+client.placeholder       $color8   $background  $foreground $color8    $color8
+client.background        $background
 
 gaps inner 10px
 gaps outer 0px
@@ -199,12 +199,12 @@ title_align center
 default_border pixel
 
 for_window [app_id="float"] floating enable
-for_window [app_id="numbat"] floating enable
+for_window [app_id="numbat"] floating enable; resize set 800 600
 for_window [app_id="xoppdoggin"] floating enable; resize set 1800 1000
+for_window [app_id="wallpicker"] floating enable; resize set 1800 1000
 for_window [class="Inkscape"] floating enable; resize set 1800 1000
 for_window [class="vimscape"] floating enable; resize set 600 300; move down 300; move left 550
 
-assign [class="^Spotify"] workspace number 8
 assign [class="^feishin"] workspace number 8
 assign [class="^discord"] workspace number 9
 assign [class="^Slack"] workspace number 9
diff --git a/swaylock/config b/swaylock/config
deleted file mode 100644
index 6b9889b..0000000
--- a/swaylock/config
+++ /dev/null
@@ -1,29 +0,0 @@
-screenshots
-clock
-indicator
-indicator-radius=100
-indicator-thickness=7
-effect-blur=7x5
-effect-vignette=0.8:0.8
-ring-color=363a4f
-key-hl-color=f5a97f
-bs-hl-color=ed8796
-text-color=cad3f5
-line-color=00000000
-inside-color=24273a88
-separator-color=00000000
-layout-bg-color=24273a88
-layout-text-color=cad3f5
-ring-clear-color=a6da95
-text-clear-color=a6da95
-inside-clear-color=24273a88
-ring-ver-color=c6a0f6
-text-ver-color=c6a0f6
-inside-ver-color=24273a88
-ring-wrong-color=ed8796
-text-wrong-color=ed8796
-inside-wrong-color=24273a88
-grace=4
-fade-in=0.2
-font=FiraCodeNerdFont
-font-size=30
diff --git a/wallust/templates/colors_fish.fish b/wallust/templates/colors_fish.fish
new file mode 100644
index 0000000..c97a2da
--- /dev/null
+++ b/wallust/templates/colors_fish.fish
@@ -0,0 +1,39 @@
+set fish_color_autosuggestion {color8.strip}
+set fish_color_cancel {color1.strip} '--reverse'
+set fish_color_command {color10.strip}
+set fish_color_comment {color8.strip}
+set fish_color_cwd {color2.strip}
+set fish_color_cwd_root {color1.strip}
+set fish_color_end {color3.strip}
+set fish_color_error {color1.strip}
+set fish_color_escape {color5.strip}
+set fish_color_history_current --bold
+set fish_color_host {color12.strip}
+set fish_color_host_remote {color12.strip}
+set fish_color_keyword {color5.strip}
+set fish_color_match --background={color4.strip}
+set fish_color_normal {foreground.strip}
+set fish_color_operator {color6.strip}
+set fish_color_option {color3.strip}
+set fish_color_param {color12.strip}
+set fish_color_quote {color11.strip}
+set fish_color_redirection {color5.strip}
+set fish_color_search_match --background={color8.strip}
+set fish_color_selection --background={color8.strip}
+set fish_color_status {color1.strip}
+set fish_color_user {color10.strip}
+set fish_color_valid_path --underline
+
+set fish_pager_color_background {background.strip}
+set fish_pager_color_completion {foreground.strip}
+set fish_pager_color_description {color8.strip}
+set fish_pager_color_prefix {color10.strip}
+set fish_pager_color_progress {color8.strip}
+set fish_pager_color_secondary_background {background.strip}
+set fish_pager_color_secondary_completion {foreground.strip}
+set fish_pager_color_secondary_description {color8.strip}
+set fish_pager_color_secondary_prefix {color10.strip}
+set fish_pager_color_selected_background --background={color8.strip}
+set fish_pager_color_selected_completion {foreground.strip}
+set fish_pager_color_selected_description {color8.strip}
+set fish_pager_color_selected_prefix {color10.strip}
diff --git a/wallust/templates/colors_kitty.conf b/wallust/templates/colors_kitty.conf
new file mode 100644
index 0000000..ac65068
--- /dev/null
+++ b/wallust/templates/colors_kitty.conf
@@ -0,0 +1,29 @@
+foreground         {{foreground}}
+background         {{background}}
+cursor             {{cursor}}
+
+active_tab_foreground     {{background}}
+active_tab_background     {{foreground}}
+inactive_tab_foreground   {{foreground}}
+inactive_tab_background   {{background}}
+
+active_border_color   {{foreground}}
+inactive_border_color {{background}}
+bell_border_color     {{color1}}
+
+color0       {{color0}}
+color8       {{color8}}
+color1       {{color1}}
+color9       {{color9}}
+color2       {{color2}}
+color10      {{color10}}
+color3       {{color3}}
+color11      {{color11}}
+color4       {{color4}}
+color12      {{color12}}
+color5       {{color5}}
+color13      {{color13}}
+color6       {{color6}}
+color14      {{color14}}
+color7       {{color7}}
+color15      {{color15}}
diff --git a/wallust/templates/colors_neowallust.vim b/wallust/templates/colors_neowallust.vim
new file mode 100644
index 0000000..c5e966d
--- /dev/null
+++ b/wallust/templates/colors_neowallust.vim
@@ -0,0 +1,19 @@
+let background = "{{background}}"
+let foreground = "{{foreground}}"
+let cursor = "{{cursor}}"
+let color0 = "{{color0}}"
+let color1 = "{{color1}}"
+let color2 = "{{color2}}"
+let color3 = "{{color3}}"
+let color4 = "{{color4}}"
+let color5 = "{{color5}}"
+let color6 = "{{color6}}"
+let color7 = "{{color7}}"
+let color8 = "{{color8}}"
+let color9 = "{{color9}}"
+let color10 = "{{color10}}"
+let color11 = "{{color11}}"
+let color12 = "{{color12}}"
+let color13 = "{{color13}}"
+let color14 = "{{color14}}"
+let color15 = "{{color15}}"
diff --git a/wallust/templates/colors_rofi.rasi b/wallust/templates/colors_rofi.rasi
new file mode 100644
index 0000000..2eb00be
--- /dev/null
+++ b/wallust/templates/colors_rofi.rasi
@@ -0,0 +1,10 @@
+* {
+    bg-col:  {{background}};
+    bg-col-light: {{background}};
+    border-col: {{background}};
+    selected-col: {{background}};
+    blue: {{color12}};
+    fg-col: {{foreground}};
+    fg-col2: {{color13}};
+    grey: {{color0}};
+}
diff --git a/wallust/templates/colors_sway b/wallust/templates/colors_sway
new file mode 100644
index 0000000..978ff5d
--- /dev/null
+++ b/wallust/templates/colors_sway
@@ -0,0 +1,21 @@
+set $wallpaper {{wallpaper}}
+
+set $background {{background}}
+set $foreground {{foreground}}
+
+set $color0 {{color0}}
+set $color1 {{color1}}
+set $color2 {{color2}}
+set $color3 {{color3}}
+set $color4 {{color4}}
+set $color5 {{color5}}
+set $color6 {{color6}}
+set $color7 {{color7}}
+set $color8 {{color8}}
+set $color9 {{color9}}
+set $color10 {{color10}}
+set $color11 {{color11}}
+set $color12 {{color12}}
+set $color13 {{color13}}
+set $color14 {{color14}}
+set $color15 {{color15}}
diff --git a/wallust/templates/colors_waybar.css b/wallust/templates/colors_waybar.css
new file mode 100644
index 0000000..24dad19
--- /dev/null
+++ b/wallust/templates/colors_waybar.css
@@ -0,0 +1,20 @@
+@define-color foreground {{foreground}};
+@define-color background {{background}};
+@define-color cursor {{cursor}};
+
+@define-color color0  {{color0}};
+@define-color color1  {{color1}};
+@define-color color2  {{color2}};
+@define-color color3  {{color3}};
+@define-color color4  {{color4}};
+@define-color color5  {{color5}};
+@define-color color6  {{color6}};
+@define-color color7  {{color7}};
+@define-color color8  {{color8}};
+@define-color color9  {{color9}};
+@define-color color10 {{color10}};
+@define-color color11 {{color11}};
+@define-color color12 {{color12}};
+@define-color color13 {{color13}};
+@define-color color14 {{color14}};
+@define-color color15 {{color15}};
diff --git a/wallust/templates/colors_zathura b/wallust/templates/colors_zathura
new file mode 100644
index 0000000..e2c4b9c
--- /dev/null
+++ b/wallust/templates/colors_zathura
@@ -0,0 +1,34 @@
+set recolor "true"
+set recolor-keephue "true"
+
+set completion-bg "{{background}}"
+set completion-fg "{{foreground}}"
+set completion-group-bg "{{background}}"
+set completion-group-fg "{{color2}}"
+set completion-highlight-bg "{{color2}}"
+set completion-highlight-fg "{{background}}"
+
+set recolor-lightcolor "{{background}}"
+set recolor-darkcolor "{{foreground}}"
+set default-bg "{{background}}"
+
+set inputbar-bg "{{background}}"
+set inputbar-fg "{{foreground}}"
+set notification-bg "{{background}}"
+set notification-fg "{{foreground}}"
+set notification-error-bg "{{color1}}"
+set notification-error-fg "{{foreground}}"
+set notification-warning-bg "{{color1}}"
+set notification-warning-fg "{{foreground}}"
+set statusbar-bg "{{background}}"
+set statusbar-fg "{{foreground}}"
+set index-bg "{{background}}"
+set index-fg "{{foreground}}"
+set index-active-bg "{{foreground}}"
+set index-active-fg "{{background}}"
+set render-loading-bg "{{background}}"
+set render-loading-fg "{{foreground}}"
+
+set window-title-home-tilde true
+set statusbar-basename true
+set selection-clipboard clipboard
diff --git a/wallust/templates/dunstrc b/wallust/templates/dunstrc
new file mode 100644
index 0000000..3ee6f67
--- /dev/null
+++ b/wallust/templates/dunstrc
@@ -0,0 +1,22 @@
+[global]
+horizontal_padding = 12
+frame_width = 2
+font = FiraCodeNerdFont 11
+icon_theme = Papyrus
+corner_radius = 16
+
+frame_color = "{{color11}}"
+separator_color= frame
+
+[urgency_low]
+background = "{{background}}"
+foreground = "{{foreground}}"
+
+[urgency_normal]
+background = "{{background}}"
+foreground = "{{foreground}}"
+
+[urgency_critical]
+background = "{{color15}}"
+foreground = "{{background}}"
+frame_color = "{{color7}}"
diff --git a/wallust/templates/starship.toml b/wallust/templates/starship.toml
new file mode 100644
index 0000000..59d157f
--- /dev/null
+++ b/wallust/templates/starship.toml
@@ -0,0 +1,149 @@
+format = """
+[┏](id_color)\
+[](id_color)\
+$os\
+$username\
+$hostname\
+$sudo\
+[ ](bg:id_color)\
+[](fg:id_color bg:dir_color)\
+$directory\
+[](fg:dir_color bg:git_color)\
+$git_branch\
+$git_status\
+[](fg:git_color bg:lang_color)\
+$c\
+$rust\
+$golang\
+$nodejs\
+$php\
+$java\
+$kotlin\
+$haskell\
+$python\
+$julia\
+$lua\
+[](fg:lang_color)\
+$line_break\
+[┗](id_color)$character
+"""
+
+palette = "wallust"
+
+[palettes.wallust]
+text_color = "{{background}}"
+id_color = "{{color14}}"
+dir_color = "{{color13}}"
+git_color = "{{color12}}"
+lang_color = "{{color11}}"
+yellow = "#eed49f"
+mauve = "#c6a0f6"
+
+[os]
+disabled = false
+style = "bg:id_color fg:text_color bold"
+
+[os.symbols]
+Linux = "󰌽"
+Gentoo = "󰣨"
+Fedora = "󰣛"
+Arch = "󰣇"
+Ubuntu = "󰕈"
+Debian = "󰣚"
+
+[username]
+show_always = true
+format = '[ $user](bg:id_color fg:text_color bold)'
+disabled = false
+
+[hostname]
+ssh_symbol = ''
+style = "bg:id_color fg:text_color bold"
+format = '[@$hostname]($style)'
+
+[sudo]
+disabled = false
+symbol = " "
+style = "bg:id_color fg:text_color"
+format = '[$symbol]($style)'
+
+[directory]
+style = "bg:dir_color"
+read_only = ""
+format = '[ $path( $read_only) ]($style fg:text_color bold)'
+truncation_length = 3
+truncation_symbol = "…/"
+
+[git_branch]
+symbol = ""
+style = "bg:git_color fg:text_color bold"
+format = '[ $symbol $branch ]($style)'
+
+[git_status]
+style = "bg:git_color fg:text_color bold"
+deleted = '󰗨'
+format = '[$all_status$ahead_behind ]($style)'
+
+[character]
+disabled = false
+success_symbol = '[󱢶 ](fg:id_color)[󰁔](fg:green)'
+error_symbol = '[󱩂 ](fg:id_color)[󰁔](fg:red)'
+vimcmd_symbol = '[ ](fg:id_color)[](fg:green)'
+vimcmd_replace_one_symbol = '[ ](fg:id_color)[](fg:mauve)'
+vimcmd_replace_symbol = '[ ](fg:id_color)[](fg:mauve)'
+vimcmd_visual_symbol = '[ ](fg:id_color)[](fg:yellow)'
+
+[nodejs]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[c]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[rust]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[golang]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[php]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[java]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[kotlin]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[haskell]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[python]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[julia]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
+
+[lua]
+symbol = ""
+style = "bg:lang_color fg:text_color bold"
+format = '[ $symbol( $version) ]($style)'
diff --git a/wallust/templates/starship_transient.toml b/wallust/templates/starship_transient.toml
new file mode 100644
index 0000000..315b788
--- /dev/null
+++ b/wallust/templates/starship_transient.toml
@@ -0,0 +1,8 @@
+palette = "wallust"
+
+[palettes.wallust]
+id_color = "{{color14}}"
+
+[character]
+disabled = false
+success_symbol = '[󰑂󰁔](fg:id_color)'
diff --git a/wallust/templates/swaylock b/wallust/templates/swaylock
new file mode 100644
index 0000000..e5eff15
--- /dev/null
+++ b/wallust/templates/swaylock
@@ -0,0 +1,29 @@
+image={{wallpaper}}
+clock
+indicator
+indicator-radius=100
+indicator-thickness=7
+effect-blur=7x5
+effect-vignette=0.8:0.8
+ring-color={{color0}}
+key-hl-color={{color12}}
+bs-hl-color={{color10}}
+text-color={{foreground}}
+line-color=00000000
+inside-color={{background}}88
+separator-color=00000000
+layout-bg-color={{background}}88
+layout-text-color={{foreground}}
+ring-clear-color={{color14}}
+text-clear-color={{color14}}
+inside-clear-color={{background}}88
+ring-ver-color={{color11}}
+text-ver-color={{color11}}
+inside-ver-color={{background}}88
+ring-wrong-color={{color10}}
+text-wrong-color={{color10}}
+inside-wrong-color={{background}}88
+grace=4
+fade-in=0.2
+font=FiraCodeNerdFont
+font-size=30
diff --git a/wallust/wallust.toml b/wallust/wallust.toml
new file mode 100644
index 0000000..f9e64ed
--- /dev/null
+++ b/wallust/wallust.toml
@@ -0,0 +1,40 @@
+color_space = "lch"
+palette = "dark16"
+check_contrast = true
+saturation = 30
+threshold = 10
+
+[templates]
+waybar.template = 'colors_waybar.css'
+waybar.target = '~/.config/waybar/colors.css'
+
+kitty.template = 'colors_kitty.conf'
+kitty.target = '~/.config/kitty/colors.conf'
+
+starship.template = 'starship.toml'
+starship.target = '~/.config/starship/starship.toml'
+
+transient_star.template = 'starship_transient.toml'
+transient_star.target = '~/.config/starship/transient.toml'
+
+sway.template = 'colors_sway'
+sway.target = '~/.config/sway/colors'
+
+neopywal.template = 'colors_neowallust.vim'
+neopywal.target = '~/.local/share/nvim/lazy/neopywal/palettes/wallust.vim'
+
+rofi.template = 'colors_rofi.rasi'
+rofi.target = '~/.config/rofi/colors.rasi'
+
+swaylock.template = 'swaylock'
+swaylock.target = '~/.config/swaylock/config'
+
+dunst.template = 'dunstrc'
+dunst.target = '~/.config/dunst/dunstrc'
+
+zathura.template = 'colors_zathura'
+zathura.target = '~/.config/zathura/colors'
+
+fish.template = 'colors_fish.fish'
+fish.target = '~/.config/fish/colors.fish'
+fish.pywal = true
diff --git a/waybar/config b/waybar/config
index 032c3ed..8da3977 100644
--- a/waybar/config
+++ b/waybar/config
@@ -5,7 +5,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
     "modules-center": ["sway/window"],
-    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "backlight", "network", "temperature", "memory", "battery", "clock", "tray"],
+    "modules-right": ["mpd", "idle_inhibitor", "backlight", "pulseaudio", "network", "temperature", "memory", "battery", "clock", "tray"],
 
     // Modules configuration
     "sway/workspaces": {
diff --git a/waybar/macchiato.css b/waybar/macchiato.css
deleted file mode 100644
index 6880473..0000000
--- a/waybar/macchiato.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Macchiato palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #24273a;
-@define-color mantle #1e2030;
-@define-color crust  #181926;
-
-@define-color text     #cad3f5;
-@define-color subtext0 #a5adcb;
-@define-color subtext1 #b8c0e0;
-
-@define-color surface0 #363a4f;
-@define-color surface1 #494d64;
-@define-color surface2 #5b6078;
-
-@define-color overlay0 #6e738d;
-@define-color overlay1 #8087a2;
-@define-color overlay2 #939ab7;
-
-@define-color blue      #8aadf4;
-@define-color lavender  #b7bdf8;
-@define-color sapphire  #7dc4e4;
-@define-color sky       #91d7e3;
-@define-color teal      #8bd5ca;
-@define-color green     #a6da95;
-@define-color yellow    #eed49f;
-@define-color peach     #f5a97f;
-@define-color maroon    #ee99a0;
-@define-color red       #ed8796;
-@define-color mauve     #c6a0f6;
-@define-color pink      #f5bde6;
-@define-color flamingo  #f0c6c6;
-@define-color rosewater #f4dbd6;
diff --git a/waybar/style.css b/waybar/style.css
index f9c9b92..2a1d9f8 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,4 +1,4 @@
-@import "macchiato.css";
+@import "colors.css";
 
 * {
     /* `otf-font-awesome` is required to be installed for icons */
@@ -7,8 +7,8 @@
 }
 
 window#waybar {
-    background-color: alpha(@base, 0);
-    color: @text;
+    background-color: alpha(@background, 0.9);
+    color: @foreground;
     transition-property: background-color;
     transition-duration: .5s;
 }
@@ -23,37 +23,44 @@ button {
     /* Avoid rounded borders under each button name */
     border: none;
     border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-    background: inherit;
-    box-shadow: inset 0 3px @rosewater;
+    color: @foreground;
 }
 
 #workspaces button {
     padding: 0 5px;
-    background-color: transparent;
-    color: @text;
+    /* background-color: transparent; */
+    /* color: @text; */
 }
 
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
+    background: inherit;
+    box-shadow: inset 0 3px @color14;
 }
 
 #workspaces button.focused {
-    background-color: @surface1;
-    box-shadow: inset 0 3px @flamingo;
+    box-shadow: inset 0 3px @color14;
 }
 
 #workspaces button.urgent {
-    background-color: @red;
-    color: @mantle;
+    background-color: @color13;
+    color: @background;
+}
+
+#workspaces button.urgent.focused {
+    box-shadow: inset 0 3px @color0;
+    background-color: @color13;
+    color: @background;
+}
+
+#workspaces button:hover.urgent {
+    box-shadow: inset 0 3px @color0;
+    background-color: @color13;
+    color: @background;
 }
 
 #mode {
-    background-color: @surface1;
-    border-top: 3px solid @rosewater;
+    border-top: 3px solid @color10;
 }
 
 #clock,
@@ -73,7 +80,8 @@ button:hover {
 #scratchpad,
 #mpd {
     padding: 0 10px;
-    color: @text;
+    color: @color15;
+    border-top: 3px solid @color7;
 }
 
 #window,
@@ -91,20 +99,27 @@ button:hover {
     margin-right: 0;
 }
 
+#tray {
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
 #clock {
-    border-top: 3px solid @lavender;
-    color: @lavender;
 }
 
 #battery {
-    color: @blue;
-    border-top: 3px solid @blue;
     padding-right: 18px;
 }
 
 #battery.charging, #battery.plugged {
-    color: @surface0;
-    background-color: @green;
+    background-color: @color4;
     border-top: 0;
     padding-right: 11px;
 }
@@ -126,99 +141,56 @@ button:hover {
     animation-direction: alternate;
 }
 
-label:focus {
-    background-color: #000000;
-}
-
-#cpu {
-    border-top: 3px solid @teal;
-    color: @teal;
-
-}
-
 #memory {
-    border-top: 3px solid @sapphire;
     padding-right: 15px;
-    color: @sapphire;
 }
 
-#disk {
-    background-color: #964B00;
+#temperature {
+    padding-right: 12px;
 }
 
-#backlight {
-    border-top: 3px solid @peach;
-    color: @peach;
-    padding-right: 11px;
+#temperature.critical {
+    background-color: #eb4d4b;
+    border-top: 3px solid #eb4d4b;
+    color: #ffffff;
 }
 
 #network {
-    border-top: 3px solid @yellow;
-    color: @yellow;
     padding-right: 15px;
 }
 
 #network.disconnected {
-    border-top: 3px solid @red;
-    color: @red;
 }
 
-#pulseaudio {
-    border-top: 3px solid @maroon;
-    color: @maroon;
-}
-
-#pulseaudio.muted {
-    border-top: 3px solid @flamingo;
-    background-color: @flamingo;
-    color: @mantle;
-}
-
-#temperature {
-    border-top: 3px solid @green;
-    color: @green;
-    padding-right: 12px;
-}
-
-#temperature.critical {
-    background-color: #eb4d4b;
-    border-top: 3px solid #eb4d4b;
-    color: #ffffff;
-}
-
-#tray {
-    border-top: 3px solid @mauve;
+#backlight {
+    padding-right: 11px;
 }
 
-#tray > .passive {
-    -gtk-icon-effect: dim;
+#pulseaudio {
 }
 
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
+#pulseaudio.muted {
+    border-top: 3px solid @color14;
+    background-color: @color14;
+    color: @color0;
 }
 
 #idle_inhibitor {
-    border-top: 3px solid @mantle;
     padding-right: 14px;
 }
 
 #idle_inhibitor.activated {
-    background-color: @text;
-    color: @mantle;
-    border-top: 3px solid @subtext0;
+    background-color: @foreground;
+    color: @background;
+    border-top: 3px solid @color7;
 }
 
-#language {
-    color: @sapphire;
-    padding: 0 5px;
-    min-width: 16px;
-    border-top: 3px solid @sapphire;
+label:focus {
+    background-color: #000000;
 }
 
 #scratchpad {
-    background: @mantle;
+    background: @color1;
 }
 
 #scratchpad.empty {
diff --git a/zathura/catppuccin-macchiato b/zathura/catppuccin-macchiato
deleted file mode 100644
index 4e447da..0000000
--- a/zathura/catppuccin-macchiato
+++ /dev/null
@@ -1,37 +0,0 @@
-set default-fg                "#CAD3F5"
-set default-bg 			          "#24273A"
-
-set completion-bg		          "#363A4F"
-set completion-fg		          "#CAD3F5"
-set completion-highlight-bg	  "#575268"
-set completion-highlight-fg	  "#CAD3F5"
-set completion-group-bg		    "#363A4F"
-set completion-group-fg		    "#8AADF4"
-
-set statusbar-fg		          "#CAD3F5"
-set statusbar-bg		          "#363A4F"
-
-set notification-bg		        "#363A4F"
-set notification-fg		        "#CAD3F5"
-set notification-error-bg	    "#363A4F"
-set notification-error-fg	    "#ED8796"
-set notification-warning-bg	  "#363A4F"
-set notification-warning-fg	  "#FAE3B0"
-
-set inputbar-fg			          "#CAD3F5"
-set inputbar-bg 		          "#363A4F"
-
-set recolor-lightcolor		    "#24273A"
-set recolor-darkcolor		      "#CAD3F5"
-
-set index-fg			            "#CAD3F5"
-set index-bg			            "#24273A"
-set index-active-fg		        "#CAD3F5"
-set index-active-bg		        "#363A4F"
-
-set render-loading-bg		      "#24273A"
-set render-loading-fg		      "#CAD3F5"
-
-set highlight-color		        "#575268"
-set highlight-fg              "#F5BDE6"
-set highlight-active-color	  "#F5BDE6"
diff --git a/zathura/zathurarc b/zathura/zathurarc
index 0da0f16..5717b31 100644
--- a/zathura/zathurarc
+++ b/zathura/zathurarc
@@ -1,4 +1,4 @@
-include catppuccin-macchiato
-set recolor true
+include colors
 set font FiraCodeNerdFont
 set selection-clipboard clipboard
+set database sqlite