diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix
index 7487cf5..859c732 100644
--- a/nix/home-manager/modules/packages/default.nix
+++ b/nix/home-manager/modules/packages/default.nix
@@ -33,6 +33,7 @@ in {
       docker-client
       dogdns
       erdtree
+      erg
       emacs
       fd
       ffmpeg_6
@@ -59,6 +60,7 @@ in {
       poetry
       ripgrep
       rsync
+      scriptisto
       sqlite
       tmux
       # vscode-fhs
diff --git a/nix/home-manager/modules/packages/neovim.nix b/nix/home-manager/modules/packages/neovim.nix
index a4e9e2f..407c9e0 100644
--- a/nix/home-manager/modules/packages/neovim.nix
+++ b/nix/home-manager/modules/packages/neovim.nix
@@ -19,6 +19,29 @@
       fugitive = {
         enable = true;
       };
+      gitsigns = {
+        enable = true;
+      };
+      lualine = {
+        enable = true;
+        # theme = "bubbles_theme"; # Currently doesn't work
+        componentSeparators = {
+          left = "";
+          right = "";
+        };
+        sectionSeparators = {
+          left = "";
+          right = "";
+        };
+        sections = {
+          lualine_a = ["mode" {separator = {left = "";};} {right_padding = 2;}];
+          lualine_b = ["filename" "branch"];
+          lualine_c = ["%="];
+          lualine_x = [];
+          lualine_y = ["filetype" "progress"];
+          lualine_z = ["location" {separator = {right = "";};} {left_padding = 2;}];
+        };
+      };
       luasnip = {
         enable = true;
       };
@@ -27,11 +50,13 @@
       };
       lspconfig = {
         enable = true;
+        preConfig = ''
+        '';
         servers = {
           bashls.enable = true;
           gopls.enable = true;
           jsonls.enable = true;
-          pyright.enable = true;
+          pyright.enable = true; # In preference to attempting to use pylyzer
           nil.enable = true;
           rust-analyzer.enable = true;
           taplo.enable = true;
@@ -182,7 +207,6 @@
           vim-bbye
           vim-dispatch-neovim
           vim-expand-region
-          vim-signify
         ]
       )
       ++ (with pkgs.vimExtraPlugins; [
diff --git a/nix/home-manager/modules/packages/neovim/pre.lua b/nix/home-manager/modules/packages/neovim/pre.lua
index 5f62d47..b146f2f 100644
--- a/nix/home-manager/modules/packages/neovim/pre.lua
+++ b/nix/home-manager/modules/packages/neovim/pre.lua
@@ -28,3 +28,31 @@ local kind_icons = {
 	Operator = "",
 	TypeParameter = "",
 }
+
+local colors = {
+	blue = "#80a0ff",
+	cyan = "#79dac8",
+	black = "#080808",
+	white = "#c6c6c6",
+	red = "#ff5189",
+	violet = "#d183e8",
+	grey = "#303030",
+}
+
+local bubbles_theme = {
+	normal = {
+		a = { fg = colors.black, bg = colors.violet },
+		b = { fg = colors.white, bg = colors.grey },
+		c = { fg = colors.white },
+	},
+
+	insert = { a = { fg = colors.black, bg = colors.blue } },
+	visual = { a = { fg = colors.black, bg = colors.cyan } },
+	replace = { a = { fg = colors.black, bg = colors.red } },
+
+	inactive = {
+		a = { fg = colors.white, bg = colors.black },
+		b = { fg = colors.white, bg = colors.black },
+		c = { fg = colors.white },
+	},
+}