From 1947ee0c9f7b8607178d3a5d3ad2a71126247a14 Mon Sep 17 00:00:00 2001 From: Hektor Misplon Date: Fri, 6 Nov 2026 12:18:38 +0100 Subject: [PATCH] feat(nvim): set up 'atlas.nvim' for Gitlab --- .../nvim/config/after/plugin/atlas.nvim.lua | 20 ++++++++++++++++--- home/modules/nvim/config/flake.nix | 1 + home/modules/nvim/default.nix | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/home/modules/nvim/config/after/plugin/atlas.nvim.lua b/home/modules/nvim/config/after/plugin/atlas.nvim.lua index bd26bb6..0aeb8b7 100644 --- a/home/modules/nvim/config/after/plugin/atlas.nvim.lua +++ b/home/modules/nvim/config/after/plugin/atlas.nvim.lua @@ -1,11 +1,25 @@ local nixCatsUtils = require("nixCatsUtils") local atlas = require("atlas") -local githubEnabled = nixCatsUtils.enableForCategory("github") +local providers = {} + +if nixCatsUtils.enableForCategory("github") then + providers.github = {} +end + +if nixCatsUtils.enableForCategory("gitlab") then + providers.gitlab = { base_url = "https://gitlab.com", token = vim.env.GITLAB_API_ACCESS_TOKEN } +end atlas.setup({ - providers = githubEnabled and { github = {} } or {}, - pulls = { diff = { open_cmd = "AtlasDiff" } }, + providers = providers, + pulls = { + diff = { + open_cmd = "AtlasDiff", + layout = "side-by-side", + lsp = { enabled = true, link = { "node_modules" } }, + }, + }, }) local map = vim.keymap.set diff --git a/home/modules/nvim/config/flake.nix b/home/modules/nvim/config/flake.nix index a40e2e4..cfd966b 100644 --- a/home/modules/nvim/config/flake.nix +++ b/home/modules/nvim/config/flake.nix @@ -172,6 +172,7 @@ categories = { general = true; github = false; + gitlab = false; colorscheme = "zenwritten"; typescriptServer = "ts_ls"; languages = lib.mapAttrs (_: language: language.enable) (import ./languages.nix { inherit pkgs; }); diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix index 590b332..e209419 100644 --- a/home/modules/nvim/default.nix +++ b/home/modules/nvim/default.nix @@ -47,6 +47,7 @@ in categories = { colorscheme = config.nvim.colorscheme; github = config.git.github.enable; + gitlab = config.git.gitlab.enable; inherit (config.nvim) languages typescriptServer; }; };