diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix
index a2acd70..f7cb482 100644
--- a/nix/neovim-overlay.nix
+++ b/nix/neovim-overlay.nix
@@ -29,6 +29,7 @@ with final.pkgs.lib; let
     # ^ Debugger/task runner
 
     # Themes
+    catppuccin-nvim # Soothing pastel theme for (Neo)vim
     tokyonight-nvim # https://github.com/folke/tokyonight.nvim
 
     # plugins from nixpkgs go in here.
diff --git a/nvim/init.lua b/nvim/init.lua
index 72813ae..a685ec8 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -15,6 +15,8 @@ if fn.has('termguicolors') then
   opt.termguicolors = true
 end
 
+vim.cmd.colorscheme "catppuccin-mocha"
+
 -- See :h <option> to see what the options do
 
 -- Search down into subfolders
@@ -110,7 +112,7 @@ vim.diagnostic.config {
 
 g.editorconfig = true
 
-cmd[[colorscheme tokyonight]]
+-- cmd[[colorscheme tokyonight]]
 vim.opt.colorcolumn = '80,100'
 
 -- Native plugins
diff --git a/nvim/plugin/1.catppuccin.lua b/nvim/plugin/1.catppuccin.lua
new file mode 100644
index 0000000..c7d8c98
--- /dev/null
+++ b/nvim/plugin/1.catppuccin.lua
@@ -0,0 +1,27 @@
+if vim.g.did_load_catppuccin_plugin then
+  return
+end
+vim.g.did_load_catppuccin_plugin = true
+
+require("catppuccin").setup({
+  integrations = {
+    aerial = true,
+    cmp = true,
+    diffview = true,
+    gitsigns = true,
+    indent_blankline = {
+      enabled = true,
+      -- scope_color = "", -- catppuccin color (eg. `lavender`) Default: text
+      colored_indent_levels = false,
+    },
+    lsp_trouble = true,
+    navic = {
+      enabled = false,
+      custom_bg = "NONE", -- "lualine" will set background to mantle
+    },
+    nvim_surround = true,
+    overseer = true,
+    treesitter = true,
+    which_key = true,
+  }
+})
diff --git a/nvim/plugin/bufferline.lua b/nvim/plugin/bufferline.lua
new file mode 100644
index 0000000..1213053
--- /dev/null
+++ b/nvim/plugin/bufferline.lua
@@ -0,0 +1,27 @@
+if not vim.g.did_load_catppuccin_plugin then
+  require("bufferline").setup{}
+  return
+end
+
+if vim.g.did_load_bufferline_plugin then
+  return
+end
+vim.g.did_load_bufferline_plugin = true
+
+local mocha = require("catppuccin.palettes").get_palette "mocha"
+require("bufferline").setup {
+    highlights = require("catppuccin.groups.integrations.bufferline").get {
+        styles = { "italic", "bold" },
+        custom = {
+            all = {
+                fill = { bg = "#000000" },
+            },
+            mocha = {
+                background = { fg = mocha.text },
+            },
+            latte = {
+                background = { fg = "#000000" },
+            },
+        },
+    },
+}
diff --git a/nvim/plugin/lualine.lua b/nvim/plugin/lualine.lua
index c2b1866..b4d40db 100644
--- a/nvim/plugin/lualine.lua
+++ b/nvim/plugin/lualine.lua
@@ -45,7 +45,7 @@ require('lualine').setup {
     },
   },
   options = {
-    theme = 'auto',
+    theme = 'catppuccin-mocha',
     -- component_separators = { left = '', right = ''},
     component_separators = { left = '', right = '' },
     -- section_separators = { left = '', right = ''},
diff --git a/nvim/plugin/plugins.lua b/nvim/plugin/plugins.lua
index 71ec690..a7803d1 100644
--- a/nvim/plugin/plugins.lua
+++ b/nvim/plugin/plugins.lua
@@ -14,6 +14,5 @@ require('which-key').setup()
 require('Comment').setup()
 require("better_escape").setup()
 require("todo-comments").setup()
-require("bufferline").setup{}
 require("toggleterm").setup()
 require("trouble").setup()