8 files changed, 74 insertions, 105 deletions
diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..a46f208
--- /dev/null
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -0,0 +1,27 @@
+import = [
+    "/home/tobyv/.config/alacritty/colors.toml",
+    "/home/tobyv/.config/alacritty/local.toml",
+]
+live_config_reload = true
+
+[shell]
+program = "tmux"
+args = ["new", "-A"]
+
+[window]
+dynamic_padding = true
+opacity = 0.95
+
+[font]
+size = 15
+normal = { family = "Fira Code Nerd Font" }
+
+[mouse]
+hide_when_typing = true
+
+[keyboard]
+bindings = [
+    { action = "CreateNewWindow", key = "T", mods = "Control|Shift" },
+    { action = "ReceiveChar", key = "F", mode = "~Search", mods = "Control|Shift" },
+    { action = "ToggleFullscreen", key = "Return", mods = "Alt" },
+]
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
deleted file mode 100644
index 7749908..0000000
--- a/alacritty/.config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-import:
-  - ~/.config/alacritty/font.yml
-  - ~/.config/alacritty/colors.yml
-  - ~/.config/alacritty/key_bindings.yml
-  - ~/.config/alacritty/shell.yml
-  - ~/.config/alacritty/window.yml
-  - ~/.config/alacritty/local.yml
-
-env:
-  TERM: alacritty
-
-scrolling:
-  history: 10000
-  multiplier: 3
-
-selection:
-  save_to_clipboard: false
-
-cursor:
-  blinking: On
-
-mouse:
-  hide_when_typing: true
-
-live_config_reload: true
-
-persistent_logging: false
diff --git a/alacritty/.config/alacritty/colors.toml b/alacritty/.config/alacritty/colors.toml
new file mode 100644
index 0000000..1f1fc64
--- /dev/null
+++ b/alacritty/.config/alacritty/colors.toml
@@ -0,0 +1,47 @@
+[colors]
+transparent_background_colors = true
+indexed_colors = [
+    { index = 16, color = "#fe8019" },
+    { index = 17, color = "#d65d0e" },
+    { index = 18, color = "#3c3836" },
+    { index = 19, color = "#504945" },
+    { index = 20, color = "#bdae93" },
+    { index = 21, color = "#ebdbb2" },
+]
+
+[colors.cursor]
+cursor = "CellForeground"
+text = "CellBackground"
+
+[colors.selection]
+background = "CellForeground"
+text = "CellBackground"
+
+[colors.vi_mode_cursor]
+cursor = "CellForeground"
+text = "CellBackground"
+
+[colors.primary]
+background = "#1d2021"
+foreground = "#ebdbb2"
+bright_foreground = "#fbf1c7"
+
+[colors.normal]
+black = "#1d2021"
+red = "#cc241d"
+green = "#98971a"
+yellow = "#d79921"
+blue = "#458588"
+magenta = "#b16286"
+cyan = "#689d6a"
+white = "#ebdbb2"
+
+[colors.bright]
+black = "#928374"
+red = "#fb4934"
+green = "#b8bb26"
+yellow = "#fabd2f"
+blue = "#83a598"
+magenta = "#d3869b"
+cyan = "#8ec07c"
+white = "#fbf1c7"
diff --git a/alacritty/.config/alacritty/colors.yml b/alacritty/.config/alacritty/colors.yml
deleted file mode 100644
index 6ec7b68..0000000
--- a/alacritty/.config/alacritty/colors.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-# Colors (Gruvbox dark)
-colors:
-  primary:
-    background: &gruvbox_dark_bg "#1d2021"
-    foreground: "#ebdbb2"
-    bright_foreground: "#fbf1c7"
-    dim_foreground: "#a89984"
-  cursor:
-    text: CellBackground
-    cursor: CellForeground
-  vi_mode_cursor:
-    text: CellBackground
-    cursor: CellForeground
-  # search:
-  #   matches:
-  #     foreground: '#000000'
-  #     background: '#ffffff'
-  #   focused_match:
-  #    foreground: CellBackground
-  #    background: CellForeground
-  #   bar:
-  #     background: ''
-  #     foreground: ''
-  # line_indicator:
-  #   foreground: None
-  #   background: None
-  selection:
-    text: CellBackground
-    background: CellForeground
-  bright:
-    black: "#928374"
-    red: "#fb4934"
-    green: "#b8bb26"
-    yellow: "#fabd2f"
-    blue: "#83a598"
-    magenta: "#d3869b"
-    cyan: "#8ec07c"
-    white: "#ebdbb2"
-  normal:
-    black: *gruvbox_dark_bg
-    red: "#cc241d"
-    green: "#98971a"
-    yellow: "#d79921"
-    blue: "#458588"
-    magenta: "#b16286"
-    cyan: "#689d6a"
-    white: "#a89984"
-  dim:
-    black: "#32302f"
-    red: "#9d0006"
-    green: "#79740e"
-    yellow: "#b57614"
-    blue: "#076678"
-    magenta: "#8f3f71"
-    cyan: "#427b58"
-    white: "#928374"
-  # indexed_colors: []
diff --git a/alacritty/.config/alacritty/font.yml b/alacritty/.config/alacritty/font.yml
deleted file mode 100644
index cbce028..0000000
--- a/alacritty/.config/alacritty/font.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-font:
-  normal:
-    family: Fira Code Nerd Font
-  size: 15
diff --git a/alacritty/.config/alacritty/key_bindings.yml b/alacritty/.config/alacritty/key_bindings.yml
deleted file mode 100644
index e695a69..0000000
--- a/alacritty/.config/alacritty/key_bindings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-key_bindings:
-  - { key: Space, mods: Control, chars: "\x00" }
-  - { key: T, mods: Control|Shift, action: CreateNewWindow }
-  - { key: F, mods: Control|Shift, mode: ~Search, action: ReceiveChar }
-  - { key: Return, mods: Alt, action: ToggleFullscreen }
diff --git a/alacritty/.config/alacritty/shell.yml b/alacritty/.config/alacritty/shell.yml
deleted file mode 100644
index cde304b..0000000
--- a/alacritty/.config/alacritty/shell.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-shell:
-  program: /bin/zsh
-  args:
-    - -c
-    - tmux new -A
diff --git a/alacritty/.config/alacritty/window.yml b/alacritty/.config/alacritty/window.yml
deleted file mode 100644
index df8da7b..0000000
--- a/alacritty/.config/alacritty/window.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-window:
-  dimensions:
-    columns: 120
-    lines: 40
-  dynamic_padding: false
-  decorations: none
-  opacity: 0.95