From d4624bd695e37467c144cc82b53a4c9ef4d9a258 Mon Sep 17 00:00:00 2001
From: voidarc <admin@voidarc.co.uk>
Date: Thu, 5 Mar 2026 11:11:31 +0000
Subject: [PATCH] added input function and changed nvim stuff

---
 configs/common.nix               | 141 ++++++++++++++++++-------------
 configs/configuration-laptop.nix |   1 -
 flake.nix                        |   1 +
 3 files changed, 81 insertions(+), 62 deletions(-)

diff --git a/configs/common.nix b/configs/common.nix
index f6e6e3f..c3d043f 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -141,6 +141,12 @@
     packages =
       with pkgs;
       let
+        input =
+          {
+            package,
+            output ? "default",
+          }:
+          inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
         wrap =
           {
             name,
@@ -166,7 +172,10 @@
         cava
         cmatrix
         swaynotificationcenter
-        inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne
+        (input {
+          package = "chataigne";
+          output = "chataigne";
+        })
         wlogout
         wpaperd
         kando
@@ -174,20 +183,27 @@
         grimblast
         (wrap {
           name = "otter-launcher";
-          pkg = inputs.otter-launcher.packages.${stdenv.hostPlatform.system}.default;
+          pkg = (
+            input {
+              package = "otter-launcher";
+            }
+          );
           modules = [
             chafa
             wl-clipboard
             jq
           ];
         })
-        inputs.fsel.packages.${stdenv.hostPlatform.system}.default
+        (input {
+          package = "fsel";
+        })
 
         # Terminal
         carapace
         bat
         kitty
         github-cli
+        wl-clipboard
         p7zip
         bluetuith
         wget
@@ -196,7 +212,9 @@
         fastfetch
         zellij
         lsd
-        inputs.doot.packages.${stdenv.hostPlatform.system}.default
+        (input {
+          package = "doot";
+        })
         stow
         fzf
         ripgrep
@@ -267,63 +285,64 @@
   fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ];
   environment.systemPackages = with pkgs; [
 
-    (pkgs.symlinkJoin {
-      name = "nvim-with-lsp";
-      paths = [ pkgs.neovim ];
-      buildInputs = [ pkgs.makeWrapper ];
-      postBuild = ''
-        					 export TREE_SITTER_LIB_PATH="/run/current-system/sw/lib"
-                	 wrapProgram $out/bin/nvim \
-                	 --prefix PATH : ${
-                    pkgs.lib.makeBinPath [
-                      # lsps
-                      pkgs.lua-language-server
-                      pkgs.vscode-langservers-extracted
-                      pkgs.emmet-ls
-                      pkgs.prettier
-                      pkgs.black
-                      pkgs.nixfmt
-                      pkgs.nil
-                      pkgs.python313Packages.python-lsp-server
-                      pkgs.typescript-language-server
-                      pkgs.tailwindcss-language-server
-                      pkgs.stylua
-                      pkgs.nixd
-
-                      # other shit
-                      pkgs.lua5_1
-                      pkgs.tree-sitter
-                      pkgs.ripgrep
-                      pkgs.gcc
-                      pkgs.gnumake
-                      pkgs.imagemagick
-                      pkgs.luajitPackages.magick
-                      pkgs.ghostscript
-                      pkgs.luarocks
-                      (pkgs.texlive.combine {
-                        inherit (pkgs.texlive)
-                          scheme-basic
-                          varwidth
-                          preview
-                          mathtools
-                          amsfonts
-                          amscdx
-                          xcolor
-                          dvisvgm
-                          dvipng # for preview and export as html
-                          wrapfig
-                          standalone
-                          graphicxbox
-                          amsmath
-                          ulem
-                          hyperref
-                          capt-of
-                          ;
-                      })
-                    ]
-                  }
-                	 '';
-    })
+    inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
+    #     (pkgs.symlinkJoin {
+    #       name = "nvim-with-lsp";
+    #       paths = [ pkgs.neovim ];
+    #       buildInputs = [ pkgs.makeWrapper ];
+    #       postBuild = ''
+    #         					 export TREE_SITTER_LIB_PATH="/run/current-system/sw/lib"
+    #                 	 wrapProgram $out/bin/nvim \
+    #                 	 --prefix PATH : ${
+    #                     pkgs.lib.makeBinPath [
+    #                       # lsps
+    #                       pkgs.lua-language-server
+    #                       pkgs.vscode-langservers-extracted
+    #                       pkgs.emmet-ls
+    #                       pkgs.prettier
+    #                       pkgs.black
+    #                       pkgs.nixfmt
+    #                       pkgs.nil
+    #                       pkgs.python313Packages.python-lsp-server
+    #                       pkgs.typescript-language-server
+    #                       pkgs.tailwindcss-language-server
+    #                       pkgs.stylua
+    #                       pkgs.nixd
+    #
+    #                       # other shit
+    #                       pkgs.lua5_1
+    #                       pkgs.tree-sitter
+    #                       pkgs.ripgrep
+    #                       pkgs.gcc
+    #                       pkgs.gnumake
+    #                       pkgs.imagemagick
+    #                       pkgs.luajitPackages.magick
+    #                       pkgs.ghostscript
+    #                       pkgs.luarocks
+    #                       (pkgs.texlive.combine {
+    #                         inherit (pkgs.texlive)
+    #                           scheme-basic
+    #                           varwidth
+    #                           preview
+    #                           mathtools
+    #                           amsfonts
+    #                           amscdx
+    #                           xcolor
+    #                           dvisvgm
+    #                           dvipng # for preview and export as html
+    #                           wrapfig
+    #                           standalone
+    #                           graphicxbox
+    #                           amsmath
+    #                           ulem
+    #                           hyperref
+    #                           capt-of
+    #                           ;
+    #                       })
+    #                     ]
+    #                   }
+    #                 	 '';
+    #     })
     vim
     unzip
     python310 # Its python like come on
diff --git a/configs/configuration-laptop.nix b/configs/configuration-laptop.nix
index 366462b..f96a47c 100644
--- a/configs/configuration-laptop.nix
+++ b/configs/configuration-laptop.nix
@@ -40,7 +40,6 @@
     packages = with pkgs; [
       # Ricing
       inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges
-      inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne
 
       # Terminal
       light
diff --git a/flake.nix b/flake.nix
index 815e2ed..1e6c488 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
     hyprland.url = "github:hyprwm/Hyprland";
 
     chataigne.url = "./modules/chataigne";
+    nvim-wrapped.url = "git+file:///home/user01/.dotfiles/.config/nvim";
 
     tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453";