latest tmux

flake.lock

@@ -59,6 +59,7 @@
       },
       "original": {
         "owner": "Saghen",
+        "ref": "574ce24d44526a76e0b76e921a92c6737a6b3954",
         "repo": "blink.pairs",
         "type": "github"
       }
@@ -193,27 +194,6 @@
       }
     },
     "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1760948891,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_3"
       },
@@ -346,11 +326,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761750844,
-        "narHash": "sha256-ab6kNHAEP/oWz8qdblnDw7TIwetr4GnmnDyvya0aw/k=",
+        "lastModified": 1761878381,
+        "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b8082c6803353456d45e6a8c0d4b36ad33fb7d6a",
+        "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
         "type": "github"
       },
       "original": {
@@ -486,17 +466,14 @@
         "yaml-nvim": "yaml-nvim"
       },
       "locked": {
-        "lastModified": 1761767127,
-        "narHash": "sha256-EjfU9z34bS8SpkXjnorhqfkSTAj/oeOHiihFJwtrhi4=",
-        "ref": "refs/heads/master",
-        "rev": "689d24168bccd46fc4417790dd561629f0d30e8e",
-        "revCount": 41,
-        "type": "git",
-        "url": "https://git.jmarkin.ru/jmarkin/nvim-nix"
+        "lastModified": 1761940545,
+        "narHash": "sha256-PxQPzXs6js9d+FP9R9vNHNjGTqpZNXRKpaZxMiG4j18=",
+        "path": "/home/kron/nvim-nix",
+        "type": "path"
       },
       "original": {
-        "type": "git",
-        "url": "https://git.jmarkin.ru/jmarkin/nvim-nix"
+        "path": "/home/kron/nvim-nix",
+        "type": "path"
       }
     },
     "namu-nvim": {
@@ -517,18 +494,20 @@
     },
     "neovim-nightly-overlay": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "neovim-src": "neovim-src",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1761696321,
-        "narHash": "sha256-UpAmPtmsO9g7+uECR+NsjuKCYPa5SFj2akkjLc51k8I=",
+        "lastModified": 1761869064,
+        "narHash": "sha256-rp7XnoIqjnpZD4o9i00JDGXRkfXlYKejl9HeN+MXdW8=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "37853aa4419e22dc2b7544e4238dd880af673bc8",
+        "rev": "923a0d1e5e5ce35847b75a95d759f3128bc09202",
         "type": "github"
       },
       "original": {
@@ -540,11 +519,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1761695393,
-        "narHash": "sha256-BMoy/in1jne82gM2LEiBG6hhiyllyvmSNBf4Vhrho7s=",
+        "lastModified": 1761834237,
+        "narHash": "sha256-dDgCjRfZY8AWTL9BKEbXhPOb5rdNI4RlmLE+rmGNzZs=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "c2781d3db3efa3a86d9f383a0886567ff38e4d63",
+        "rev": "5ddabbeba43e519604f5e1cfacb7a1d83094097e",
         "type": "github"
       },
       "original": {
@@ -555,11 +534,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1761468971,
-        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
+        "lastModified": 1761597516,
+        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
+        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
         "type": "github"
       },
       "original": {
@@ -648,11 +627,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1761656231,
-        "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=",
+        "lastModified": 1761880412,
+        "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45",
+        "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
         "type": "github"
       },
       "original": {
@@ -746,7 +725,7 @@
         "agenix": [
           "agenix"
         ],
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ]

flake.nix

@@ -45,9 +45,10 @@
 
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs";
+    neovim-nightly-overlay.inputs.flake-parts.follows = "flake-parts";
 
-    mynvim.url = "git+https://git.jmarkin.ru/jmarkin/nvim-nix";
-    # mynvim.url = "path:/home/kron/nvim-nix";
+    # mynvim.url = "git+https://git.jmarkin.ru/jmarkin/nvim-nix";
+    mynvim.url = "path:/home/kron/nvim-nix";
     mynvim.inputs.nixpkgs.follows = "nixpkgs";
     mynvim.inputs.flake-parts.follows = "flake-parts";
     mynvim.inputs.neovim-nightly-overlay.follows = "neovim-nightly-overlay";

home/programs/fish/default.nix

@@ -43,8 +43,6 @@
     enable = true;
     shellAliases = {
       cat = "bat";
-      y = "yazi";
-      # grc = "cgrc";
       grep = "rg";
       jq = "jaq";
       vim = "nvim";
@@ -144,32 +142,6 @@
             vim $argv
         end
       '';
-      shh.body = /*fish*/ ''
-        if [ -t 0 ]
-            set CONTEXT ""
-        else
-            while read i; set CONTEXT "$CONTEXT""$i"\n; end
-        end
-
-        set -l QUERY $argv
-        set -l PROMPT "$CONTEXT\n$QUERY"
-        set -l OLLAMA_URL $OLLAMA_URL "http://localhost:11434"
-        set -l SHELL_HELPER_MODEL $SHELL_HELPER_MODEL "shell-helper:latest"
-
-        set -l PROMPT (echo "$PROMPT" | ${pkgs.jaq}/bin/jaq -Rs)
-
-        set -l CURL_DATA '{
-            "model": "'$SHELL_HELPER_MODEL'",
-            "stream": false,
-            "think": false,
-            "prompt": '$PROMPT'
-        }'
-
-        ${pkgs.curl}/bin/curl -H "Content-Type: application/json" -H "Accept: application/json" \
-            -s $OLLAMA_URL"/api/generate" \
-            --data $CURL_DATA \
-            | ${pkgs.jaq}/bin/jaq -r '.response' | xargs -0 printf "%b"
-      '';
       kubectl-pods-logs = {
         argumentNames = [
           "config"
@@ -177,9 +149,11 @@
           "name"
         ];
         body = /*fish*/''
-          kubectl --insecure-skip-tls-verify --kubeconfig $config get --namespace $ns pods | grep $name \
+          kubectl --insecure-skip-tls-verify --kubeconfig $config get --namespace $ns pods \
+          | grep $name \
           | awk '{print $1}' \
-          | xargs -I {} kubectl --insecure-skip-tls-verify --kubeconfig $config --namespace $ns logs {} | nvim -
+          | xargs -I {} kubectl --insecure-skip-tls-verify --kubeconfig $config --namespace $ns logs {} \
+          | nvim -
         '';
       };
     };

home/programs/tmux/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 let
   smartsplits = pkgs.fetchFromGitHub {
     owner = "mrjones2014";
@@ -14,10 +14,22 @@ let
       rtpFilePath = "smart-splits.tmux";
       src = smartsplits;
     });
+  
+  # before release 3.5
+  tmux = pkgs.tmux.overrideAttrs (oldAttrs: {
+    version = "2025-10-31";
+    src = pkgs.fetchFromGitHub {
+      owner = "tmux";
+      repo = "tmux";
+      rev = "be2d4aa43498a6c36d9f30f4ccedb3347882ad42";
+      sha256 = "sha256-3sDOck9iAg7l/XP23ae+k8gevUwLALDOojGz1d3Oml4=";
+    };
+  });
 in
 {
   programs.bash.shellAliases.ta = "tmux attach || env -u __ETC_PROFILE_NIX_SOURCED tmux";
   programs.tmux = {
+    package = tmux;
     enable = true;
     shell = "${pkgs.bash}/bin/bash";
     # shell = "${pkgs.fish}/bin/fish";

home/users/base.nix

@@ -5,7 +5,7 @@
   imports = [
     ../programs/git
     ../programs/bash.nix
-    ../programs/tmux.nix
+    ../programs/tmux
     ../programs/bat.nix
     ../programs/gpg.nix
     ../programs/starship.nix