From 608bf58ff8490ac33f518c121589dfe86280710d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:45:40 +0300 Subject: [PATCH 01/76] move plugins folder --- {plugins => config/plugins}/blink-cmp.nix | 0 {plugins => config/plugins}/cmp.nix | 0 {plugins => config/plugins}/comment.nix | 0 {plugins => config/plugins}/default.nix | 0 {plugins => config/plugins}/gitsigns.nix | 0 {plugins => config/plugins}/lsp.nix | 0 {plugins => config/plugins}/mini.nix | 0 {plugins => config/plugins}/oil.nix | 0 {plugins => config/plugins}/treesitter.nix | 0 {plugins => config/plugins}/which-key.nix | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {plugins => config/plugins}/blink-cmp.nix (100%) rename {plugins => config/plugins}/cmp.nix (100%) rename {plugins => config/plugins}/comment.nix (100%) rename {plugins => config/plugins}/default.nix (100%) rename {plugins => config/plugins}/gitsigns.nix (100%) rename {plugins => config/plugins}/lsp.nix (100%) rename {plugins => config/plugins}/mini.nix (100%) rename {plugins => config/plugins}/oil.nix (100%) rename {plugins => config/plugins}/treesitter.nix (100%) rename {plugins => config/plugins}/which-key.nix (100%) diff --git a/plugins/blink-cmp.nix b/config/plugins/blink-cmp.nix similarity index 100% rename from plugins/blink-cmp.nix rename to config/plugins/blink-cmp.nix diff --git a/plugins/cmp.nix b/config/plugins/cmp.nix similarity index 100% rename from plugins/cmp.nix rename to config/plugins/cmp.nix diff --git a/plugins/comment.nix b/config/plugins/comment.nix similarity index 100% rename from plugins/comment.nix rename to config/plugins/comment.nix diff --git a/plugins/default.nix b/config/plugins/default.nix similarity index 100% rename from plugins/default.nix rename to config/plugins/default.nix diff --git a/plugins/gitsigns.nix b/config/plugins/gitsigns.nix similarity index 100% rename from plugins/gitsigns.nix rename to config/plugins/gitsigns.nix diff --git a/plugins/lsp.nix b/config/plugins/lsp.nix similarity index 100% rename from plugins/lsp.nix rename to config/plugins/lsp.nix diff --git a/plugins/mini.nix b/config/plugins/mini.nix similarity index 100% rename from plugins/mini.nix rename to config/plugins/mini.nix diff --git a/plugins/oil.nix b/config/plugins/oil.nix similarity index 100% rename from plugins/oil.nix rename to config/plugins/oil.nix diff --git a/plugins/treesitter.nix b/config/plugins/treesitter.nix similarity index 100% rename from plugins/treesitter.nix rename to config/plugins/treesitter.nix diff --git a/plugins/which-key.nix b/config/plugins/which-key.nix similarity index 100% rename from plugins/which-key.nix rename to config/plugins/which-key.nix From 9870cb1236c095c0578a3b82d42711d59a4d01db Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:47:32 +0300 Subject: [PATCH 02/76] move default.nix --- config/default.nix | 66 +++++++++++++++++++++++++++++++++++++++++----- default.nix | 60 ----------------------------------------- flake.nix | 4 +-- 3 files changed, 61 insertions(+), 69 deletions(-) delete mode 100644 default.nix diff --git a/config/default.nix b/config/default.nix index c8b1cd7..b3b896b 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,6 +1,60 @@ -{lib, ...}: let - definitions = lib.attrNames (lib.filterAttrs (filename: kind: - filename != "default.nix" && (kind == "regular" || kind == "directory")) - (builtins.readDir ./.)); -in - lib.mkMerge (map (file: import ./${file}) definitions) +{pkgs, ...}: { + imports = [./config ./plugins]; + + config = { + # Use as leader key + globals.mapleader = " "; + globals.maplocalleader = " "; + + # Set 'vi' and 'vim' aliases to nixvim + viAlias = true; + vimAlias = true; + + # Setup clipboard support + clipboard = { + # Use xsel as clipboard provider + # providers.xsel.enable = true; + + # Sync system clipboard + register = "unnamedplus"; + }; + extraPackages = with pkgs; [ + nix-inspect + nixd + git + git-lfs + cloc + ripgrep + lazygit + black + fd + ripgrep + ]; + + keymaps = [ + { + mode = "n"; + key = "gg"; + action = "LazyGit"; + options = { + desc = "LazyGit (root dir)"; + }; + } + ]; +extraPlugins = with pkgs.vimPlugins; [ + lazygit-nvim + ]; + + extraConfigLua = '' + require("telescope").load_extension("lazygit") + ''; + performance = { + byteCompileLua = { + enable = true; + nvimRuntime = true; + configs = true; + plugins = true; + }; + }; + }; +} diff --git a/default.nix b/default.nix deleted file mode 100644 index b3b896b..0000000 --- a/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{pkgs, ...}: { - imports = [./config ./plugins]; - - config = { - # Use as leader key - globals.mapleader = " "; - globals.maplocalleader = " "; - - # Set 'vi' and 'vim' aliases to nixvim - viAlias = true; - vimAlias = true; - - # Setup clipboard support - clipboard = { - # Use xsel as clipboard provider - # providers.xsel.enable = true; - - # Sync system clipboard - register = "unnamedplus"; - }; - extraPackages = with pkgs; [ - nix-inspect - nixd - git - git-lfs - cloc - ripgrep - lazygit - black - fd - ripgrep - ]; - - keymaps = [ - { - mode = "n"; - key = "gg"; - action = "LazyGit"; - options = { - desc = "LazyGit (root dir)"; - }; - } - ]; -extraPlugins = with pkgs.vimPlugins; [ - lazygit-nvim - ]; - - extraConfigLua = '' - require("telescope").load_extension("lazygit") - ''; - performance = { - byteCompileLua = { - enable = true; - nvimRuntime = true; - configs = true; - plugins = true; - }; - }; - }; -} diff --git a/flake.nix b/flake.nix index 2c0fcc5..8203217 100644 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,7 @@ mkNixvim = specialArgs: nixvim.legacyPackages.${system}.makeNixvimWithModule { inherit pkgs; - - module = ./.; - + module = ./config; extraSpecialArgs = specialArgs // { From d459d592eb4036a84b587f8825960457ecd7bafa Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:49:05 +0300 Subject: [PATCH 03/76] new imports --- config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/default.nix b/config/default.nix index b3b896b..474b23f 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,5 +1,9 @@ {pkgs, ...}: { - imports = [./config ./plugins]; + imports = [ + ./colorscheme.nix + ./options.nix + ./plugins + ]; config = { # Use as leader key From 0e214b7d96af17fca618027cc4ff4599a4a17ebc Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 02:25:47 +0300 Subject: [PATCH 04/76] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5ae264e..acceb3a 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749523198, - "narHash": "sha256-How2kQw0psKmCdXgojc95Sf3K5maHB3qfINxTZFCAPM=", + "lastModified": 1750183894, + "narHash": "sha256-ZtOgEt70keBVB4YJc+z7m0h7J1BOlv/GjHE1YC6KxeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdc68935eba9f86d155585fdf6f17af6824f38ac", + "rev": "f45e75fc63fc8a7ffc3da382b2f6b681c5b71875", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1749761870, - "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", + "lastModified": 1750249714, + "narHash": "sha256-7r0jQlHQfWkI6dNH6DmofYs4Ha2wB0voqwU4GI+tif0=", "owner": "nix-community", "repo": "nixvim", - "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", + "rev": "fef045cb912e51185d0d5d67e035eca7fea7eda4", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1749531675, - "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "4029d450d0266909ee52775849b7da54e79b328e", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { From c25f5b683977e2d6d6dc175d2272c200d40bf92d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 02:53:07 +0300 Subject: [PATCH 05/76] i dont want to just type each plugin name in the import list --- config/plugins/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/config/plugins/default.nix b/config/plugins/default.nix index 0af3fea..75ea12f 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -1,16 +1,8 @@ -{ - # settings of these plugins live in their respective files - imports = [ - ./blink-cmp.nix - ./cmp.nix - ./comment.nix - ./gitsigns.nix - ./lsp.nix - ./mini.nix - ./oil.nix - ./treesitter.nix - ./which-key.nix - ]; +{lib, ...}:{ + imports = lib.mapAttrsToList (name: path: ./. + "/${name}") + (lib.filterAttrs (filename: kind: + filename != "default.nix" && (kind == "regular" || kind == "directory")) + (builtins.readDir ./.)); plugins = { # todo comments highlighter From a5cf35dec0fa4ae3169b94ff7057f7e4b5ee8e5c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 02:53:56 +0300 Subject: [PATCH 06/76] add avante --- config/plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/plugins/default.nix b/config/plugins/default.nix index 75ea12f..a682652 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -64,5 +64,8 @@ # tip pop-up which-key.enable = true; + + # ai support + avante.enable = true; }; } From bb8391d7d9518e85fcd4dd621f81b577ee24e52d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 03:13:19 +0300 Subject: [PATCH 07/76] avante saves the day --- config/plugins/avante.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 config/plugins/avante.nix diff --git a/config/plugins/avante.nix b/config/plugins/avante.nix new file mode 100644 index 0000000..273fec4 --- /dev/null +++ b/config/plugins/avante.nix @@ -0,0 +1,15 @@ +{ + plugins.avante.settings = { + provider = "claude"; + providers = { + claude = { + endpoint = "https://api.anthropic.com"; + extra_request_body = { + max_tokens = 4096; + temperature = 0; + }; + model = "claude-3-5-sonnet-20240620"; + }; + }; + }; +} From b4db8de9b0c19d2cf06b8d97f124e8b7de18ac9b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 03:19:33 +0300 Subject: [PATCH 08/76] add lazy loading support --- config/plugins/avante.nix | 6 +++++- config/plugins/default.nix | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/plugins/avante.nix b/config/plugins/avante.nix index 273fec4..53f9b01 100644 --- a/config/plugins/avante.nix +++ b/config/plugins/avante.nix @@ -1,5 +1,8 @@ { - plugins.avante.settings = { + plugins.avante = { + + lazyLoad.settings.event = [ "DeferredUIEnter" ]; + settings = { provider = "claude"; providers = { claude = { @@ -12,4 +15,5 @@ }; }; }; + }; } diff --git a/config/plugins/default.nix b/config/plugins/default.nix index a682652..8e54e36 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -67,5 +67,8 @@ # ai support avante.enable = true; + + # lazy loading provider + lz-n.enable = true; }; } From 6f1f0e6ea75ea51038463ab7153df37fd9dd80e5 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 12:11:20 +0300 Subject: [PATCH 09/76] formatting --- config/colorscheme.nix | 2 +- config/default.nix | 34 +++++++++++++++++----------------- config/plugins/avante.nix | 7 +++---- config/plugins/default.nix | 5 +++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config/colorscheme.nix b/config/colorscheme.nix index 18da321..9d792c8 100644 --- a/config/colorscheme.nix +++ b/config/colorscheme.nix @@ -1,6 +1,6 @@ { colorschemes = { - catppuccin = { + catppuccin = { enable = true; settings.flavor = "mocha"; }; diff --git a/config/default.nix b/config/default.nix index 474b23f..c288068 100644 --- a/config/default.nix +++ b/config/default.nix @@ -3,7 +3,7 @@ ./colorscheme.nix ./options.nix ./plugins - ]; + ]; config = { # Use as leader key @@ -35,23 +35,23 @@ ripgrep ]; - keymaps = [ - { - mode = "n"; - key = "gg"; - action = "LazyGit"; - options = { - desc = "LazyGit (root dir)"; - }; - } - ]; -extraPlugins = with pkgs.vimPlugins; [ - lazygit-nvim - ]; + keymaps = [ + { + mode = "n"; + key = "gg"; + action = "LazyGit"; + options = { + desc = "LazyGit (root dir)"; + }; + } + ]; + extraPlugins = with pkgs.vimPlugins; [ + lazygit-nvim + ]; - extraConfigLua = '' - require("telescope").load_extension("lazygit") - ''; + extraConfigLua = '' + require("telescope").load_extension("lazygit") + ''; performance = { byteCompileLua = { enable = true; diff --git a/config/plugins/avante.nix b/config/plugins/avante.nix index 53f9b01..b840d4d 100644 --- a/config/plugins/avante.nix +++ b/config/plugins/avante.nix @@ -1,9 +1,8 @@ { plugins.avante = { - - lazyLoad.settings.event = [ "DeferredUIEnter" ]; + lazyLoad.settings.event = ["DeferredUIEnter"]; settings = { - provider = "claude"; + provider = "claude"; providers = { claude = { endpoint = "https://api.anthropic.com"; @@ -15,5 +14,5 @@ }; }; }; - }; + }; } diff --git a/config/plugins/default.nix b/config/plugins/default.nix index 8e54e36..da2fe23 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -1,5 +1,6 @@ -{lib, ...}:{ - imports = lib.mapAttrsToList (name: path: ./. + "/${name}") +{lib, ...}: { + imports = + lib.mapAttrsToList (name: _path: ./. + "/${name}") (lib.filterAttrs (filename: kind: filename != "default.nix" && (kind == "regular" || kind == "directory")) (builtins.readDir ./.)); From d827b464928bce18859d84dd64843d868b90233d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 12:26:27 +0300 Subject: [PATCH 10/76] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index acceb3a..7f7a722 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1750249714, - "narHash": "sha256-7r0jQlHQfWkI6dNH6DmofYs4Ha2wB0voqwU4GI+tif0=", + "lastModified": 1750289168, + "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", "owner": "nix-community", "repo": "nixvim", - "rev": "fef045cb912e51185d0d5d67e035eca7fea7eda4", + "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", "type": "github" }, "original": { From 657fba924676c42beefaea224abbdbb405f7e9f8 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 12:37:26 +0300 Subject: [PATCH 11/76] this causes problems for some reason --- config/plugins/avante.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config/plugins/avante.nix b/config/plugins/avante.nix index b840d4d..76b93ec 100644 --- a/config/plugins/avante.nix +++ b/config/plugins/avante.nix @@ -2,17 +2,17 @@ plugins.avante = { lazyLoad.settings.event = ["DeferredUIEnter"]; settings = { - provider = "claude"; - providers = { - claude = { - endpoint = "https://api.anthropic.com"; - extra_request_body = { - max_tokens = 4096; - temperature = 0; - }; - model = "claude-3-5-sonnet-20240620"; - }; - }; + # provider = "claude"; + # providers = { + # claude = { + # endpoint = "https://api.anthropic.com"; + # extra_request_body = { + # max_tokens = 4096; + # temperature = 0; + # }; + # model = "claude-3-5-sonnet-20240620"; + # }; + # }; }; }; } From ef8b21d873bdf14d3adababe3308551971fca635 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 15:42:45 +0300 Subject: [PATCH 12/76] add oil git support --- config/plugins/default.nix | 3 +++ config/plugins/oil.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config/plugins/default.nix b/config/plugins/default.nix index da2fe23..9d8e29c 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -71,5 +71,8 @@ # lazy loading provider lz-n.enable = true; + + # oil git status shower + oil-git-status.enable = true; }; } diff --git a/config/plugins/oil.nix b/config/plugins/oil.nix index 8297a2b..4a6151b 100644 --- a/config/plugins/oil.nix +++ b/config/plugins/oil.nix @@ -7,6 +7,9 @@ view_options = { show_hidden = true; }; + win_options = { + signcolumn = "yes:2"; + }; }; # add this keymaps only if oil plugin is enabled keymaps = lib.mkIf config.plugins.oil.enable [ From 8c2428ab43b85a6fb9aff3878c8e4e330cbdd0d8 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 01:36:12 +0300 Subject: [PATCH 13/76] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7f7a722..5346849 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750183894, - "narHash": "sha256-ZtOgEt70keBVB4YJc+z7m0h7J1BOlv/GjHE1YC6KxeA=", + "lastModified": 1750811787, + "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f45e75fc63fc8a7ffc3da382b2f6b681c5b71875", + "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1750289168, - "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", + "lastModified": 1751144320, + "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", + "rev": "ceb52aece5d571b37096945c2815604195a04eb4", "type": "github" }, "original": { From a74ee44f5b9ff01714de0a8f66271a9235df858e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 01:37:01 +0300 Subject: [PATCH 14/76] no smear for now --- config/plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/plugins/default.nix b/config/plugins/default.nix index 9d8e29c..7e6f0d3 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -46,7 +46,7 @@ mini.enable = true; # TODO look more into the mini plugin # cursor animation - smear-cursor.enable = true; + smear-cursor.enable = false; # add buffer tab plugin bufferline.enable = true; From fea71cdd7e2b13d3b002bc6ac7b053204746848c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 21:29:44 +0300 Subject: [PATCH 15/76] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5346849..d6496c2 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750811787, - "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", + "lastModified": 1751786137, + "narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", + "rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1751144320, - "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", + "lastModified": 1752327225, + "narHash": "sha256-12pZ691uSfWiyW6U543i2XAhu+Mzat8FXeHMhDk3/cU=", "owner": "nix-community", "repo": "nixvim", - "rev": "ceb52aece5d571b37096945c2815604195a04eb4", + "rev": "3708f788e25d8602dde5b63bf66f9579357fef2f", "type": "github" }, "original": { From fa9212f81917ab124a54d9c4071c67ddc661a670 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Jul 2025 18:33:47 +0300 Subject: [PATCH 16/76] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d6496c2..d7397f5 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751786137, - "narHash": "sha256-lIlUKVGCGsh0Q2EA7/6xRtKUZjaQ/ur8uUyY+MynHXQ=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ceb24d94c6feaa4e8737a8e2bd3cf71c3a7eaaa0", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1752327225, - "narHash": "sha256-12pZ691uSfWiyW6U543i2XAhu+Mzat8FXeHMhDk3/cU=", + "lastModified": 1752762787, + "narHash": "sha256-WZLSOR2Pei7C4nH/ntKUqOZOAa5rgvc2fVZl4RoEXmw=", "owner": "nix-community", "repo": "nixvim", - "rev": "3708f788e25d8602dde5b63bf66f9579357fef2f", + "rev": "bc0555c8694d43fb63ae2c7afec08b6987431a04", "type": "github" }, "original": { From defe8b29463851b2f18127df63e203809c0fa5d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 16:37:07 +0300 Subject: [PATCH 17/76] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d7397f5..25acf67 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "lastModified": 1753399495, + "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1752762787, - "narHash": "sha256-WZLSOR2Pei7C4nH/ntKUqOZOAa5rgvc2fVZl4RoEXmw=", + "lastModified": 1753533009, + "narHash": "sha256-4KlfDVsYL9c3ogEehJcQOBZ+pUBH7Lwvlu2J6FCtSJc=", "owner": "nix-community", "repo": "nixvim", - "rev": "bc0555c8694d43fb63ae2c7afec08b6987431a04", + "rev": "29edaafdb088cee3d8c616a4a5bb48b5eecc647c", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", + "lastModified": 1753450833, + "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", "owner": "NuschtOS", "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", + "rev": "40987cc1a24feba378438d691f87c52819f7bd75", "type": "github" }, "original": { From a503bbf92c744d81fbf82f9ebe485a6166973aef Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 11 Aug 2025 21:49:17 +0300 Subject: [PATCH 18/76] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 25acf67..ffc1d58 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -76,11 +76,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1742249870, - "narHash": "sha256-U37ECk3zpfp92D3H0gzfWPyb5sf0RdOdublCq1zjq+w=", + "lastModified": 1753647809, + "narHash": "sha256-QCkCQIF2biY3Lh3j3J/FQ8hnwYWZrxxXnJzAY7Ow0T0=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "fe5b4498e3161191bd93fe0683dff347f6f689df", + "rev": "5c4c97df6a05fa102cc5d7907f516588f2e578c6", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753399495, - "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", + "lastModified": 1754393734, + "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", + "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1753533009, - "narHash": "sha256-4KlfDVsYL9c3ogEehJcQOBZ+pUBH7Lwvlu2J6FCtSJc=", + "lastModified": 1754921951, + "narHash": "sha256-KY+/livAp6l3fI8SdNa+CLN/AA4Z038yL/pQL2PaW7g=", "owner": "nix-community", "repo": "nixvim", - "rev": "29edaafdb088cee3d8c616a4a5bb48b5eecc647c", + "rev": "7b53322d75a1c66f84fb145e4b5f0f411d9edc6b", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1753450833, - "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", + "lastModified": 1754301638, + "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", "owner": "NuschtOS", "repo": "search", - "rev": "40987cc1a24feba378438d691f87c52819f7bd75", + "rev": "a60091045273484c040a91f5c229ba298f8ecc27", "type": "github" }, "original": { From 5a5d5e3945e9d6f9edde4027663edce7a462e114 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 11 Aug 2025 22:07:24 +0300 Subject: [PATCH 19/76] enable folding --- config/plugins/treesitter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/plugins/treesitter.nix b/config/plugins/treesitter.nix index 954f711..54cec01 100644 --- a/config/plugins/treesitter.nix +++ b/config/plugins/treesitter.nix @@ -1,6 +1,6 @@ { plugins.treesitter = { - # folding = true; # i dont like the way it starts neovim with everything folded + folding = true; # i dont like the way it starts neovim with everything folded settings = { ensure_installed = [ "python" From 3b0fc7da4ddd32f70b4743d53e8778eeb148e019 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 11 Aug 2025 23:51:09 +0300 Subject: [PATCH 20/76] a bit better folding --- config/options.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/config/options.nix b/config/options.nix index 1c33d6f..d0a1a70 100644 --- a/config/options.nix +++ b/config/options.nix @@ -19,5 +19,33 @@ autoindent = true; # Do clever autoindenting # TODO: i want to see 4 spaces when i press tab in python and 2 spaces in nix using setlocal # is it possible for me to set this per language? + + + # folding + foldmethod = "expr"; + foldexpr = "nvim_treesitter#foldexpr()"; + foldlevel = 99; # Folds with a level higher than this number will be closed + foldcolumn = "1"; + foldenable = true; + foldlevelstart = -1; + fillchars = { + horiz = "━"; + horizup = "┻"; + horizdown = "┳"; + vert = "┃"; + vertleft = "┫"; + vertright = "┣"; + verthoriz = "╋"; + + eob = " "; + diff = "╱"; + + fold = " "; + foldopen = ""; + foldclose = ""; + + msgsep = "‾"; + }; + }; } From a1c5000b5dabd8d98d16cca477f74fbacaec7624 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 14:39:11 +0300 Subject: [PATCH 21/76] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ffc1d58..512765b 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754921951, - "narHash": "sha256-KY+/livAp6l3fI8SdNa+CLN/AA4Z038yL/pQL2PaW7g=", + "lastModified": 1755095763, + "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", "owner": "nix-community", "repo": "nixvim", - "rev": "7b53322d75a1c66f84fb145e4b5f0f411d9edc6b", + "rev": "ecc7880e00a2a735074243d8a664a931d73beace", "type": "github" }, "original": { From b5d81a5a69b249356a09d2f980e530e65b3016df Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 15:25:10 +0300 Subject: [PATCH 22/76] show configurations also --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8203217..2651746 100644 --- a/flake.nix +++ b/flake.nix @@ -48,9 +48,12 @@ inherit pkgs self; }; }; - in { + in rec { default = mkNixvim {}; lite = mkNixvim {withLSP = false;}; + + default-print-init = default.config.build.printInitPackage; + lite-print-init = lite.config.build.printInitPackage; }); }; } From a13d094773786bdfb236032ae900bfabaf289f7c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 17:24:08 +0300 Subject: [PATCH 23/76] add blink sources --- config/plugins/blink-cmp.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/config/plugins/blink-cmp.nix b/config/plugins/blink-cmp.nix index cb98844..b31a0b0 100644 --- a/config/plugins/blink-cmp.nix +++ b/config/plugins/blink-cmp.nix @@ -1,6 +1,34 @@ { plugins.blink-cmp = { settings = { + sources = { + default = [ + "lsp" + "path" + "luasnip" + "buffer" + "copilot" + ]; + providers = { + copilot = { + async = true; + module = "blink-copilot"; + name = "copilot"; + score_offset = 100; + # Optional configurations + opts = { + max_completions = 3; + max_attempts = 4; + kind = "Copilot"; + debounce = 750; + auto_refresh = { + backward = true; + forward = true; + }; + }; + }; + }; + }; }; }; } From 32635ed0484322f2dd64a921b4205302703b43fe Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 19:48:41 +0300 Subject: [PATCH 24/76] i originally wanted this --- flake.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index 2651746..47091ae 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,9 @@ default-print-init = default.config.build.printInitPackage; lite-print-init = lite.config.build.printInitPackage; + + default-init = default.config.build.initSource; + lite-init = lite.config.build.initSource; }); }; } From b1a51a416d1c5845192c5bca70c89fe509bbae3d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 21:28:29 +0300 Subject: [PATCH 25/76] fix snippets --- config/plugins/blink-cmp.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/plugins/blink-cmp.nix b/config/plugins/blink-cmp.nix index b31a0b0..83c1026 100644 --- a/config/plugins/blink-cmp.nix +++ b/config/plugins/blink-cmp.nix @@ -1,11 +1,13 @@ { plugins.blink-cmp = { settings = { + snippets = { + preset = "luasnip"; + }; sources = { default = [ "lsp" "path" - "luasnip" "buffer" "copilot" ]; From e98be4fd93934d9dca4eb4545e87c70a0147f218 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 21:28:41 +0300 Subject: [PATCH 26/76] enable copilot --- config/plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/plugins/default.nix b/config/plugins/default.nix index 7e6f0d3..e417720f 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -74,5 +74,8 @@ # oil git status shower oil-git-status.enable = true; + + # blink copilot + blink-copilot.enable = true; }; } From d78b9bc6243a33150da3322728b9115aff5a09c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 23:29:44 +0300 Subject: [PATCH 27/76] luasnip is not working as of now --- config/plugins/blink-cmp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/plugins/blink-cmp.nix b/config/plugins/blink-cmp.nix index 83c1026..73a09b4 100644 --- a/config/plugins/blink-cmp.nix +++ b/config/plugins/blink-cmp.nix @@ -1,9 +1,9 @@ { plugins.blink-cmp = { settings = { - snippets = { - preset = "luasnip"; - }; + # snippets = { + # preset = "luasnip"; + # }; sources = { default = [ "lsp" From 17c6b291f2c156b5d81e3fe1ed9b86734b529c9a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Aug 2025 03:25:33 +0300 Subject: [PATCH 28/76] formatting --- config/options.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/options.nix b/config/options.nix index d0a1a70..fa918f5 100644 --- a/config/options.nix +++ b/config/options.nix @@ -20,7 +20,6 @@ # TODO: i want to see 4 spaces when i press tab in python and 2 spaces in nix using setlocal # is it possible for me to set this per language? - # folding foldmethod = "expr"; foldexpr = "nvim_treesitter#foldexpr()"; @@ -46,6 +45,5 @@ msgsep = "‾"; }; - }; } From d8efd81cbdfacef5a029b20171f9ce3814b97f96 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Aug 2025 14:51:47 +0300 Subject: [PATCH 29/76] set providers --- config/plugins/avante.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/plugins/avante.nix b/config/plugins/avante.nix index 76b93ec..50f5647 100644 --- a/config/plugins/avante.nix +++ b/config/plugins/avante.nix @@ -2,8 +2,9 @@ plugins.avante = { lazyLoad.settings.event = ["DeferredUIEnter"]; settings = { + # provider = "ollama"; # provider = "claude"; - # providers = { + providers = { # claude = { # endpoint = "https://api.anthropic.com"; # extra_request_body = { @@ -12,7 +13,11 @@ # }; # model = "claude-3-5-sonnet-20240620"; # }; - # }; + ollama = { + endpoint = "http://localhost:11434"; + model = "qwen2.5-coder:32b"; + }; + }; }; }; } From 3ddc546f8d4c479724de871eea1cfd5d95be975a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 1 Sep 2025 08:46:32 +0300 Subject: [PATCH 30/76] update flake.lock --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 512765b..25d1473 100644 --- a/flake.lock +++ b/flake.lock @@ -53,16 +53,16 @@ ] }, "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.8", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } @@ -76,11 +76,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1753647809, - "narHash": "sha256-QCkCQIF2biY3Lh3j3J/FQ8hnwYWZrxxXnJzAY7Ow0T0=", + "lastModified": 1755887017, + "narHash": "sha256-UQLA9eBI9n1Cy6hROU6g5hUHvvqkA9pRTk76kIquMps=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "5c4c97df6a05fa102cc5d7907f516588f2e578c6", + "rev": "d6fc6c5446bf342c313df660869f96206b434c2d", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754393734, - "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", + "lastModified": 1755829505, + "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", + "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1755095763, - "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", + "lastModified": 1756587208, + "narHash": "sha256-pATHF/7rZeEYxnkvLZgrLbCjG4xBJDJ4zkjUiu+hhiU=", "owner": "nix-community", "repo": "nixvim", - "rev": "ecc7880e00a2a735074243d8a664a931d73beace", + "rev": "8bad4d407dace583ebf6a41d32cab479788898fe", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1754301638, - "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", + "lastModified": 1755555503, + "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", "owner": "NuschtOS", "repo": "search", - "rev": "a60091045273484c040a91f5c229ba298f8ecc27", + "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", "type": "github" }, "original": { From db9189edfc9007f339e766c176a741f598651e61 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 11:38:41 +0300 Subject: [PATCH 31/76] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 25d1473..9515075 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1755887017, - "narHash": "sha256-UQLA9eBI9n1Cy6hROU6g5hUHvvqkA9pRTk76kIquMps=", + "lastModified": 1756744433, + "narHash": "sha256-6BSEvkprwEQDQQgW5UH/1GkBPGM8M9+qX6o9ePslr6E=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "d6fc6c5446bf342c313df660869f96206b434c2d", + "rev": "63b748033a3fa0af80f8ed908521122e48858c30", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1756587208, - "narHash": "sha256-pATHF/7rZeEYxnkvLZgrLbCjG4xBJDJ4zkjUiu+hhiU=", + "lastModified": 1757145319, + "narHash": "sha256-F5islzaJ5zGXomXAGM7Kqi5skyGaNXOLD77atgmReZw=", "owner": "nix-community", "repo": "nixvim", - "rev": "8bad4d407dace583ebf6a41d32cab479788898fe", + "rev": "a04b93fa7bf4160a9dc60d0713fff44c0fff9af6", "type": "github" }, "original": { From 1080b3a8ccd815f1e19a35e39f5dbd600de0047e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 15:36:09 +0300 Subject: [PATCH 32/76] add tailscale --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 471c361..800f57f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,13 @@ jobs: - name: Install nix uses: cachix/install-nix-action@v16 + - name: Login to tailscale + uses: tailscale/github-action@v3.2.3 + with: + oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} + oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} + tags: tag:ci + hostname: github-actions # TODO: add a binary cache # - uses: cachix/cachix-action@v10 From 04d828f9d8782fbf4b699a9fd48bb8be34a48c72 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 15:37:39 +0300 Subject: [PATCH 33/76] no tag --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 800f57f..a5383be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: with: oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - tags: tag:ci hostname: github-actions # TODO: add a binary cache From f83a04eba7688ea425dadbe558980f7c9369b52b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 15:51:49 +0300 Subject: [PATCH 34/76] wtf --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5383be..e264ea5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,6 +20,7 @@ jobs: oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} hostname: github-actions + tags: tag:ci # TODO: add a binary cache # - uses: cachix/cachix-action@v10 From 73e5ab059ffd44d19dfa11ac6bc50a2d554c1dc4 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:00:11 +0300 Subject: [PATCH 35/76] formatting --- config/plugins/avante.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/plugins/avante.nix b/config/plugins/avante.nix index 50f5647..dbe9ec7 100644 --- a/config/plugins/avante.nix +++ b/config/plugins/avante.nix @@ -5,14 +5,14 @@ # provider = "ollama"; # provider = "claude"; providers = { - # claude = { - # endpoint = "https://api.anthropic.com"; - # extra_request_body = { - # max_tokens = 4096; - # temperature = 0; - # }; - # model = "claude-3-5-sonnet-20240620"; - # }; + # claude = { + # endpoint = "https://api.anthropic.com"; + # extra_request_body = { + # max_tokens = 4096; + # temperature = 0; + # }; + # model = "claude-3-5-sonnet-20240620"; + # }; ollama = { endpoint = "http://localhost:11434"; model = "qwen2.5-coder:32b"; From 6d14def506c1736b2b480ad626add6d64adfafee Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:21:02 +0300 Subject: [PATCH 36/76] add attic --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e264ea5..c5474f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,12 +22,12 @@ jobs: hostname: github-actions tags: tag:ci - # TODO: add a binary cache - # - uses: cachix/cachix-action@v10 - # with: - # name: YOURCACHE - # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - + - name: Setup Attic cache + uses: ryanccn/attic-action@v0.4.0 + with: + endpoint: http://wallfacer.curl-boga.ts.net:7080 + cache: main + token: ${{ secrets.ATTIC_TOKEN }} - name: Check the flake run: nix flake check --accept-flake-config From 82cad3c0dd64e965a75a58cf88e160155353046e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:26:34 +0300 Subject: [PATCH 37/76] i wonder --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5474f7..c06f0eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: tags: tag:ci - name: Setup Attic cache - uses: ryanccn/attic-action@v0.4.0 + uses: ryanccn/attic-action@v0 with: endpoint: http://wallfacer.curl-boga.ts.net:7080 cache: main From 009dfd4cd5bb7451d4c6cb60d6982874f23af69a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:29:36 +0300 Subject: [PATCH 38/76] was this the problem --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c06f0eb..a0e4da3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v2 - name: Install nix - uses: cachix/install-nix-action@v16 + uses: cachix/install-nix-action@v27 - name: Login to tailscale uses: tailscale/github-action@v3.2.3 @@ -23,7 +23,7 @@ jobs: tags: tag:ci - name: Setup Attic cache - uses: ryanccn/attic-action@v0 + uses: ryanccn/attic-action@v0.3.1 with: endpoint: http://wallfacer.curl-boga.ts.net:7080 cache: main From 05672d4b09989b1c14247e47a9a6b33d85db08d3 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:42:54 +0300 Subject: [PATCH 39/76] will this work? --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0e4da3..6d2d1b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,17 @@ jobs: hostname: github-actions tags: tag:ci + - name: Check if Attic endpoint is reachable + id: check_attic + run: | + if curl --connect-timeout 5 --silent --head http://wallfacer.curl-boga.ts.net:7080 | grep "200 OK"; then + echo "reachable=true" >> $GITHUB_OUTPUT + else + echo "reachable=false" >> $GITHUB_OUTPUT + fi + - name: Setup Attic cache + if: steps.check_attic.outputs.reachable == 'true' uses: ryanccn/attic-action@v0.3.1 with: endpoint: http://wallfacer.curl-boga.ts.net:7080 From 7020149e6daf5914cb22737f9ed27c9e9dac0e3c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:45:34 +0300 Subject: [PATCH 40/76] no concurrency --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d2d1b3..11ae89b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,10 @@ on: push: workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-24.04 From 8d5c8245c218d7c42d87bdb1ba7540fafe0b043a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:52:42 +0300 Subject: [PATCH 41/76] try --- .github/workflows/ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11ae89b..20c251b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,16 @@ concurrency: jobs: build: - runs-on: ubuntu-24.04 + strategy: + fail-fast: false + matrix: + system: + - x86_64-linux + - aarch64-linux + - x86_64-darwin + runs-on: ${{ matrix.system == 'x86_64-linux' && 'ubuntu-24.04' + || matrix.system == 'aarch64-linux' && 'ubuntu-24.04-arm' + || matrix.system == 'x86_64-darwin' && 'macos-latest' }} steps: - name: Checkout the repository uses: actions/checkout@v2 @@ -23,7 +32,7 @@ jobs: with: oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - hostname: github-actions + hostname: github-actions-${{ matrix.system }} tags: tag:ci - name: Check if Attic endpoint is reachable From 5ce23054d9c01e40351b704f3fd7284472d2b46b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:54:21 +0300 Subject: [PATCH 42/76] does this work --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20c251b..77fee36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: with: oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - hostname: github-actions-${{ matrix.system }} + hostname: github-actions-${{ replace(matrix.system, '_', '-') }} tags: tag:ci - name: Check if Attic endpoint is reachable From 3b19d429ce26ef091114100f0b66b2c4c1f77a1a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:56:41 +0300 Subject: [PATCH 43/76] weird syntax --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77fee36..7a2d2ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: with: oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - hostname: github-actions-${{ replace(matrix.system, '_', '-') }} + hostname: github-actions-${{ matrix.system//_/- }} tags: tag:ci - name: Check if Attic endpoint is reachable From c813cb28ade02bc6104b6cd3727e28ad8f13ef17 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 16:59:43 +0300 Subject: [PATCH 44/76] simpler haha --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a2d2ca..6ce7662 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,9 @@ jobs: with: oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - hostname: github-actions-${{ matrix.system//_/- }} + hostname: ${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' + || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' + || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} tags: tag:ci - name: Check if Attic endpoint is reachable From 05af1a15f1046507459e6c36a2ac66d490887d6a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 17:03:56 +0300 Subject: [PATCH 45/76] use custom action --- .github/actions/setup-nix/action.yml | 67 ++++++++++++++++++++++++++++ .github/workflows/ci.yml | 8 ++-- 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 .github/actions/setup-nix/action.yml diff --git a/.github/actions/setup-nix/action.yml b/.github/actions/setup-nix/action.yml new file mode 100644 index 0000000..dfd6c22 --- /dev/null +++ b/.github/actions/setup-nix/action.yml @@ -0,0 +1,67 @@ +name: setup-nix + +inputs: + system: + type: string + required: true + sandbox: + type: string + default: "true" + +runs: + using: composite + steps: + - name: reclaim space (linux) + if: runner.os == 'Linux' + uses: wimpysworld/nothing-but-nix@main + with: + hatchet-protocol: rampage + + - name: reclaim space (darwin) + if: runner.os == 'macOS' + shell: bash + run: | + echo "::group::disk space (before)" + sudo df -h + echo "::endgroup::" + + echo "::group::disable mds" + sudo mdutil -i off -a || echo "mdutil failed" + sudo launchctl unload -w /System/Library/LaunchDaemons/com.apple.metadata.mds.plist \ + || echo "launchctl unload failed" + echo "::endgroup::" + + echo "Background space expansion started. /nix will grow as space becomes available." + sudo rm -rf \ + /Applications/Xcode_* \ + /Library/Developer/CoreSimulator \ + /Library/Frameworks \ + /Users/runner/.dotnet \ + /Users/runner/.rustup \ + /Users/runner/Library/Android \ + /Users/runner/Library/Caches \ + /Users/runner/Library/Developer/CoreSimulator \ + /Users/runner/hostedtoolcache & + + - name: install nix + uses: cachix/install-nix-action@v31 + with: + # Putting build-dir in /nix is a workaround for https://github.com/wimpysworld/nothing-but-nix/issues/18 + extra_nix_config: | + build-dir = /nix/build + sandbox = ${{ inputs.sandbox }} + system = ${{ inputs.system }} + + - name: create build-dir + shell: bash + run: sudo mkdir -p /nix/build + + - name: post setup-nix + if: runner.os == 'macOS' + uses: srz-zumix/post-run-action@v2 + with: + shell: bash -e {0} + post-run: | + echo "::group::disk space (after)" + sudo df -h + echo "::endgroup::" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ce7662..3d7fa42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,9 +24,11 @@ jobs: - name: Checkout the repository uses: actions/checkout@v2 - - name: Install nix - uses: cachix/install-nix-action@v27 - + - name: setup nix + uses: ./.github/actions/setup-nix + with: + system: ${{ matrix.system }} + - name: Login to tailscale uses: tailscale/github-action@v3.2.3 with: From dbd99ddccae84c96811f5677e6ff93d5dba50cb0 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 11:50:49 +0300 Subject: [PATCH 46/76] update checkout --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d7fa42..aa7234d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: || matrix.system == 'x86_64-darwin' && 'macos-latest' }} steps: - name: Checkout the repository - uses: actions/checkout@v2 + uses: actions/checkout@v5.0.0 - name: setup nix uses: ./.github/actions/setup-nix From aafec377836cf58a8041ea33fd87817b1a4a7380 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 11:51:05 +0300 Subject: [PATCH 47/76] add nixConfig --- flake.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/flake.nix b/flake.nix index 47091ae..fa76ac6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,17 @@ { description = "My custom neovim configuration that has been mixed and matched from various sources"; + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + "http://wallfacer.curl-boga.ts.net:7080" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" + ]; + }; + inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # https://gerschtli.github.io/nix-formatter-pack/nix-formatter-pack-options.html From eb926f2bd03b6b4e1b4a3df5f7c31fcce588751a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:13:21 +0300 Subject: [PATCH 48/76] i am done --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa7234d..6c64f1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,14 +21,15 @@ jobs: || matrix.system == 'aarch64-linux' && 'ubuntu-24.04-arm' || matrix.system == 'x86_64-darwin' && 'macos-latest' }} steps: - - name: Checkout the repository - uses: actions/checkout@v5.0.0 + - uses: actions/checkout@v4 + with: + sparse-checkout: .github/actions - name: setup nix uses: ./.github/actions/setup-nix with: system: ${{ matrix.system }} - + - name: Login to tailscale uses: tailscale/github-action@v3.2.3 with: From 7a25a807d729da2c5842e095923a9d65ae3b9845 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:13:30 +0300 Subject: [PATCH 49/76] much better --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fa76ac6..9c649a6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "http://wallfacer.curl-boga.ts.net:7080" + "http://wallfacer.curl-boga.ts.net:7080/main" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" From 362bec5bab262bc5fa40d75871d2ec1bea6c0458 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:27:40 +0300 Subject: [PATCH 50/76] formatting --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9c649a6..03dac0a 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" ]; - }; + }; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; From 08c76f13db01ba610eaea79e2955dc5721f44adc Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:43:32 +0300 Subject: [PATCH 51/76] why did i do this --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c64f1d..ee7964f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,7 @@ jobs: || matrix.system == 'x86_64-darwin' && 'macos-latest' }} steps: - uses: actions/checkout@v4 - with: - sparse-checkout: .github/actions + - name: setup nix uses: ./.github/actions/setup-nix From 1bfe1d1f004cde33a8459251a02aca2b1e9b4464 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:49:50 +0300 Subject: [PATCH 52/76] dont do this 3 times simultaniously --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee7964f..0dc1556 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: setup nix uses: ./.github/actions/setup-nix with: @@ -67,17 +66,20 @@ jobs: run: du -sh /nix/store - name: Get the init.lua path + if: matrix.system == 'x86_64-linux' run: | init_path=$(grep "init=" result/bin/nixvim-print-init | awk -F'=' '{print $2}') cp $init_path init.lua - name: Upload the artifact uses: actions/upload-artifact@v4 + if: matrix.system == 'x86_64-linux' with: name: neovim-configuration path: init.lua - name: Publish the init.lua to an orphan github branch + if: matrix.system == 'x86_64-linux' run: | git config --global user.name github-actions git config --global user.email github-actions@github.com @@ -87,6 +89,7 @@ jobs: git commit -m "Publish init.lua" git push --force origin init-lua + check-formatting: runs-on: ubuntu-24.04 steps: From c63baacd9cf3f1bd93e334448554585b7c61768c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:51:22 +0300 Subject: [PATCH 53/76] add debug --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0dc1556..318b0b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,6 +89,12 @@ jobs: git commit -m "Publish init.lua" git push --force origin init-lua + # print the current folder path and the contents of the folder + - name: Debug current folder + run: | + pwd + ls -la + check-formatting: runs-on: ubuntu-24.04 From 66b069b50d14f8e5fb8b7a258dad3ba9b1b2b6d9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:56:45 +0300 Subject: [PATCH 54/76] This is it --- .github/workflows/ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 318b0b0..bffb77d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,13 +88,7 @@ jobs: git add init.lua git commit -m "Publish init.lua" git push --force origin init-lua - - # print the current folder path and the contents of the folder - - name: Debug current folder - run: | - pwd - ls -la - + git checkout main # switch back to main branch for graceful job ending check-formatting: runs-on: ubuntu-24.04 From fb62d9d8042139a6a5054b6914a2945ae1b805c6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 14:14:13 +0300 Subject: [PATCH 55/76] tailscale status --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bffb77d..16e2a0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,9 @@ jobs: || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} tags: tag:ci + - name: Tailscale status + run: tailscale status > /dev/null + - name: Check if Attic endpoint is reachable id: check_attic run: | From 5163585282c7ad523b6df2f2292852b216e881cf Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 14:24:16 +0300 Subject: [PATCH 56/76] errrrrrrrr --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16e2a0e..4b7c71f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: tags: tag:ci - name: Tailscale status - run: tailscale status > /dev/null + run: tailscale status || true - name: Check if Attic endpoint is reachable id: check_attic From b50ee232bbd1274e5af2f5cb7097f90ddcbdf2bc Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 14:34:46 +0300 Subject: [PATCH 57/76] Why macos is so shitty --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b7c71f..de52ba2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,12 +44,16 @@ jobs: - name: Check if Attic endpoint is reachable id: check_attic run: | - if curl --connect-timeout 5 --silent --head http://wallfacer.curl-boga.ts.net:7080 | grep "200 OK"; then + if curl --connect-timeout 20 --silent --head http://wallfacer.curl-boga.ts.net:7080 | grep "200 OK"; then echo "reachable=true" >> $GITHUB_OUTPUT else echo "reachable=false" >> $GITHUB_OUTPUT fi + - name: Curl the cache + run: | + curl http://wallfacer.curl-boga.ts.net:7080/main/nix-cache-info + - name: Setup Attic cache if: steps.check_attic.outputs.reachable == 'true' uses: ryanccn/attic-action@v0.3.1 From 719383c09800d0e69c9d5565100491733d828232 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 14:47:38 +0300 Subject: [PATCH 58/76] use nix to install tailscale --- .github/workflows/ci.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de52ba2..fee09d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,15 +28,27 @@ jobs: with: system: ${{ matrix.system }} - - name: Login to tailscale - uses: tailscale/github-action@v3.2.3 - with: - oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} - oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - hostname: ${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' + - name: Install and start Tailscale + run: | + # Install tailscale via nix + nix profile install nixpkgs#tailscale + + # Start tailscaled daemon in background + sudo $(nix profile list | grep tailscale | awk '{print $4}')/bin/tailscaled --state=mem: & + + # Wait for daemon to be ready + sleep 10 + + # Connect using OAuth + HOSTNAME="${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' - || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} - tags: tag:ci + || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }}" + + $(nix profile list | grep tailscale | awk '{print $4}')/bin/tailscale up \ + --authkey="${{ secrets.TS_OAUTH_SECRET }}?preauthorized=true&ephemeral=true" \ + --hostname="$HOSTNAME" \ + --advertise-tags="tag:ci" \ + --accept-routes - name: Tailscale status run: tailscale status || true @@ -52,7 +64,7 @@ jobs: - name: Curl the cache run: | - curl http://wallfacer.curl-boga.ts.net:7080/main/nix-cache-info + curl --connect-timeout 20 --silent http://wallfacer.curl-boga.ts.net:7080/main/nix-cache-info || echo "Cache endpoint not reachable" - name: Setup Attic cache if: steps.check_attic.outputs.reachable == 'true' From 15c363d07ba582a031a6f91f877566a750e88e4d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 15:01:19 +0300 Subject: [PATCH 59/76] profile install should allow this --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fee09d1..ec3af35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: nix profile install nixpkgs#tailscale # Start tailscaled daemon in background - sudo $(nix profile list | grep tailscale | awk '{print $4}')/bin/tailscaled --state=mem: & + sudo tailscaled --state=mem: & # Wait for daemon to be ready sleep 10 @@ -44,7 +44,7 @@ jobs: || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }}" - $(nix profile list | grep tailscale | awk '{print $4}')/bin/tailscale up \ + tailscale up \ --authkey="${{ secrets.TS_OAUTH_SECRET }}?preauthorized=true&ephemeral=true" \ --hostname="$HOSTNAME" \ --advertise-tags="tag:ci" \ From 10d41e635d8099f90a86bf7afdec23b1258f473d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 15:02:35 +0300 Subject: [PATCH 60/76] nix shell it is --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec3af35..de37fa6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,11 +30,8 @@ jobs: - name: Install and start Tailscale run: | - # Install tailscale via nix - nix profile install nixpkgs#tailscale - - # Start tailscaled daemon in background - sudo tailscaled --state=mem: & + # Start tailscaled daemon in background using nix shell + sudo nix shell nixpkgs#tailscale --command tailscaled --state=mem: & # Wait for daemon to be ready sleep 10 @@ -44,14 +41,14 @@ jobs: || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }}" - tailscale up \ + nix shell nixpkgs#tailscale --command tailscale up \ --authkey="${{ secrets.TS_OAUTH_SECRET }}?preauthorized=true&ephemeral=true" \ --hostname="$HOSTNAME" \ --advertise-tags="tag:ci" \ --accept-routes - name: Tailscale status - run: tailscale status || true + run: nix shell nixpkgs#tailscale --command tailscale status || true - name: Check if Attic endpoint is reachable id: check_attic From d47e9c78172749c22eae2a4f5029c49fb07fca09 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:18:16 +0300 Subject: [PATCH 61/76] verbose --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de37fa6..d804c2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,8 +54,10 @@ jobs: id: check_attic run: | if curl --connect-timeout 20 --silent --head http://wallfacer.curl-boga.ts.net:7080 | grep "200 OK"; then + echo "Attic endpoint is reachable" echo "reachable=true" >> $GITHUB_OUTPUT else + echo "Attic endpoint is not reachable" echo "reachable=false" >> $GITHUB_OUTPUT fi From 88d424e8f1882ed1f77facd4d3eeda90b2ab5507 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:20:23 +0300 Subject: [PATCH 62/76] try full path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d804c2d..3bcc3c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - name: Install and start Tailscale run: | # Start tailscaled daemon in background using nix shell - sudo nix shell nixpkgs#tailscale --command tailscaled --state=mem: & + sudo /nix/var/nix/profiles/default/bin/nix shell nixpkgs#tailscale --command tailscaled --state=mem: & # Wait for daemon to be ready sleep 10 From 1473b3dfe9c071e3959d772a08212aa6481061a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:23:27 +0300 Subject: [PATCH 63/76] use environment --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bcc3c4..d5a8420 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - name: Install and start Tailscale run: | # Start tailscaled daemon in background using nix shell - sudo /nix/var/nix/profiles/default/bin/nix shell nixpkgs#tailscale --command tailscaled --state=mem: & + sudo -E nix shell nixpkgs#tailscale --command tailscaled --state=mem: & # Wait for daemon to be ready sleep 10 From a2420c650f5eaff6ef3518d4ee3002caf0505232 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:25:03 +0300 Subject: [PATCH 64/76] Revert "use environment" This reverts commit 1473b3dfe9c071e3959d772a08212aa6481061a4. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5a8420..3bcc3c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - name: Install and start Tailscale run: | # Start tailscaled daemon in background using nix shell - sudo -E nix shell nixpkgs#tailscale --command tailscaled --state=mem: & + sudo /nix/var/nix/profiles/default/bin/nix shell nixpkgs#tailscale --command tailscaled --state=mem: & # Wait for daemon to be ready sleep 10 From 30cec2b8363928279e2448a6aaac13029485450d Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:26:47 +0300 Subject: [PATCH 65/76] try all root --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bcc3c4..fddbead 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,14 +41,14 @@ jobs: || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }}" - nix shell nixpkgs#tailscale --command tailscale up \ + sudo nix shell nixpkgs#tailscale --command tailscale up \ --authkey="${{ secrets.TS_OAUTH_SECRET }}?preauthorized=true&ephemeral=true" \ --hostname="$HOSTNAME" \ --advertise-tags="tag:ci" \ --accept-routes - name: Tailscale status - run: nix shell nixpkgs#tailscale --command tailscale status || true + run: sudo nix shell nixpkgs#tailscale --command tailscale status || true - name: Check if Attic endpoint is reachable id: check_attic From 8901f583b4e56e29313de53c62dc3814cdcf2a3c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:30:46 +0300 Subject: [PATCH 66/76] i dont see why this shouldnt work --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fddbead..9ba6aee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,8 @@ jobs: - name: Install and start Tailscale run: | # Start tailscaled daemon in background using nix shell - sudo /nix/var/nix/profiles/default/bin/nix shell nixpkgs#tailscale --command tailscaled --state=mem: & + nix profile install nixpkgs#tailscale + tailscaled --state=mem: & # Wait for daemon to be ready sleep 10 @@ -41,14 +42,14 @@ jobs: || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }}" - sudo nix shell nixpkgs#tailscale --command tailscale up \ + tailscale up \ --authkey="${{ secrets.TS_OAUTH_SECRET }}?preauthorized=true&ephemeral=true" \ --hostname="$HOSTNAME" \ --advertise-tags="tag:ci" \ --accept-routes - name: Tailscale status - run: sudo nix shell nixpkgs#tailscale --command tailscale status || true + run: tailscale status || true - name: Check if Attic endpoint is reachable id: check_attic From 3f00007a1fa3ba94cde52edf07a5c34fb17077e2 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:34:46 +0300 Subject: [PATCH 67/76] imma try it anyway --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ba6aee..f1b7a7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,8 @@ jobs: - name: Install and start Tailscale run: | # Start tailscaled daemon in background using nix shell - nix profile install nixpkgs#tailscale - tailscaled --state=mem: & + nix profile add nixpkgs#tailscale + sudo tailscaled --state=mem: & # Wait for daemon to be ready sleep 10 From 6d22222568035b19663a9dbecfd0d8a8baf89411 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:39:07 +0300 Subject: [PATCH 68/76] first try this --- .github/workflows/ci.yml | 44 ++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1b7a7c..edcb5ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,25 +28,35 @@ jobs: with: system: ${{ matrix.system }} - - name: Install and start Tailscale - run: | - # Start tailscaled daemon in background using nix shell - nix profile add nixpkgs#tailscale - sudo tailscaled --state=mem: & - - # Wait for daemon to be ready - sleep 10 - - # Connect using OAuth - HOSTNAME="${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' + - name: Login to tailscale + uses: tailscale/github-action@v3.2.3 + with: + oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} + oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} + hostname: ${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' - || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }}" + || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} + tags: tag:ci + + # - name: Install and start Tailscale + # run: | + # # Start tailscaled daemon in background using nix shell + # nix profile add nixpkgs#tailscale + # sudo tailscaled --state=mem: & - tailscale up \ - --authkey="${{ secrets.TS_OAUTH_SECRET }}?preauthorized=true&ephemeral=true" \ - --hostname="$HOSTNAME" \ - --advertise-tags="tag:ci" \ - --accept-routes + # # Wait for daemon to be ready + # sleep 10 + + # # Connect using OAuth + # HOSTNAME="${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' + # || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' + # || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }}" + + # tailscale up \ + # --authkey="${{ secrets.TS_OAUTH_SECRET }}?preauthorized=true&ephemeral=true" \ + # --hostname="$HOSTNAME" \ + # --advertise-tags="tag:ci" \ + # --accept-routes - name: Tailscale status run: tailscale status || true From ed33e038a72bbec33cadd171f2da897e77799860 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:45:11 +0300 Subject: [PATCH 69/76] a man can dream --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- flake.nix | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edcb5ab..774cdd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,15 +28,15 @@ jobs: with: system: ${{ matrix.system }} - - name: Login to tailscale - uses: tailscale/github-action@v3.2.3 - with: - oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} - oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - hostname: ${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' - || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' - || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} - tags: tag:ci + # - name: Login to tailscale + # uses: tailscale/github-action@v3.2.3 + # with: + # oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} + # oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} + # hostname: ${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' + # || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' + # || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} + # tags: tag:ci # - name: Install and start Tailscale # run: | @@ -58,13 +58,13 @@ jobs: # --advertise-tags="tag:ci" \ # --accept-routes - - name: Tailscale status - run: tailscale status || true + # - name: Tailscale status + # run: tailscale status || true - name: Check if Attic endpoint is reachable id: check_attic run: | - if curl --connect-timeout 20 --silent --head http://wallfacer.curl-boga.ts.net:7080 | grep "200 OK"; then + if curl --connect-timeout 20 --silent --head https://cache.osbm.dev | grep "200 OK"; then echo "Attic endpoint is reachable" echo "reachable=true" >> $GITHUB_OUTPUT else @@ -74,13 +74,13 @@ jobs: - name: Curl the cache run: | - curl --connect-timeout 20 --silent http://wallfacer.curl-boga.ts.net:7080/main/nix-cache-info || echo "Cache endpoint not reachable" + curl --connect-timeout 20 --silent https://cache.osbm.dev/main/nix-cache-info || echo "Cache endpoint not reachable" - name: Setup Attic cache if: steps.check_attic.outputs.reachable == 'true' uses: ryanccn/attic-action@v0.3.1 with: - endpoint: http://wallfacer.curl-boga.ts.net:7080 + endpoint: https://cache.osbm.dev cache: main token: ${{ secrets.ATTIC_TOKEN }} diff --git a/flake.nix b/flake.nix index 03dac0a..cf3b069 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "http://wallfacer.curl-boga.ts.net:7080/main" + "https://cache.osbm.dev/main" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" From 9407917da864f6cdd93d1564bab5900b28ada7d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:48:32 +0300 Subject: [PATCH 70/76] dont check --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 774cdd2..e4ae44b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,23 +61,23 @@ jobs: # - name: Tailscale status # run: tailscale status || true - - name: Check if Attic endpoint is reachable - id: check_attic - run: | - if curl --connect-timeout 20 --silent --head https://cache.osbm.dev | grep "200 OK"; then - echo "Attic endpoint is reachable" - echo "reachable=true" >> $GITHUB_OUTPUT - else - echo "Attic endpoint is not reachable" - echo "reachable=false" >> $GITHUB_OUTPUT - fi + # - name: Check if Attic endpoint is reachable + # id: check_attic + # run: | + # if curl --connect-timeout 20 --silent --head https://cache.osbm.dev | grep "200 OK"; then + # echo "Attic endpoint is reachable" + # echo "reachable=true" >> $GITHUB_OUTPUT + # else + # echo "Attic endpoint is not reachable" + # echo "reachable=false" >> $GITHUB_OUTPUT + # fi - name: Curl the cache run: | curl --connect-timeout 20 --silent https://cache.osbm.dev/main/nix-cache-info || echo "Cache endpoint not reachable" - name: Setup Attic cache - if: steps.check_attic.outputs.reachable == 'true' + # if: steps.check_attic.outputs.reachable == 'true' uses: ryanccn/attic-action@v0.3.1 with: endpoint: https://cache.osbm.dev From b158f155aaed62cafb3f5cb0093a90290f4585b0 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 13:56:56 +0300 Subject: [PATCH 71/76] much better --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4ae44b..eeeafc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,8 +88,10 @@ jobs: run: nix flake check --accept-flake-config - - name: Pre-build the system configuration - run: nix build --accept-flake-config . + - name: Build the Neovim Configuration + run: nix build --accept-flake-config . -j3 + timeout-minutes: 300 + continue-on-error: true - name: Print out the size of /nix/store run: du -sh /nix/store From b9498fefd50d867defd0071243e55b99a6e4d747 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 18 Sep 2025 08:51:11 +0300 Subject: [PATCH 72/76] Revert "dont check" This reverts commit 9407917da864f6cdd93d1564bab5900b28ada7d2. --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeeafc4..194a032 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,23 +61,23 @@ jobs: # - name: Tailscale status # run: tailscale status || true - # - name: Check if Attic endpoint is reachable - # id: check_attic - # run: | - # if curl --connect-timeout 20 --silent --head https://cache.osbm.dev | grep "200 OK"; then - # echo "Attic endpoint is reachable" - # echo "reachable=true" >> $GITHUB_OUTPUT - # else - # echo "Attic endpoint is not reachable" - # echo "reachable=false" >> $GITHUB_OUTPUT - # fi + - name: Check if Attic endpoint is reachable + id: check_attic + run: | + if curl --connect-timeout 20 --silent --head https://cache.osbm.dev | grep "200 OK"; then + echo "Attic endpoint is reachable" + echo "reachable=true" >> $GITHUB_OUTPUT + else + echo "Attic endpoint is not reachable" + echo "reachable=false" >> $GITHUB_OUTPUT + fi - name: Curl the cache run: | curl --connect-timeout 20 --silent https://cache.osbm.dev/main/nix-cache-info || echo "Cache endpoint not reachable" - name: Setup Attic cache - # if: steps.check_attic.outputs.reachable == 'true' + if: steps.check_attic.outputs.reachable == 'true' uses: ryanccn/attic-action@v0.3.1 with: endpoint: https://cache.osbm.dev From 606edf47947fb303e5a5f815ffbb8e3ce74f5583 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 18 Sep 2025 08:51:16 +0300 Subject: [PATCH 73/76] Revert "a man can dream" This reverts commit ed33e038a72bbec33cadd171f2da897e77799860. --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- flake.nix | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 194a032..c8e831c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,15 +28,15 @@ jobs: with: system: ${{ matrix.system }} - # - name: Login to tailscale - # uses: tailscale/github-action@v3.2.3 - # with: - # oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} - # oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} - # hostname: ${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' - # || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' - # || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} - # tags: tag:ci + - name: Login to tailscale + uses: tailscale/github-action@v3.2.3 + with: + oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }} + oauth-secret: ${{ secrets.TS_OAUTH_SECRET }} + hostname: ${{ matrix.system == 'x86_64-linux' && 'github-actions-x86-64-linux' + || matrix.system == 'aarch64-linux' && 'github-actions-aarch64-linux' + || matrix.system == 'x86_64-darwin' && 'github-actions-x86-64-darwin' }} + tags: tag:ci # - name: Install and start Tailscale # run: | @@ -58,13 +58,13 @@ jobs: # --advertise-tags="tag:ci" \ # --accept-routes - # - name: Tailscale status - # run: tailscale status || true + - name: Tailscale status + run: tailscale status || true - name: Check if Attic endpoint is reachable id: check_attic run: | - if curl --connect-timeout 20 --silent --head https://cache.osbm.dev | grep "200 OK"; then + if curl --connect-timeout 20 --silent --head http://wallfacer.curl-boga.ts.net:7080 | grep "200 OK"; then echo "Attic endpoint is reachable" echo "reachable=true" >> $GITHUB_OUTPUT else @@ -74,13 +74,13 @@ jobs: - name: Curl the cache run: | - curl --connect-timeout 20 --silent https://cache.osbm.dev/main/nix-cache-info || echo "Cache endpoint not reachable" + curl --connect-timeout 20 --silent http://wallfacer.curl-boga.ts.net:7080/main/nix-cache-info || echo "Cache endpoint not reachable" - name: Setup Attic cache if: steps.check_attic.outputs.reachable == 'true' uses: ryanccn/attic-action@v0.3.1 with: - endpoint: https://cache.osbm.dev + endpoint: http://wallfacer.curl-boga.ts.net:7080 cache: main token: ${{ secrets.ATTIC_TOKEN }} diff --git a/flake.nix b/flake.nix index cf3b069..03dac0a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "https://cache.osbm.dev/main" + "http://wallfacer.curl-boga.ts.net:7080/main" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" From 59e851205c128469fd7ee5268ab1a9e9691ee35e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 09:47:43 +0300 Subject: [PATCH 74/76] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9515075..3a507ec 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755829505, - "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", + "lastModified": 1758446476, + "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757145319, - "narHash": "sha256-F5islzaJ5zGXomXAGM7Kqi5skyGaNXOLD77atgmReZw=", + "lastModified": 1758665797, + "narHash": "sha256-RIN05AhWIFCXL2OOXGoFdF/k8Q6OBhi/WcRtsYuTF5Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "a04b93fa7bf4160a9dc60d0713fff44c0fff9af6", + "rev": "0c15f88f1fc01c8799c5ce2a432fadc47f20e307", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1755555503, - "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", + "lastModified": 1758272005, + "narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=", "owner": "NuschtOS", "repo": "search", - "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", + "rev": "aa975a3757f28ce862812466c5848787b868e116", "type": "github" }, "original": { From 8efd247c60207bde38a29d6bebb60102aeb9ce17 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 09:47:54 +0300 Subject: [PATCH 75/76] dont use my unstable cache for now --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index 03dac0a..ab0b46c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,9 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "http://wallfacer.curl-boga.ts.net:7080/main" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" ]; }; From 8f08a58beafbcb94ddd6fb2d24975dd736e236d0 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 23:59:27 +0300 Subject: [PATCH 76/76] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3a507ec..a386e99 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "lastModified": 1761656231, + "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1758665797, - "narHash": "sha256-RIN05AhWIFCXL2OOXGoFdF/k8Q6OBhi/WcRtsYuTF5Q=", + "lastModified": 1761744315, + "narHash": "sha256-OknzyEoI+VEYgk/FWMyx3tvjb/MPPyqS+G/aemDz51w=", "owner": "nix-community", "repo": "nixvim", - "rev": "0c15f88f1fc01c8799c5ce2a432fadc47f20e307", + "rev": "6233fc6b2c3f203d8a5970f4a2c1df5777902717", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1758272005, - "narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=", + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "owner": "NuschtOS", "repo": "search", - "rev": "aa975a3757f28ce862812466c5848787b868e116", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "type": "github" }, "original": {