diff --git a/flake.lock b/flake.lock
index 4facfda..4bd0830 100644
--- a/flake.lock
+++ b/flake.lock
@@ -550,8 +550,8 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "plugins-atlas-nvim": "plugins-atlas-nvim",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
-        "plugins-diffview-nvim": "plugins-diffview-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
         "plugins-tailwind-fold-nvim": "plugins-tailwind-fold-nvim"
@@ -566,6 +566,22 @@
       },
       "parent": []
     },
+    "plugins-atlas-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1793732433,
+        "narHash": "sha256-z9Mnw/wU5ceuaMiIPJgtXDhw93w0y6MayWQtIYrlqaY=",
+        "owner": "emrearmagan",
+        "repo": "atlas.nvim",
+        "rev": "f78cfc45930d070e93be6d00e500292dfcc263c8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emrearmagan",
+        "repo": "atlas.nvim",
+        "type": "github"
+      }
+    },
     "plugins-beancount-nvim": {
       "flake": false,
       "locked": {
@@ -582,22 +598,6 @@
         "type": "github"
       }
     },
-    "plugins-diffview-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1787574526,
-        "narHash": "sha256-twlMCrNKlkuoT3aQtZHVAZNw5zv1Y9McFYBt8+KgHZ4=",
-        "owner": "dlyongemallo",
-        "repo": "diffview.nvim",
-        "rev": "30afab604a0abe02dfd19e6fbb9153fd26fd2eb3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dlyongemallo",
-        "repo": "diffview.nvim",
-        "type": "github"
-      }
-    },
     "plugins-nvimkit-nvim": {
       "flake": false,
       "locked": {
diff --git a/home/modules/nvim/config/after/plugin/atlas.nvim.lua b/home/modules/nvim/config/after/plugin/atlas.nvim.lua
new file mode 100644
index 0000000..bd26bb6
--- /dev/null
+++ b/home/modules/nvim/config/after/plugin/atlas.nvim.lua
@@ -0,0 +1,15 @@
+local nixCatsUtils = require("nixCatsUtils")
+local atlas = require("atlas")
+
+local githubEnabled = nixCatsUtils.enableForCategory("github")
+
+atlas.setup({
+  providers = githubEnabled and { github = {} } or {},
+  pulls = { diff = { open_cmd = "AtlasDiff" } },
+})
+
+local map = vim.keymap.set
+
+map("n", "<leader>gp", "<cmd>Atlas pulls<cr>", { desc = "pull requests (atlas)" })
+map("n", "<leader>gi", "<cmd>Atlas issues<cr>", { desc = "issues (atlas)" })
+map("n", "<leader>gr", "<cmd>Atlas review<cr>", { desc = "review pull request (atlas)" })
diff --git a/home/modules/nvim/config/after/plugin/diffview.nvim.lua b/home/modules/nvim/config/after/plugin/diffview.nvim.lua
deleted file mode 100644
index f03ac5d..0000000
--- a/home/modules/nvim/config/after/plugin/diffview.nvim.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-require("diffview").setup({
-  keymaps = {
-    file_panel = {
-      ["s"] = false, -- would conflict with "splits & navigation" keymaps
-    },
-  },
-})
-
-local map = vim.keymap.set
-
-map("n", "<leader>gh", "<cmd>DiffviewFileHistory<cr>", { desc = "git history (repo)" })
-map("n", "<leader>gf", "<cmd>DiffviewFileHistory %<cr>", { desc = "git history (file)" })
-map("n", "<leader>gd", "<cmd>DiffviewOpen<cr>", { desc = "git diff" })
diff --git a/home/modules/nvim/config/flake.lock b/home/modules/nvim/config/flake.lock
index 6945201..3f47ede 100644
--- a/home/modules/nvim/config/flake.lock
+++ b/home/modules/nvim/config/flake.lock
@@ -31,6 +31,22 @@
         "type": "github"
       }
     },
+    "plugins-atlas-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1793732433,
+        "narHash": "sha256-z9Mnw/wU5ceuaMiIPJgtXDhw93w0y6MayWQtIYrlqaY=",
+        "owner": "emrearmagan",
+        "repo": "atlas.nvim",
+        "rev": "f78cfc45930d070e93be6d00e500292dfcc263c8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "emrearmagan",
+        "repo": "atlas.nvim",
+        "type": "github"
+      }
+    },
     "plugins-beancount-nvim": {
       "flake": false,
       "locked": {
@@ -47,22 +63,6 @@
         "type": "github"
       }
     },
-    "plugins-diffview-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1787574526,
-        "narHash": "sha256-twlMCrNKlkuoT3aQtZHVAZNw5zv1Y9McFYBt8+KgHZ4=",
-        "owner": "dlyongemallo",
-        "repo": "diffview.nvim",
-        "rev": "30afab604a0abe02dfd19e6fbb9153fd26fd2eb3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dlyongemallo",
-        "repo": "diffview.nvim",
-        "type": "github"
-      }
-    },
     "plugins-nvimkit-nvim": {
       "flake": false,
       "locked": {
@@ -115,8 +115,8 @@
       "inputs": {
         "nixCats": "nixCats",
         "nixpkgs": "nixpkgs",
+        "plugins-atlas-nvim": "plugins-atlas-nvim",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
-        "plugins-diffview-nvim": "plugins-diffview-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
         "plugins-tailwind-fold-nvim": "plugins-tailwind-fold-nvim"
diff --git a/home/modules/nvim/config/flake.nix b/home/modules/nvim/config/flake.nix
index c7a8a06..f206021 100644
--- a/home/modules/nvim/config/flake.nix
+++ b/home/modules/nvim/config/flake.nix
@@ -23,8 +23,8 @@
       url = "github:jamesblckwell/nvimkit.nvim";
       flake = false;
     };
-    plugins-diffview-nvim = {
-      url = "github:dlyongemallo/diffview.nvim";
+    plugins-atlas-nvim = {
+      url = "github:emrearmagan/atlas.nvim";
       flake = false;
     };
 
@@ -117,6 +117,7 @@
               yaml-language-server
               yamllint
             ];
+            github = [ gh ];
           };
 
           startupPlugins = {
@@ -174,7 +175,7 @@
                 treesj
                 sniprun
                 gitsigns-nvim
-                pkgs.neovimPlugins.diffview-nvim
+                pkgs.neovimPlugins.atlas-nvim
                 nvim-highlight-colors
                 pkgs.neovimPlugins.tailwind-fold-nvim
                 auto-session
@@ -216,6 +217,7 @@
           };
           categories = {
             general = true;
+            github = false;
             colorscheme = "zenwritten";
           };
         };
diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix
index cdef6c6..ec8eb26 100644
--- a/home/modules/nvim/default.nix
+++ b/home/modules/nvim/default.nix
@@ -20,7 +20,10 @@ in
 
   config = lib.mkIf config.nvim.enable {
     nvim.packageDefinitions.merge.nvim = _: {
-      categories.colorscheme = config.nvim.colorscheme;
+      categories = {
+        colorscheme = config.nvim.colorscheme;
+        github = config.git.github.enable;
+      };
     };
 
     home = {