From 8e2371ddf6c7273e6bc9044b83e462fa336f71a4 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Mon, 22 Jul 2024 00:05:07 +0200
Subject: [PATCH] working devShell!

---
 flake.nix                                         | 10 ++++++----
 modules/cli/nh.nix                                |  2 +-
 modules/editors/kakoune/default.nix               |  1 -
 .../editors/nvf/plugins/settings/assistant.nix    |  2 +-
 .../editors/nvf/plugins/settings/autocomplete.nix |  5 ++---
 modules/editors/nvf/plugins/settings/binds.nix    |  2 +-
 modules/editors/nvf/plugins/settings/notify.nix   |  2 +-
 {flake => parts}/fmt.nix                          |  1 +
 {flake => parts}/lib/builders.nix                 |  0
 {flake => parts}/pre-commit/default.nix           |  0
 {flake => parts}/shell.nix                        | 15 ++++++++-------
 11 files changed, 21 insertions(+), 19 deletions(-)
 rename {flake => parts}/fmt.nix (95%)
 rename {flake => parts}/lib/builders.nix (100%)
 rename {flake => parts}/pre-commit/default.nix (100%)
 rename {flake => parts}/shell.nix (70%)

diff --git a/flake.nix b/flake.nix
index 176e8ef..88c3106 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,14 +4,16 @@
     inputs.flake-parts.lib.mkFlake {inherit inputs;} (
       {withSystem, ...}: {
         systems = [
-          "x86-64_linux"
+          "x86_64-linux"
         ];
         imports = [
           inputs.treefmt-nix.flakeModule
-          #./flake/pre-commit
-          ./flake/shell.nix
-          ./flake/fmt.nix
+          #  inputs.flake-parts.flakeModules.easyOverlay
+          #  #./flake/pre-commit
+          ./parts/shell.nix
+          ./parts/fmt.nix
         ];
+
         flake = {
           nixosConfigurations = import ./hosts {inherit inputs withSystem;};
         };
diff --git a/modules/cli/nh.nix b/modules/cli/nh.nix
index ee5f851..c82d11e 100644
--- a/modules/cli/nh.nix
+++ b/modules/cli/nh.nix
@@ -13,7 +13,7 @@ in {
       enable = true;
       clean.enable = true;
       clean.extraArgs = "--keep-since 4d --keep 3";
-      flake = "/home/vali/repos/nichts";
+      flake = "/home/vali/projects/nichts";
     };
   };
 }
diff --git a/modules/editors/kakoune/default.nix b/modules/editors/kakoune/default.nix
index a3cf646..b350c5b 100644
--- a/modules/editors/kakoune/default.nix
+++ b/modules/editors/kakoune/default.nix
@@ -51,4 +51,3 @@ in {
     # extraConfig = ./kakrc;
   };
 }
-
diff --git a/modules/editors/nvf/plugins/settings/assistant.nix b/modules/editors/nvf/plugins/settings/assistant.nix
index 2ea44c6..4754660 100644
--- a/modules/editors/nvf/plugins/settings/assistant.nix
+++ b/modules/editors/nvf/plugins/settings/assistant.nix
@@ -1,4 +1,4 @@
-_:{
+_: {
   programs.neovim-flake.settings.vim = {
     assistant.copilot = {
       enable = false;
diff --git a/modules/editors/nvf/plugins/settings/autocomplete.nix b/modules/editors/nvf/plugins/settings/autocomplete.nix
index 223a6a5..6e2b3fa 100644
--- a/modules/editors/nvf/plugins/settings/autocomplete.nix
+++ b/modules/editors/nvf/plugins/settings/autocomplete.nix
@@ -1,16 +1,15 @@
-_:{
+_: {
   programs.neovim-flake.settings.vim = {
     autocomplete = {
       enable = true;
       type = "nvim-cmp";
       mappings = {
         # close = "<C-e>";
-       # confirm = "<tab>";
+        # confirm = "<tab>";
         next = "<C-n>";
         previous = "<C-p>";
         scrollDocsDown = "<C-j>";
         scrollDocsUp = "<C-k>";
-      
       };
     };
   };
diff --git a/modules/editors/nvf/plugins/settings/binds.nix b/modules/editors/nvf/plugins/settings/binds.nix
index 631abb6..0a3c776 100644
--- a/modules/editors/nvf/plugins/settings/binds.nix
+++ b/modules/editors/nvf/plugins/settings/binds.nix
@@ -1,4 +1,4 @@
-_:{
+_: {
   programs.neovim-flake.settings.vim = {
     binds = {
       whichKey.enable = true;
diff --git a/modules/editors/nvf/plugins/settings/notify.nix b/modules/editors/nvf/plugins/settings/notify.nix
index add20a2..eb19037 100644
--- a/modules/editors/nvf/plugins/settings/notify.nix
+++ b/modules/editors/nvf/plugins/settings/notify.nix
@@ -3,7 +3,7 @@
 in {
   programs.neovim-flake.settings.vim = {
     notify = {
-            nvim-notify.enable = true;
+      nvim-notify.enable = true;
     };
   };
 }
diff --git a/flake/fmt.nix b/parts/fmt.nix
similarity index 95%
rename from flake/fmt.nix
rename to parts/fmt.nix
index ce1c97c..2b052f2 100644
--- a/flake/fmt.nix
+++ b/parts/fmt.nix
@@ -8,6 +8,7 @@
     formatter = config.treefmt.build.wrapper;
     treefmt = {
       projectRootFile = "flake.nix";
+      enableDefaultExcludes = true;
       programs = {
         alejandra.enable = true;
 
diff --git a/flake/lib/builders.nix b/parts/lib/builders.nix
similarity index 100%
rename from flake/lib/builders.nix
rename to parts/lib/builders.nix
diff --git a/flake/pre-commit/default.nix b/parts/pre-commit/default.nix
similarity index 100%
rename from flake/pre-commit/default.nix
rename to parts/pre-commit/default.nix
diff --git a/flake/shell.nix b/parts/shell.nix
similarity index 70%
rename from flake/shell.nix
rename to parts/shell.nix
index f49d9f1..2ff3395 100644
--- a/flake/shell.nix
+++ b/parts/shell.nix
@@ -6,16 +6,17 @@
   }: {
     devShells.default = pkgs.mkShellNoCC {
       name = "nichts";
+
+      shellHook = ''
+        ${config.pre-commit.installationScript}
+      '';
+
       DIRENV_LOG_FORMAT = "";
 
-      #inputsFrom = [config.treefmt.build.devShell];
-      packages = with pkgs; [
+      inputsFrom = [config.treefmt.build.devShell];
+      packages = [
         config.treefmt.build.wrapper # treewide formatter
-        nil # nix language server
-        alejandra
-        git # take a guess
-        statix # no idea
-        deadnix # clean up unused nix code
+        pkgs.git # take a guess
 
         (pkgs.writeShellApplication {
           name = "update";