From 0dece0f8dc4ecfa7762aba3fd800bdba8ec65856 Mon Sep 17 00:00:00 2001
From: fqbn207 <fqbn207>
Date: Wed, 15 Jan 2025 23:08:11 +0100
Subject: [PATCH] kekl

---
 flake.nix                            |  6 ++++
 modules/system/nix/default.nix~      |  9 ------
 modules/system/nix/nvim/default.nix  | 18 +++++++++---
 modules/system/nix/nvim/lsp.nix      | 41 ++++++++++++++++++++++++++++
 modules/system/nix/nvim/neotree.nix  | 21 ++++++++++++++
 modules/system/nix/nvim/opts.nix     | 15 ++++++++++
 modules/system/nix/nvim/terminal.nix | 12 ++++++++
 7 files changed, 109 insertions(+), 13 deletions(-)
 delete mode 100644 modules/system/nix/default.nix~
 create mode 100644 modules/system/nix/nvim/lsp.nix
 create mode 100644 modules/system/nix/nvim/neotree.nix
 create mode 100644 modules/system/nix/nvim/opts.nix
 create mode 100644 modules/system/nix/nvim/terminal.nix

diff --git a/flake.nix b/flake.nix
index df12ed9..61b05b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,12 @@
     home-manager,
     nvf,
   }: {
+    packages."x86_64-linux".default =
+      (nvf.lib.neovimConfiguration {
+        pkgs = nixpkgs.legacyPakcages."x86_64-linux";
+        modules = [./modules/system/nix/nvim/default.nix];
+      })
+      .neovim;
     nixosConfigurations.poggers = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
diff --git a/modules/system/nix/default.nix~ b/modules/system/nix/default.nix~
deleted file mode 100644
index 5fdfc16..0000000
--- a/modules/system/nix/default.nix~
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports = [
-    ./dns.nix
-    ./gaming.nix
-    ./firefox.nix
-    ./x/dwm/default.nix
-  ];
-}
diff --git a/modules/system/nix/nvim/default.nix b/modules/system/nix/nvim/default.nix
index 59fcaef..6d87303 100644
--- a/modules/system/nix/nvim/default.nix
+++ b/modules/system/nix/nvim/default.nix
@@ -1,10 +1,20 @@
 {
-  config,
   pkgs,
-  inputs,
+  lib,
   ...
 }: {
-  programs.nvf = {
-    enable = true;
+  imports = [
+    ./lsp.nix
+    ./terminal.nix
+    ./neotree.nix
+    ./opts.nix
+  ];
+  vim = {
+    theme = {
+      enable = true;
+      name = "horizon";
+      style = "dark";
+    };
   };
 }
+
diff --git a/modules/system/nix/nvim/lsp.nix b/modules/system/nix/nvim/lsp.nix
new file mode 100644
index 0000000..070067c
--- /dev/null
+++ b/modules/system/nix/nvim/lsp.nix
@@ -0,0 +1,41 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  vim = {
+    languages = {
+      clang = {
+        enable = true;
+        dap.enable = true;
+        treesitter.enable = true;
+        lsp.enable = true;
+      };
+      rust = {
+        enable = true;
+        dap.enable = true;
+        format.enable = true;
+        lsp.enable = true;
+      };
+      html = {
+        enable = true;
+        treesitter = {
+          enable = true;
+          autotagHtml = true;
+        };
+      };
+      nix = {
+        enable = true;
+        extraDiagnostics = {
+          enable = true;
+        };
+        format = {
+          enable = true;
+          type = "alejandra";
+        };
+        lsp.enable = true;
+        treesitter.enable = true;
+      };
+    };
+  };
+}
diff --git a/modules/system/nix/nvim/neotree.nix b/modules/system/nix/nvim/neotree.nix
new file mode 100644
index 0000000..e77d045
--- /dev/null
+++ b/modules/system/nix/nvim/neotree.nix
@@ -0,0 +1,21 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  vim = {
+    filetree = {
+      neo-tree = {
+        enable = true;
+        setupOpts = {
+          enable = true;
+          enable_git_status = true;
+          enable_diagnostics = true;
+          enable_refresh_on_write = true;
+          auto_clean_after_session_restore = true;
+          git_status_async = true;
+        };
+      };
+    };
+  };
+}
diff --git a/modules/system/nix/nvim/opts.nix b/modules/system/nix/nvim/opts.nix
new file mode 100644
index 0000000..26afa62
--- /dev/null
+++ b/modules/system/nix/nvim/opts.nix
@@ -0,0 +1,15 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  vim = {
+    globals = {
+      mapleader = " ";
+
+      shiftwidth = 2;
+      tabstop = 2;
+      softtabstop = 2;
+    };
+  };
+}
diff --git a/modules/system/nix/nvim/terminal.nix b/modules/system/nix/nvim/terminal.nix
new file mode 100644
index 0000000..d2f933c
--- /dev/null
+++ b/modules/system/nix/nvim/terminal.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  vim = {
+    terminal = {
+      enable = true;
+      lazygit.enable = true;
+    };
+  };
+}