From 10469b1d42a960176b3c8955f9773bc4edc21859 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sun, 6 Oct 2024 08:02:27 +0200
Subject: [PATCH] Update colorscheme

---
 tasks/neovim.yml                      |  9 +++++++++
 templates/nvim/lua/colorscheme.lua.j2 |  4 ++--
 vars/main.yml                         | 16 +++++-----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tasks/neovim.yml b/tasks/neovim.yml
index 112916b..9658816 100644
--- a/tasks/neovim.yml
+++ b/tasks/neovim.yml
@@ -12,6 +12,14 @@
     - '{{ xdg_data_dir }}/nvim/site/pack/default'
     - '{{ xdg_data_dir }}/nvim/site/pack/default/start'
 
+- name: remove old neovim packages
+  file:
+    path: '{{ item }}'
+    state: absent
+  loop:
+    - '{{ xdg_data_dir }}/nvim/site/pack/default/start/catpuccin'
+    - '{{ xdg_data_dir }}/nvim/site/pack/default/start/vim-colors-xcode'
+
 # Note that helptags may need to be regenerated (see `:h helptags`)
 - name: clone neovim packages
   git:
@@ -19,6 +27,7 @@
     dest: '{{ xdg_data_dir }}/nvim/site/pack/default/start/{{ item.name }}'
     update: true
     version: '{{ item.version|default("HEAD") }}'
+    force: true # some maintainers overwrite existing tags :/
   loop: '{{ neovim_plugins }}'
 
 - name: install neovim node package
diff --git a/templates/nvim/lua/colorscheme.lua.j2 b/templates/nvim/lua/colorscheme.lua.j2
index 995b0c1..f500a86 100644
--- a/templates/nvim/lua/colorscheme.lua.j2
+++ b/templates/nvim/lua/colorscheme.lua.j2
@@ -5,9 +5,9 @@ vim.api.nvim_create_autocmd({'OptionSet'}, {
     pattern = {'background'},
     callback = function()
         if vim.o.background == 'dark' then
-            vim.cmd('colorscheme xcodedark')
+            vim.cmd('colorscheme github_dark_dimmed')
         else
-            vim.cmd('colorscheme catppuccin-latte')
+            vim.cmd('colorscheme github_light')
         end
 
         -- force a full redraw:
diff --git a/vars/main.yml b/vars/main.yml
index 870f831..f0f99e9 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -33,22 +33,16 @@ neovim_plugins:
       version: 'v0.9.0',
     }
   - { url: 'https://github.com/nvim-lualine/lualine.nvim', name: 'lualine' }
-  - {
-      url: 'https://github.com/catppuccin/nvim',
-      name: 'catppuccin',
-      version: '045e3499d9ec8d84635fb08877ae44fd33f6a38d',
-    }
-  - {
-    url: 'https://github.com/lunacookies/vim-colors-xcode',
-    name: 'vim-colors-xcode',
-      version: '3d1f81ce9550d609ce962f66407759eb581bd725',
-    }
   - {
       url: 'https://github.com/lukas-reineke/indent-blankline.nvim',
       name: 'indent-blankline.nvim',
       version: 'v3.7.2',
     }
-
+  - {
+      url: 'https://github.com/projekt0n/github-nvim-theme.git',
+      name: 'github-colors',
+      version: 'v1.1.2',
+    }
 
 gitlab_domain: 'git.fudiggity.nl'
 gitlab_host_key: 'git.fudiggity.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINh/SlWqWmH2FG+duiJkkSpq0Fm+wUAmc//4/CbzbX5+'