diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index f0c8ad6..a6b9b18 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -20,9 +20,9 @@ return {
             -- For Windows users, TERM may not be present in environment variables.
             -- Consider using APPDATA instead.
             api_key = 'TERM',
-            name = 'Llama.cpp',
-            end_point = 'http://127.0.0.1:1234/v1/completions',
-            model = 'codellama-7b-instruct',
+            name = 'Ollama',
+            end_point = 'http://127.0.0.1:11434/v1/completions',
+            model = 'codellama:7b-code',
 --            template = {
 --              prompt = function(context_before_cursor, context_after_cursor, _)
 --                return '<|fim_prefix|>'
diff --git a/.config/waybar/config b/.config/waybar/config
deleted file mode 100644
index 223acdb..0000000
--- a/.config/waybar/config
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "layer": "top", // Waybar at top layer
-    "position": "top", // Waybar position (top|bottom|left|right)
-    // "width": 1280, // Waybar width
-    // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "pulseaudio", "clock"],
-    "modules-right": ["tray", "memory", "battery", "custom/power"],
-    "sway/workspaces": {
-         "disable-scroll": true,
-         "sort-by-name": true,
-         "format": " {index} {icon} ",
-         "format-icons": {
-             "default": "◇",
-             "focused": "◈",
-         },
-     },
-    "tray": {
-        "icon-size": 21,
-        "spacing": 10
-    },
-    "custom/music": {
-        "format": "  {}",
-        "escape": true,
-        "interval": 5,
-        "tooltip": false,
-        "exec": "playerctl metadata --format='{{ title }}'",
-        "on-click": "playerctl play-pause",
-        "max-length": 50
-    },
-    "clock": {
-        "timezone": "America/Montreal",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format": "🕐 {:%H:%M  📅 %d/%m/%y} "
-    },
-    "backlight": {
-        "device": "intel_backlight",
-        "format": "{icon}",
-        "format-icons": ["", "", "", "", "", "", "", "", ""]
-    },
-    "memory": {
-        "format": "{used:0.1f}/{total:0.1f}G"
-    },
-    "battery": {
-        "states": {
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "🔋{capacity}%",
-        "format-charging": "⚡{capacity}%",
-        "format-plugged": "🔌{capacity}%",
-        "format-alt": "{icon}",
-        "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
-    },
-    "custom/power": {
-        "format" : "⏻",
-        "tooltip": false,
-        "menu": "on-click",
-        "menu-file": "~/.config/waybar/power_menu.xml",
-        "menu-actions": {
-            "shutdown": "systemctl poweroff",
-            "reboot": "systemctl reboot"
-        }
-    },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{icon} {volume}%",
-        "format-muted": "",
-        "format-icons": {
-            "default": ["", "", " "]
-        },
-        "on-click": "pwvucontrol"
-    },
-}
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
new file mode 100644
index 0000000..d4bf9d0
--- /dev/null
+++ b/.config/waybar/config.jsonc
@@ -0,0 +1,73 @@
+{
+  "layer": "top", // Waybar at top layer
+  "position": "top", // Waybar position (top|bottom|left|right)
+    // "width": 1280, // Waybar width
+    // Choose the order of the modules
+    "modules-left": ["sway/workspaces", "pulseaudio", "clock"],
+    "modules-right": ["tray", "memory", "battery", "custom/power"],
+    "sway/workspaces": {
+      "disable-scroll": true,
+      "sort-by-name": true,
+      "format": " {index} {icon} ",
+      "format-icons": {
+        "default": "◇",
+        "focused": "◈",
+      },
+    },
+    "tray": {
+      "icon-size": 21,
+      "spacing": 10
+    },
+    "custom/music": {
+      "format": "  {}",
+      "escape": true,
+      "interval": 5,
+      "tooltip": false,
+      "exec": "playerctl metadata --format='{{ title }}'",
+      "on-click": "playerctl play-pause",
+      "max-length": 50
+    },
+    "clock": {
+      "timezone": "America/Montreal",
+      "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+      "format": "🕐 {:%H:%M  📅 %d/%m/%y} "
+    },
+    "backlight": {
+      "device": "intel_backlight",
+      "format": "{icon}",
+      "format-icons": ["", "", "", "", "", "", "", "", ""]
+    },
+    "memory": {
+      "format": "{used:0.1f}/{total:0.1f}G"
+    },
+    "battery": {
+      "states": {
+        "warning": 30,
+        "critical": 15
+      },
+      "format": "🔋{capacity}%",
+      "format-charging": "⚡{capacity}%",
+      "format-plugged": "🔌{capacity}%",
+      "format-alt": "{icon}",
+      "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
+    },
+    "custom/power": {
+      "format" : "⏻",
+      "tooltip": false,
+      "menu": "on-click",
+      "menu-file": "~/.config/waybar/power_menu.xml",
+      "menu-actions": {
+        "shutdown": "systemctl poweroff",
+        "reboot": "systemctl reboot"
+      }
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{icon} {volume}%",
+        "format-muted": "",
+        "format-icons": {
+          "default": ["", "", " "]
+        },
+        "on-click": "pwvucontrol"
+    },
+}
diff --git a/.tmux.conf b/.tmux.conf
index e9cecc2..537c5c7 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,5 +1,7 @@
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g @plugin 'catppuccin/tmux#v2.1.3'
+set -g @plugin 'tmux-plugins/tpm'
 
 set -g @continuum-save-interval '2'
 set -g @continuum-restore 'on'
@@ -19,24 +21,17 @@ set -g history-limit 50000
 set -g default-terminal "$TERM"
 set -ag terminal-overrides ",$TERM:Tc"
 
-
-# Status bar configuration
 set -g status-interval 10
-set -g status-position bottom
-set -g status-bg colour235
-set -g status-fg colour136
-set -g status-left-length 40
-set -g status-left "#[fg=green]Session: #S #[fg=yellow]#I #[fg=cyan]#P"
-set -g status-right "#[fg=cyan]%d %b %R"
-set -g status-justify centre
 
-# Window status
-setw -g window-status-current-style "fg=black,bg=red"
-setw -g window-status-current-format " #I:#W#F "
-setw -g window-status-style "fg=brightblue,bg=black"
-setw -g window-status-format " #I:#W#F "
-# Pane borders
-set -g pane-border-style "fg=colour238"
-set -g pane-active-border-style "fg=colour208"
+
+set -g @catppuccin_window_text " #W"
+set -g @catppuccin_window_default_text " #W"
+set -g @catppuccin_window_current_text " #W"
+
+run ~/.tmux/plugins/tmux/catppuccin.tmux
+
+set -g status-justify "left"
+set -g status-left " "
+set -gF status-right "#[fg=#{@thm_crust},bg=#{@thm_teal}] ##H "
 
 run '/usr/share/tmux-plugin-manager/tpm'