diff --git a/modules/common/shell/0_nushell.nu b/modules/common/shell/0_nushell.nu
index a0c4951..21c5d80 100644
--- a/modules/common/shell/0_nushell.nu
+++ b/modules/common/shell/0_nushell.nu
@@ -423,20 +423,4 @@ def --wrapped jc [...arguments: string@"nu-complete jc"]: [any -> table, any ->
   }
 }
 
-# Your custom greeting
-def greeting [] {
-  let quotes = [
-    "What is impossible for you is not impossible for me."
-    "Why do we fall, Master Wayne? So that we can learn to pick ourselves up. - Alfred Pennyworth"
-    "Endure, Master Wayne. Take it. They'll hate you for it, but that's the point of Batman. He can be the outcast. He can make the choice… that no one else can make. The right choice. - Alfred Pennyworth"
-    "— I never said thank you.\n— And you will never have to."
-    "A hero can be anyone, even a man doing something as simple and reassuring as putting a coat on a young boy's shoulders to let him know that the world hadn't ended. - Batman"
-    "— Come with me. Save yourself. You don't owe these ppl anymore, you've given them everything.\n— Not everything. Not yet."
-    "The night is always darkest before the dawn, but I promise you, the dawn is coming. - Harvey Dent"
-    "It's not who you are underneath, but what you do that defines you. - Batman"
-    "The idea was to be a symbol. Batman... could be anybody. That was the point. - Bruce Wayne"
-  ]
-  echo ($quotes | get (random int 0..(($quotes | length) - 1)))
-}
-
 greeting
diff --git a/modules/common/shell/aliases.nix b/modules/common/shell/aliases.nix
index 92b0a24..7f1ea3c 100644
--- a/modules/common/shell/aliases.nix
+++ b/modules/common/shell/aliases.nix
@@ -35,6 +35,7 @@
     ela = "eza -la";
 
     # Git aliases
+    lg = "lazygit";
     gs  = "git status";
     ga  = "git add";
     gc  = "git commit";
diff --git a/modules/common/shell/greeting.nix b/modules/common/shell/greeting.nix
new file mode 100644
index 0000000..ca4aa26
--- /dev/null
+++ b/modules/common/shell/greeting.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+let
+  greeting = pkgs.writeScriptBin "greeting" ''
+    #!${pkgs.nushell}/bin/nu
+
+    let quotes = [
+      "What is impossible for you is not impossible for me."
+      "Why do we fall, Master Wayne? So that we can learn to pick ourselves up. - Alfred Pennyworth"
+      "Endure, Master Wayne. Take it. They'll hate you for it, but that's the point of Batman. He can be the outcast. He can make the choice that no one else can make. The right choice. - Alfred Pennyworth"
+      "— I never said thank you.\n— And you will never have to."
+      "A hero can be anyone, even a man doing something as simple and reassuring as putting a coat on a young boy's shoulders to let him know that the world hadn't ended. - Batman"
+      "— Come with me. Save yourself. You don't owe these ppl anymore, you've given them everything.\n— Not everything. Not yet."
+      "The night is always darkest before the dawn, but I promise you, the dawn is coming. - Harvey Dent"
+      "It's not who you are underneath, but what you do that defines you. - Batman"
+      "The idea was to be a symbol. Batman... could be anybody. That was the point. - Bruce Wayne"
+    ]
+
+    print ($quotes | get (random int 0..(($quotes | length) - 1)))
+  '';
+in
+{
+  environment.systemPackages = [ greeting ];
+}
diff --git a/modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua
index da1afae..9ffa1a3 100644
--- a/modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua
+++ b/modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua
@@ -27,6 +27,10 @@ return {
     "folke/snacks.nvim",
     priority = 1000,
     lazy = false,
+    dependencies = {
+      "nvim-tree/nvim-web-devicons",
+      "nvim-mini/mini.icons",
+    },
     ---@type snacks.Config
     opts = {
       bigfile = { enabled = true },
@@ -71,6 +75,19 @@ return {
             { icon = " ", key = "q", desc = "Quit", action = ":qa" },
           },
         },
+        sections = {
+          {
+            section = "terminal",
+            cmd = "greeting",
+            hl = "header",
+            height = 3,
+            padding = 2,
+            align = "center",
+          },
+          { section = "keys", gap = 1, padding = 1 },
+          { icon = " ", title = "Recent Files", section = "recent_files", indent = 3, padding = 3 },
+          { section = "startup" },
+        },
       },
       explorer = { enabled = false },
       image = { enabled = true },
diff --git a/modules/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua b/modules/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua
index 8acccf9..b4fe6ea 100644
--- a/modules/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua
+++ b/modules/dotfiles/nvim/lua/thegeneralist/lazy/telescope.lua
@@ -21,7 +21,7 @@ return {
 		local builtin = require("telescope.builtin")
 		pcall(require("telescope").load_extension, "fzf")
 
-		vim.keymap.set("n", "<leader>ps", function()
+		vim.keymap.set("n", "<leader>fs", function()
 			local search_string = vim.fn.input("Grep > ")
 			if search_string == "" then
 				return
@@ -39,9 +39,9 @@ return {
 			builtin.grep_string({ search = word })
 		end)
 
-		vim.keymap.set("n", "<leader>pg", builtin.live_grep, {})
+		vim.keymap.set("n", "<leader>fw", builtin.live_grep, {})
+
 
-		vim.keymap.set("n", "<leader>pf", builtin.find_files, {})
 
 		vim.keymap.set("n", "<C-p>", builtin.git_files, {})
 
diff --git a/modules/dotfiles/nvim/lua/thegeneralist/remap.lua b/modules/dotfiles/nvim/lua/thegeneralist/remap.lua
index 41b94c0..c626618 100755
--- a/modules/dotfiles/nvim/lua/thegeneralist/remap.lua
+++ b/modules/dotfiles/nvim/lua/thegeneralist/remap.lua
@@ -38,7 +38,7 @@ vim.keymap.set("i", "<C-c>", "<Esc>")
 
 vim.keymap.set("n", "Q", "<nop>")
 vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
-vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
+vim.keymap.set("n", "<leader>fr", vim.lsp.buf.format)
 
 vim.keymap.set("n", "<leader>m<C-k>", "<cmd>cnext<CR>zz")
 vim.keymap.set("n", "<leader>m<C-j>", "<cmd>cprev<CR>zz")