Merge pull request #337 from genebean/e2

Add some extra stuff, again

modules/home-manager/common/all-cli.nix

@@ -1,14 +1,24 @@
-{ pkgs, genebean-omp-themes, ... }: {
+{ pkgs, genebean-omp-themes, ... }: let
+  sqlite_lib = if builtins.elem pkgs.system [
+                 "aarch64-darwin"
+                 "x86_64-darwin"
+               ]
+               then "libsqlite3.dylib"
+               else "libsqlite3.so";
+in {
   home.packages = with pkgs; [
     cargo
+    cheat
     colordiff
     dogdns
     dos2unix
     du-dust
+    duf
     fd
     git-filter-repo
     gotop
     htop
+    httpie
     hub
     jq
     lazygit
@@ -65,6 +75,8 @@
         };
       };
     };
+    bottom.enable = true;
+    broot.enable = true;
     eza.enable = true;
     gh.enable = true;
     git = {
@@ -90,15 +102,22 @@
     jq.enable = true;
     neovim = {
       enable = true;
-      defaultEditor = false;
+      defaultEditor = true;
       extraLuaConfig = ''
         local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
         vim.opt.rtp:prepend(lazypath)
 
         require("config.keymaps")
         require("lazy").setup("plugins")
+
+        vim.g.sqlite_clib_path = '${pkgs.sqlite.out}/lib/${sqlite_lib}'
+        -- NOTE: This will get the OS from Lua:
+        -- print(vim.loop.os_uname().sysname)
       '';
-      extraPackages = [ pkgs.gcc ]; # needed so treesitter can do compiling
+      extraPackages = with pkgs; [
+        gcc    # needed so treesitter can do compiling
+        sqlite # needed by sqlite.lua used by telescope-cheat
+      ];
       plugins = [ pkgs.vimPlugins.lazy-nvim ]; # let lazy.nvim manage every other plugin
     };
     oh-my-posh = {
@@ -128,7 +147,7 @@
     };
     vim = {
       enable = true;
-      defaultEditor = true;
+      defaultEditor = false;
       plugins = with pkgs.vimPlugins; [
         syntastic
         tabular
@@ -233,6 +252,7 @@
         bcrrs = "bcrr --stream --no-verbose";
         beo = "bundle exec onceover run spec --trace --force";
         biv = "bundle install --path=vendor/bundle";
+        bottom = "echo 'To run bottom, the command is btm'";
         ce = "code-exploration";
         dots = "cd ~/repos/dots";
         gbc = ''
@@ -245,6 +265,7 @@
         sal = "ssh-add -L";
         st = "open -a SourceTree";
         sz = "source ~/.zshrc";
+        trippy = "echo 'To run trippy, the command is trip'";
         usegpg = "killall ssh-agent; export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) && gpgconf --launch gpg-agent";
         usessh = "gpgconf --kill gpg-agent";
       };
@@ -252,8 +273,12 @@
   }; # end programs
 
   home.file = {
-    ".config/nvim/lua" = {
+    ".config/nvim/lua/config" = {
-      source = ../files/nvim/lua;
+      source = ../files/nvim/lua/config;
+      recursive = true;
+    };
+    ".config/nvim/lua/plugins" = {
+      source = ../files/nvim/lua/plugins;
       recursive = true;
     };
     ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1;

modules/home-manager/files/nvim/lua/config/keymaps.lua

@@ -1,6 +1,9 @@
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
+-- make sure vim know I always have a dark terminal
+vim.opt.background = "dark"
+
 -- use spaces for tabs and whatnot
 vim.opt.expandtab = true
 vim.opt.tabstop = 2
@@ -8,4 +11,4 @@ vim.opt.softtabstop = 2
 vim.opt.shiftwidth = 2
 vim.opt.shiftround = true
 
-vim.keymap.set('n', '<leader>h', ':nohlsearch<CR>')
+vim.keymap.set("n", "<leader>h", ":nohlsearch<CR>")

modules/home-manager/files/nvim/lua/plugins/telescope-cheat.lua

@@ -0,0 +1,7 @@
+return {
+  "nvim-telescope/telescope-cheat.nvim",
+  dependencies = {
+    "kkharji/sqlite.lua",
+    "nvim-telescope/telescope.nvim",
+  },
+}

modules/home-manager/files/nvim/lua/plugins/telescope-symbols.lua

@@ -0,0 +1 @@
+return { "nvim-telescope/telescope-symbols.nvim" }

modules/home-manager/files/nvim/lua/plugins/telescope-ui-select.lua

@@ -1,18 +1,3 @@
 return {
   "nvim-telescope/telescope-ui-select.nvim",
-  config = function ()
-    -- This is your opts table
-    require("telescope").setup({
-      extensions = {
-        ["ui-select"] = {
-          require("telescope.themes").get_dropdown({
-            -- even more opts
-          })
-        }
-      }
-    })
-    -- load_extension, somewhere after setup function:
-    require("telescope").load_extension("ui-select")
-  end
 }
-

modules/home-manager/files/nvim/lua/plugins/telescope.lua

@@ -2,12 +2,28 @@ return {
   "nvim-telescope/telescope.nvim",
   tag = "0.1.5",
   dependencies = { "nvim-lua/plenary.nvim" },
-  config = function ()
+  config = function()
-    local builtin = require('telescope.builtin')
+    -- This is your opts table
+    require("telescope").setup({
+      extensions = {
+        ["ui-select"] = {
+          require("telescope.themes").get_dropdown({
+            -- even more opts
+          }),
+        },
+      },
+    })
 
-    vim.keymap.set('n', '<C-p>', builtin.find_files, {})
+    -- load_extension, somewhere after setup function:
-    vim.keymap.set('n', '<Space><Space>', builtin.oldfiles, {})
+    require("telescope").load_extension("cheat")
-    vim.keymap.set('n', '<Space>fg', builtin.live_grep, {})
+    require("telescope").load_extension("ui-select")
-    vim.keymap.set('n', '<Space>fh', builtin.help_tags, {})
+
-  end
+    local builtin = require("telescope.builtin")
+
+    vim.keymap.set("n", "<leader>ts", ":Telescope<CR>")
+    vim.keymap.set("n", "<C-p>", builtin.find_files, {})
+    vim.keymap.set("n", "<leader><leader>", builtin.oldfiles, {})
+    vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+    vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
+  end,
 }

modules/system/common/all-darwin.nix

@@ -8,6 +8,7 @@
     ];
     systemPackages = with pkgs; [
       age
+      bandwhich
       coreutils
       hugo
       mas
@@ -46,11 +47,14 @@
       "font-inconsolata-g-for-powerline"
       "font-source-code-pro-for-powerline"
       "gitkraken"
+      "handbrake"
       "iterm2"
       "keepingyouawake"
       "libreoffice"
       "logseq"
+      "makemkv"
       "meld"
+      "MKVToolNix"
       "nextcloud"
       "onlyoffice"
       "raycast"

modules/system/common/all-nixos.nix

@@ -43,6 +43,7 @@
   };
 
   programs = {
+    bandwhich.enable = true;
     zsh.enable = true;
   };