From e6dca578ed828e6060419112a0377bfd5c22c7ed Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Mon, 8 Jul 2024 23:28:19 +0200
Subject: [PATCH 1/4] Update flake

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 24f5c80..28dacfd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -671,11 +671,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720339391,
-        "narHash": "sha256-IHlZ1sUQzTJATSt8zw8CFXdQoZOBTvfSG9d9erOjS04=",
+        "lastModified": 1720452943,
+        "narHash": "sha256-YWIdYLBfd3XTdTJV2A12kmDmLh1YdhVnWsyqAvv8iT8=",
         "owner": "abenz1267",
         "repo": "walker",
-        "rev": "bf9bc52b328ce201c536ecff5d8542ba2232f603",
+        "rev": "23a6cfee69a9040f763f079aba56119dcbafb263",
         "type": "github"
       },
       "original": {

From 7946325fa9ddba0976f283708a67dbc05aff42c8 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Mon, 8 Jul 2024 23:29:55 +0200
Subject: [PATCH 2/4] Manually maintain nvim configuration

---
 home/programs/terminal/editors/neovim/default.nix | 14 +-------------
 hosts/voyager/default.nix                         |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/home/programs/terminal/editors/neovim/default.nix b/home/programs/terminal/editors/neovim/default.nix
index 2e58c6b..203cc46 100644
--- a/home/programs/terminal/editors/neovim/default.nix
+++ b/home/programs/terminal/editors/neovim/default.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  # TODO: Consider switching to nixvim, this is a temporary solution
+  # TODO: Consider switching to nixvim
 
   programs.neovim = {
     enable = true;
@@ -19,16 +19,4 @@
       gcc
     ];
   };
-
-  # Running `nvim --headless +q` is recommended
-  # before opening neovim for the first time
-  home.file."./.config/nvim" = {
-    source = pkgs.fetchFromGitHub {
-      owner = "ItsDrike";
-      repo = "AstroNvimUser";
-      rev = "v0.1.2";
-      sha256 = "sha256-PPejIy8BGxilcFAvBZQVfVDwTNEm1Tu6e0AlzIZbYXY=";
-    };
-    recursive = true;
-  };
 }
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index f46c610..0999736 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -70,7 +70,6 @@
             # Games
             ".local/share/PrismLauncher"
             ".local/share/Steam"
-            #".steam"
 
             # Tools
             ".ssh"
@@ -79,6 +78,7 @@
             ".local/share/zoxide"
             ".local/share/wakatime"
             ".local/share/zsh"
+            ".config/nvim"
             ".local/share/nvim"
             ".local/state/nvim"
             ".config/github-copilot"

From 77fbd047edcf9955beaf9fcbc7f2137628f583ec Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Mon, 8 Jul 2024 23:49:24 +0200
Subject: [PATCH 3/4] nvim: Add some nix toolings deps

---
 home/programs/terminal/editors/neovim/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home/programs/terminal/editors/neovim/default.nix b/home/programs/terminal/editors/neovim/default.nix
index 203cc46..f640ddf 100644
--- a/home/programs/terminal/editors/neovim/default.nix
+++ b/home/programs/terminal/editors/neovim/default.nix
@@ -17,6 +17,9 @@
       rustc
       cargo
       gcc
+      deadnix
+      statix
+      alejandra
     ];
   };
 }

From ed8c0057a40e4de97413c79ed683a665b9403f8d Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Wed, 10 Jul 2024 13:12:29 +0200
Subject: [PATCH 4/4] neovim: Add nixd

---
 home/programs/terminal/editors/neovim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/programs/terminal/editors/neovim/default.nix b/home/programs/terminal/editors/neovim/default.nix
index f640ddf..cb9fa65 100644
--- a/home/programs/terminal/editors/neovim/default.nix
+++ b/home/programs/terminal/editors/neovim/default.nix
@@ -20,6 +20,7 @@
       deadnix
       statix
       alejandra
+      nixd
     ];
   };
 }