feat: update nvim package

config/default.nix

@@ -1,4 +1,4 @@
-{pkgs}:
+{ pkgs }:
 pkgs.stdenv.mkDerivation {
   name = "nvim-config";
   src = ./src;

config/src/nvim/lua/config/lazy.lua

@@ -34,7 +34,9 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.lang.yaml" },
     { import = "lazyvim.plugins.extras.ui.mini-indentscope" },
     { import = "lazyvim.plugins.extras.ui.treesitter-context" },
-    { import = "plugins.tokyonight" },
+    { import = "plugins.catppuccin" },
+    -- { import = "plugins.tokyonight" },
+    -- { import = "plugins.lang.nix" },
     { import = "plugins.lang.shell" },
     { import = "plugins.misc.tmux-navigator" },
   },
@@ -51,7 +53,7 @@ require("lazy").setup({
     lazyvim = false,
     neovim = false,
   },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+  install = { colorscheme = { "catppuccin-macchiato" } },
   checker = { enabled = true }, -- automatically check for plugin updates
   performance = {
     rtp = {

config/src/nvim/lua/plugins/catppuccin.lua

@@ -0,0 +1,62 @@
+return {
+  "catppuccin/nvim",
+  lazy = true,
+  name = "catppuccin",
+  opts = {
+    flavour = "macchiato",
+    transparent_background = false,
+    integrations = {
+      aerial = true,
+      alpha = true,
+      cmp = true,
+      dashboard = true,
+      flash = true,
+      grug_far = true,
+      gitsigns = true,
+      headlines = true,
+      illuminate = true,
+      indent_blankline = { enabled = true },
+      leap = true,
+      lsp_trouble = true,
+      mason = true,
+      markdown = true,
+      mini = true,
+      native_lsp = {
+        enabled = true,
+        underlines = {
+          errors = { "undercurl" },
+          hints = { "undercurl" },
+          warnings = { "undercurl" },
+          information = { "undercurl" },
+        },
+      },
+      navic = { enabled = true, custom_bg = "lualine" },
+      neotest = true,
+      neotree = true,
+      noice = true,
+      notify = true,
+      semantic_tokens = true,
+      telescope = true,
+      treesitter = true,
+      treesitter_context = true,
+      which_key = true,
+    },
+  },
+  specs = {
+    {
+      "akinsho/bufferline.nvim",
+      optional = true,
+      opts = function(_, opts)
+        if (vim.g.colors_name or ""):find("catppuccin") then
+          opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
+        end
+      end,
+    },
+  },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "catppuccin-macchiato",
+    },
+  },
+}

flake.nix

@@ -12,36 +12,41 @@
   nixConfig = {
     trusted-substituters = [
       "https://nix-community.cachix.org"
+      "https://palkx.cachix.org"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "palkx.cachix.org-1:qaQoL5CXpGzUbqsIvxUEL7wUhoIrjV0Q8M4HbJ8/8S4="
     ];
   };
 
-  outputs = inputs @ {
+  outputs =
+    inputs@{
       nixpkgs,
       flake-utils,
       neovim-nightly-overlay,
       ...
     }:
-    flake-utils.lib.eachDefaultSystem (system: let
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
         overlayFlakeInputs = prev: final: {
           neovim = neovim-nightly-overlay.packages.${system}.default.overrideAttrs (oa: {
-          nativeBuildInputs = oa.nativeBuildInputs ++ [final.libtermkey];
+            nativeBuildInputs = oa.nativeBuildInputs ++ [ final.libtermkey ];
           });
         };
 
-      overlayLazyVim = prev: final: {
+        overlayLazyVim = prev: final: { lazyVim = import ./packages/lazyVim.nix { pkgs = final; }; };
-        lazyVim = import ./packages/lazyVim.nix {
-          pkgs = final;
-        };
-      };
 
         pkgs = import nixpkgs {
           inherit system;
-        overlays = [overlayFlakeInputs overlayLazyVim];
+          overlays = [
+            overlayFlakeInputs
+            overlayLazyVim
+          ];
         };
-    in rec {
+      in
+      rec {
         packages.lazyVim = pkgs.lazyVim;
         apps.lazyVim = {
           type = "app";
@@ -49,5 +54,6 @@
         };
         packages.default = packages.lazyVim;
         apps.default = apps.lazyVim;
-    });
+      }
+    );
 }

packages/lazyVim.nix

@@ -1,12 +1,13 @@
-{pkgs}: let
+{ pkgs }:
-  config = import ../config {inherit pkgs;};
+let
-  runtimeDeps = import ../runtimeDeps.nix {inherit pkgs;};
+  config = import ../config { inherit pkgs; };
+  runtimeDeps = import ../runtimeDeps.nix { inherit pkgs; };
 in
-  pkgs.wrapNeovim pkgs.neovim {
+pkgs.wrapNeovim pkgs.neovim {
   viAlias = true;
   vimAlias = true;
   withNodeJs = true;
   withPython3 = true;
   withRuby = false;
   extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath runtimeDeps.dependencies}" --set XDG_CONFIG_HOME "${config}"'';
-  }
+}

runtimeDeps.nix

@@ -1,8 +1,12 @@
-{pkgs}: {
+{ pkgs }:
-  dependencies = with pkgs; [
+{
-    nixd # nix lsp
+  dependencies =
-    alejandra # nix formatter
+    with pkgs;
-    statix # linter for nix
+    [
+      nixfmt-rfc-style # nix formatter
+      (terraform.overrideAttrs (oldAttrs: {
+        meta.license = lib.licenses.mpl20;
+      })) # terraform fmt
       ripgrep
       fd
       git
@@ -14,15 +18,17 @@
       go
       ruby
       luarocks
-    zulu #java11
+      zulu # java11
       fish
       fzf
       perl536
       perl536Packages.CPAN
       unzip
       tree-sitter
-    gcc
       gnumake
       lazygit
-  ];
+      python312
+      python312Packages.pip
+    ]
+    ++ (if pkgs.stdenv.hostPlatform.isDarwin then [ ] else [ gcc ]);
 }