From 3d919f63364ded19a1cc794f9710d4606fc3ca03 Mon Sep 17 00:00:00 2001
From: Buliway <me@buliway.ru>
Date: Tue, 19 Aug 2025 08:57:01 +0300
Subject: [PATCH] cleaned packages

---
 nixos/packages.nix                 | 43 +++++-------------------------
 nvim/lua/kickstart/plugins/lsp.lua |  8 +++++-
 2 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/nixos/packages.nix b/nixos/packages.nix
index 8c6c99b..921f85d 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -46,35 +46,14 @@
     # greenclip.enable = true; # https://github.com/erebe/greenclip (использую clipmenu вместо этого)
     # fstrim.enable = true; # Чистит ssd для норм производительности. Пока не пользуюсь
     # archisteamfarm = {}; # Фарм карточек стима афк. Просто раскомментить мало, надо настроить
-    ollama = let 
-      pinPackage =
-        {
-          name,
-          commit,
-          sha256,
-        }:
-        (import (builtins.fetchTarball {
-          inherit sha256;
-          url = "https://github.com/NixOS/nixpkgs/archive/${commit}.tar.gz";
-        }) { system = pkgs.system; }).${name};
-    in {
+    ollama = {
       enable = true;
       acceleration = "rocm";
-      # Ollama Port 11434/tcp
       host = "0.0.0.0";
       port = 11434;
       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 = pkgs2.ollama;
       rocmOverrideGfx = "10.3.0";
-      # additional environment variables
-      # environmentVariables = { HSA_OVERRIDE_GFX_VERSION="10.3.0"; };
     };
   };
 
@@ -146,10 +125,6 @@
 
     steam = {
       enable = true;
-      # package = pkgs2.steam;
-      # fontPackages = with pkgs; []; # Font packages to use in Steam
-      # extraPackages = with pkgs; []; # Additional
-      # protontricks.enable = true; # Running Winetricks commands for Proton-enabled games.
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
       dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
       localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
@@ -249,6 +224,10 @@
     pkgs2.gdtoolkit_4
     ldtk
 
+    # Kubernetes
+    pkgs2.k3d # k3s in Docker
+    pkgs2.kubectl # Kubernetes CLI
+
     # Other
     hugo # Для моего блога
     yaml-language-server # YAML LSP
@@ -260,11 +239,6 @@
     
     # Nushell
     pkgs2.nushell # Modern shell
-    # pkgs2.nushellPlugins.query # Nushell plugin to query JSON, XML, and various web data
-    # pkgs2.nushellPlugins.gstat # Git status plugin for Nushell
-    # pkgs2.nushellPlugins.polars # Молниеносная аналитика данных через `dataframe ...`
-    # pkgs2.nushellPlugins.formats # Formats plugin for Nushell
-    # pkgs2.nushellPlugins.highlight # Syntax highlighting
 
     # For nvim
     tree-sitter # For nvim
@@ -445,6 +419,7 @@
     #   withVencord = true; # Имба плагины                               # TODO: Настройки надо сделать декларативными
     # })
     pkgs2.discord
+    pkgs2.discord-canary
     pkgs2.telegram-desktop
     # revolt-desktop # FOSS аналог дискорда
 
@@ -458,16 +433,10 @@
     # inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin # osu!lazer from nix-gaming
     # pkgs2.osu-lazer-bin
 
-    # steam # Мб не надо сюда писать, раз через programs.steam редачу
-    # heroic # A Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac
-    # lutris # Запускать игры не из стима
-    # bottles # Минималистичная альтернатива lutris
-
     # Мб зависимости
     protonup-qt # Управлять версиями proton-ge?
     steam-run # На всякий случай
     pkgs2.mangohud # Фпс и нагрузку на пк показывает в играх
-    # gamemode # Оптимизации линуха и игр
     pkgs2.wineWowPackages.stableFull # support both 32- and 64-bit applications
     # wineWowPackages.staging # Можно назвать бета версией вайна
     pkgs2.winetricks # winetricks (all versions)
diff --git a/nvim/lua/kickstart/plugins/lsp.lua b/nvim/lua/kickstart/plugins/lsp.lua
index e7b9b86..19084d2 100644
--- a/nvim/lua/kickstart/plugins/lsp.lua
+++ b/nvim/lua/kickstart/plugins/lsp.lua
@@ -213,6 +213,11 @@ return {
 
             -- Golang
             lspconfig.gopls.setup {
+                -- settings = {
+                --     gopls = {
+                --         hoverKind = 'NoDocumentation',
+                --     },
+                -- },
                 completion = {
                     unimported = false,
                 },
@@ -293,7 +298,8 @@ return {
             -- Bash
             lspconfig.bashls.setup {
                 on_attach = function(client, bufnr)
-                    local filename = vim.api.nvim_buf_get_name(bufnr)
+                    client.server_capabilities.documentFormattingProvider = false
+                    local filename = vim.api.nvim_buf_get_name(bufnr) -- Выключить форматирование
                     if filename:match '/%.env$' or filename:match '/%.env%..+$' then
                         client.stop() -- отключить LSP только для .env
                     end