From 9d69a35a7910711097e016880e773531042bc71d Mon Sep 17 00:00:00 2001
From: mrflos <mrflos@gmail.com>
Date: Mon, 19 Aug 2024 17:41:19 +0300
Subject: [PATCH] feat(nvim): version 0.10

---
 modules/console.nix     | 19 ++++++++++++++++---
 modules/home-config.nix | 11 ++++++++++-
 modules/local-dev.nix   |  4 +++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/modules/console.nix b/modules/console.nix
index c67aed7..5072f41 100644
--- a/modules/console.nix
+++ b/modules/console.nix
@@ -1,6 +1,11 @@
 # cli programs should be available on servers and desktop
-{ pkgs, ... }:
-
+{ config, pkgs, ... }:
+let 
+  unstable = import
+    (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545)
+    # reuse the current configuration
+    { config = config.nixpkgs.config; };
+in
 {
   programs.zsh.enable = true;
   # programs.fzf = {
@@ -8,6 +13,14 @@
   #   keybindings = true;
   # };
 
+  # programs.neovim = {
+  #   enable = true;
+  #   defaultEditor = true;
+  #   package = unstable.neovim;
+  #   viAlias = true;
+  #   vimAlias = true;
+  # };
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
@@ -41,7 +54,7 @@
     mpc-cli
     mpd
     neofetch
-    neovim
+    unstable.neovim
     ollama
     pandoc
     pass
diff --git a/modules/home-config.nix b/modules/home-config.nix
index 4b4e2b7..c50d66b 100644
--- a/modules/home-config.nix
+++ b/modules/home-config.nix
@@ -1,5 +1,10 @@
 { config, pkgs, lib, ... }:
 let
+  # unstable = import
+  #   (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545)
+  #   # reuse the current configuration
+  #   { config = config.nixpkgs.config; };
+  #
   #startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
   #    ${pkgs.waybar}/bin/waybar &
   #    ${pkgs.swww}/bin/swww init &
@@ -184,8 +189,8 @@ in {
           core.fileMode = false;
         };
       };
+
       neovim = {
-        enable = true;
         defaultEditor = true;
         viAlias = true;
         vimAlias = true;
@@ -209,10 +214,14 @@ in {
           nixedit = "vi /etc/nixos";
           nixupdate = "sudo nix-channel --update && sudo nixos-rebuild switch";
           nixclean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc";
+          socks = "ssh -N -f -C -D 9090 mrflos@yunohost.yeswiki.net -p 6742";
+          vi = "/run/current-system/sw/bin/nvim";
+          vim = "/run/current-system/sw/bin/nvim";
           yeswiki-updater = "cd /home/mrflos/Developpements/yeswiki-installer/ && sudo php yeswiki-updater.php";
         };
         initExtra = ''
     export BUN_INSTALL="$HOME/.bun"
+    export PHP_CS_FIXER_IGNORE_ENV=1
     export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PATH"
     eval "$(atuin init zsh)"
     eval "$(zoxide init zsh)"
diff --git a/modules/local-dev.nix b/modules/local-dev.nix
index 5343a8f..4d06d53 100644
--- a/modules/local-dev.nix
+++ b/modules/local-dev.nix
@@ -8,7 +8,7 @@
     # `brew install`, always `brew services restart`, `brew link`, `brew unlink mysql` (if it is installed)
     {
       name = "mariadb";
-      restart_service = true;
+      #restart_service = true;
       link = true;
       conflicts_with = [ "mysql" ];
     }
@@ -32,7 +32,9 @@
     gcc
     go
     nixfmt-rfc-style
+    lua
     lua-language-server
+    luarocks
     nixpkgs-fmt
     nodejs
     nodePackages.eslint