From 120965e43391a516aec5ad515d8e2eef2c22ce44 Mon Sep 17 00:00:00 2001
From: Buliway <me@buliway.ru>
Date: Sat, 12 Jul 2025 20:43:26 +0300
Subject: [PATCH] new ollama, godot and nvim ftplugin settings

---
 nixos/packages.nix                | 15 +++++++++------
 nvim/ftplugin/javascript.lua      |  4 ++++
 nvim/ftplugin/typescript.lua      |  4 ++++
 nvim/ftplugin/typescriptreact.lua |  4 ++++
 4 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 nvim/ftplugin/javascript.lua
 create mode 100644 nvim/ftplugin/typescript.lua
 create mode 100644 nvim/ftplugin/typescriptreact.lua

diff --git a/nixos/packages.nix b/nixos/packages.nix
index 5cdf91a..62fa82b 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -66,11 +66,12 @@
       openFirewall = true;
       # pin ollama v0.5.7 until nixpkgs update
       # https://github.com/NixOS/nixpkgs/issues/375359
-      package = (pinPackage {
-        name = "ollama";
-        commit = "d0169965cf1ce1cd68e50a63eabff7c8b8959743";
-        sha256 = "sha256:1hh0p0p42yqrm69kqlxwzx30m7i7xqw9m8f224i3bm6wsj4dxm05";
-      });
+      # package = (pinPackage {
+      #   name = "ollama";
+      #   commit = "d0169965cf1ce1cd68e50a63eabff7c8b8959743";
+      #   sha256 = "sha256:1hh0p0p42yqrm69kqlxwzx30m7i7xqw9m8f224i3bm6wsj4dxm05";
+      # });
+      package = pkgs2.ollama;
       rocmOverrideGfx = "10.3.0";
       # additional environment variables
       # environmentVariables = { HSA_OVERRIDE_GFX_VERSION="10.3.0"; };
@@ -220,7 +221,8 @@
     protoc-gen-go-grpc
 
     # Gamedev
-    godot
+    pkgs2.godot
+    pkgs2.gdtoolkit_4
     ldtk
 
     # Other
@@ -297,6 +299,7 @@
     lm_sensors # Сенсоры
     httpie # interacting with APIs & HTTP servers
     jq # Cli JSON processor
+    libxml2 # XML parsing library for C
     miller # Like awk, sed, cut, join, and sort for data formats such as CSV, TSV, JSON, JSON Lines, and positionally-indexed
     # htmlq # Как jq, но для html. Извлекать конкретные элементы из html
     # mkvtoolnix-cli # Cross-platform tools for Matroska
diff --git a/nvim/ftplugin/javascript.lua b/nvim/ftplugin/javascript.lua
new file mode 100644
index 0000000..55de27d
--- /dev/null
+++ b/nvim/ftplugin/javascript.lua
@@ -0,0 +1,4 @@
+vim.bo.expandtab = true
+vim.bo.tabstop = 2
+vim.bo.shiftwidth = 2
+vim.bo.softtabstop = 2
diff --git a/nvim/ftplugin/typescript.lua b/nvim/ftplugin/typescript.lua
new file mode 100644
index 0000000..55de27d
--- /dev/null
+++ b/nvim/ftplugin/typescript.lua
@@ -0,0 +1,4 @@
+vim.bo.expandtab = true
+vim.bo.tabstop = 2
+vim.bo.shiftwidth = 2
+vim.bo.softtabstop = 2
diff --git a/nvim/ftplugin/typescriptreact.lua b/nvim/ftplugin/typescriptreact.lua
new file mode 100644
index 0000000..55de27d
--- /dev/null
+++ b/nvim/ftplugin/typescriptreact.lua
@@ -0,0 +1,4 @@
+vim.bo.expandtab = true
+vim.bo.tabstop = 2
+vim.bo.shiftwidth = 2
+vim.bo.softtabstop = 2