shell: add aliases

- nvim: shorcut and dashboard changes
- shell: fix greeting

.gitignore

@@ -0,0 +1,25 @@
+*
+
+!.gitignore
+
+!docs
+!docs/**
+
+!hosts
+!hosts/**
+
+!lib
+!lib/**
+
+!modules
+!modules/**
+
+!nixpkgs-overlay
+!nixpkgs-overlay/**
+
+!AGENTS.md
+!flake.lock
+!flake.nix
+!keys.nix
+!rebuild.nu
+!secrets.nix

.zshrc

@@ -1 +0,0 @@
-/nix/store/mlnm2lb8zaplnmaqb9k0pfprdwqbdn8b-home-manager-files/.zshrc

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

modules/common/shell/aliases.nix

@@ -16,7 +16,8 @@
     tree   = "eza --tree --git-ignore --group-directories-first";
 
     # Editor aliases
-    v   = "nvim .";
+    x   = "nvim .";
+    v   = "nvim";
     vi  = "vim";
     vim = "nvim";
 
@@ -34,12 +35,15 @@
     ela = "eza -la";
 
     # Git aliases
+    lg = "lazygit";
     gs  = "git status";
     ga  = "git add";
     gc  = "git commit";
+    gcm = "git commit -m";
     gp  = "git push";
     gl  = "git log";
     gd  = "git diff";
+    gdc  = "git diff --cached";
     gco = "git checkout";
     gb  = "git branch";
     gm  = "git merge";
@@ -50,6 +54,7 @@
 
     # Rebuild helper
     rb = "nh darwin switch . -- --extra-experimental-features \"nix-command pipe-operators\"";
+    rbc = "nh darwin switch . -- --extra-experimental-features \"nix-command pipe-operators\" --option extra-substituters \"\"";
     rebuild = "${../../../rebuild.nu}";
   };
 }

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 ];
+}

modules/dotfiles/nvim/lua/thegeneralist/lazy/colors.lua

@@ -1,6 +1,6 @@
 function ColorMyPencils(color)
   -- color = color or "rose-pine"
-  color = color or "tokyonight-storm" or "rose-pine" or "tokyonight-night"
+  color = color or "catppuccin-mocha" or "tokyonight-storm" or "rose-pine" or "tokyonight-night"
   vim.cmd.colorscheme(color)
 
   -- vim.api.nvim_set_hl(0, "Normal", { bg = "none" })

modules/dotfiles/nvim/lua/thegeneralist/lazy/snacks.lua

@@ -0,0 +1,109 @@
+return {
+  {
+    "dmtrKovalenko/fff.nvim",
+    build = function()
+      require("fff.download").download_or_build_binary()
+    end,
+    opts = { -- (optional)
+      debug = {
+        enabled = false,
+        show_scores = true,
+      },
+    },
+    -- No need to lazy-load with lazy.nvim.
+    -- This plugin initializes itself lazily.
+    lazy = false,
+    keys = {
+      {
+        "<leader>ff", -- try it if you didn't it is a banger keybinding for a picker
+        function()
+          require("fff").find_files()
+        end,
+        desc = "FFFind files",
+      },
+    },
+  },
+  {
+    "folke/snacks.nvim",
+    priority = 1000,
+    lazy = false,
+    dependencies = {
+      "nvim-tree/nvim-web-devicons",
+      "nvim-mini/mini.icons",
+    },
+    ---@type snacks.Config
+    opts = {
+      bigfile = { enabled = true },
+      dashboard = {
+        enabled = true,
+        preset = {
+          keys = {
+            {
+              icon = " ",
+              key = "f",
+              desc = "Find File",
+              -- action = ":lua Snacks.dashboard.pick('files')"
+              action = ":lua require('fff').find_files()",
+            },
+            { icon = " ", key = "n", desc = "New File", action = ":ene | startinsert" },
+            {
+              icon = " ",
+              key = "g",
+              desc = "Find Text",
+              action = ":lua Snacks.dashboard.pick('live_grep')",
+            },
+            {
+              icon = " ",
+              key = "r",
+              desc = "Recent Files",
+              action = ":lua Snacks.dashboard.pick('oldfiles')",
+            },
+            {
+              icon = " ",
+              key = "c",
+              desc = "Config",
+              action = ":lua Snacks.dashboard.pick('files', {cwd = vim.fn.stdpath('config')})",
+            },
+            { icon = " ", key = "s", desc = "Restore Session", section = "session" },
+            {
+              icon = "󰒲 ",
+              key = "L",
+              desc = "Lazy",
+              action = ":Lazy",
+              enabled = package.loaded.lazy ~= nil,
+            },
+            { icon = " ", key = "q", desc = "Quit", action = ":qa" },
+          },
+        },
+        sections = {
+          {
+            section = "terminal",
+            cmd = "greeting",
+            hl = "header",
+            ttl = 60,
+            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 },
+      input = { enabled = true },
+
+      picker = { enabled = true },
+      notifier = { enabled = false },
+      quickfile = { enabled = true },
+
+      scope = { enabled = true },
+
+      -- hmmm:
+      scroll = { enabled = false },
+      statuscolumn = { enabled = false },
+      words = { enabled = false },
+    },
+  },
+}

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, {})
 

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")