feat: update fish; add lazygit

Author: solidsnakedev

home-manager/mac/home.nix

@@ -41,6 +41,7 @@
       convco
       gh
       eza
+      lazygit
     ];
 
   programs.alacritty = {
@@ -109,6 +110,15 @@
       # eval "$(/opt/homebrew/bin/brew shellenv)"
       tmux source-file ~/.config/tmux/tmux.conf
     '';
+    # plugins = [{
+    #   name = "foreign-env";
+    #   src = pkgs.fetchFromGitHub {
+    #     owner = "oh-my-fish";
+    #     repo = "plugin-foreign-env";
+    #     rev = "7f0cf099ae1e1e4ab38f46350ed6757d54471de7";
+    #     sha256 = "sha256-4+k5rSoxkTtYFh/lEjhRkVYa2S4KEzJ/IJbyJl+rJjQ=";
+    #   };
+    # }];
   };
 
   xdg.configFile.yabai = {

hosts/mac/configuration.nix

@@ -44,6 +44,11 @@
       upgrade = true;
       cleanup = "zap";
     };
+    brews = [
+    ];
+    casks = [
+      "docker"
+    ];
   };
 
   # Global system settings

modules/init.lua

@@ -18,6 +18,20 @@ local function tmap(shortcut, command)
   map('t', shortcut, command)
 end
 
+-- Define the function as global
+function hover_and_diagnostics()
+  -- Check for diagnostics at the current cursor position
+  local diagnostics = vim.diagnostic.get(0, { lnum = vim.fn.line('.') - 1 })
+
+  if #diagnostics > 0 then
+    -- Show diagnostics if any exist
+    vim.diagnostic.open_float(nil, { focus = false, border = "rounded" })
+  else
+    -- Otherwise, show hover information
+    vim.lsp.buf.hover()
+  end
+end
+
 vim.opt.updatetime = 100
 -- disable netrw at the very start of your init.lua (strongly advised)
 vim.g.loaded_netrw = 1
@@ -96,7 +110,8 @@ nmap("<leader>c", ":Bdelete<cr>")
 vmap(">", ">gv")
 vmap("<", "<gv")
 tmap("<Esc>", "<C-\\><C-n>")
-
+-- Map 'K' to hover_and_diagnostics
+-- vim.api.nvim_set_keymap('n', 'K', ':lua hover_and_diagnostics()<CR>', { noremap = true, silent = true })
 
 require("neo-tree").setup({
   close_if_last_window = true, -- Close Neo-tree if it is the last window left in the tab
@@ -121,22 +136,6 @@ require("neo-tree").setup({
   }
 })
 
-local wilder = require('wilder')
-wilder.setup({
-  modes = { ':', '/', '?' },
-})
-wilder.set_option('renderer', wilder.popupmenu_renderer(
-  wilder.popupmenu_border_theme({
-    highlighter = wilder.basic_highlighter(),
-    highlights = {
-      accent = wilder.make_hl('WilderAccent', 'Pmenu', { { a = 1 }, { a = 1 }, { foreground = '#f4468f' } }),
-    },
-    border = 'rounded',
-    left = { ' ', wilder.popupmenu_devicons() },
-    right = { ' ', wilder.popupmenu_scrollbar() },
-  })
-))
-
 require('dashboard').setup({
   config = {
     week_header = {
@@ -146,28 +145,16 @@ require('dashboard').setup({
 })
 
 require('lspconfig').hls.setup {
-  cmd = (vim.fn.executable('haskell-language-server-wrapper') == 1 and { 'haskell-language-server-wrapper', '--lsp' })
+  cmd =
+      (vim.fn.executable('haskell-language-server-wrapper') == 1 and { 'haskell-language-server-wrapper', '--lsp' })
       or (vim.fn.executable('haskell-language-server') == 1 and { 'haskell-language-server', '--lsp' })
       or nil,
 }
 
--- require("noice").setup({
---   routes = {
---     {
---       view = "notify",
---       filter = { event = "msg_showmode" },
---     },
---   },
--- })
-
--- require("lualine").setup({
---   sections = {
---     lualine_x = {
---       {
---         require("noice").api.statusline.mode.get,
---         cond = require("noice").api.statusline.mode.has,
---         color = { fg = "#ff9e64" },
---       }
---     },
---   },
--- })
+vim.api.nvim_create_autocmd('TextYankPost', {
+  desc = 'Highlight when yanking (copying) text',
+  group = vim.api.nvim_create_augroup('highlight-yank', { clear = true }),
+  callback = function()
+    vim.highlight.on_yank()
+  end,
+})

modules/nixvim.nix

@@ -40,29 +40,10 @@ in
       # UI Enhancements
       # Add file type icons to various plugins
       web-devicons.enable = true;
+      colorizer.enable = true;
       # Lightweight and customizable status line
       lualine = {
         enable = true;
-        # luaConfig.pre = ''
-        #   require("lualine").setup({
-        #     sections = {
-        #       lualine_x = {
-        #       'encoding', 'fileformat', 'filetype',
-        #         {
-        #           require("noice").api.statusline.mode.get,
-        #           cond = function()
-        #             local noice = require("noice")
-        #              if noice.api.statusline.mode.has() then
-        #                return noice.api.statusline.mode.get():lower():find("recording") ~= nil
-        #              end
-        #              return false
-        #           end,
-        #           color = { fg = "#ff9e64" },
-        #         }
-        #       },
-        #     },
-        #   })
-        # '';
       };
       # Seamless navigation between tmux and vim panes
       tmux-navigator.enable = true;
@@ -87,15 +68,22 @@ in
       # Display key binding hints and help
       which-key.enable = true;
       # Enhanced command-line completion
-      # noice = {
-      #   enable = true;
-      #   settings = {
-      #     presets = {
-      #       lsp_doc_border = true;
-      #     };
-      #   };
-      # };
-      wilder.enable = true;
+      noice = {
+        enable = true;
+        settings = {
+          presets = {
+            lsp_doc_border = true;
+          };
+          routes = [{
+            view = "notify";
+            filter = {
+              event = "msg_showmode";
+              find = "recording";
+            };
+          }];
+        };
+      };
+      wilder.enable = false;
       # Powerful fuzzy finder and picker
       telescope.enable = true;
       # Improve the look of vim's native UI elements
@@ -159,7 +147,10 @@ in
           };
           # TypeScript language server
           ts_ls.enable = true;
+          jsonls.enable = true;
           tinymist.enable = true;
+          dockerls.enable = true;
+          docker_compose_language_service.enable = true;
         };
       };
       # Add icons to completion menu