From c8383eac8d0e08539fd0204f406c77efe6e1cdaa Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 01:37:21 +0300 Subject: [PATCH 001/219] initial commit --- README.md | 17 ++++++++++++++++ config/bufferline.nix | 6 ++++++ config/default.nix | 4 ++++ flake.nix | 47 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 README.md create mode 100644 config/bufferline.nix create mode 100644 config/default.nix create mode 100644 flake.nix diff --git a/README.md b/README.md new file mode 100644 index 0000000..bff36b7 --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +# Nixvim template + +This template gives you a good starting point for configuring nixvim standalone. + +## Configuring + +To start configuring, just add or modify the nix files in `./config`. +If you add a new configuration file, remember to add it to the +[`config/default.nix`](./config/default.nix) file + +## Testing your new configuration + +To test your configuration simply run the following command + +``` +nix run . +``` diff --git a/config/bufferline.nix b/config/bufferline.nix new file mode 100644 index 0000000..2dfee9e --- /dev/null +++ b/config/bufferline.nix @@ -0,0 +1,6 @@ +{ + plugins = { + bufferline.enable = true; + web-devicons.enable = true; + }; +} diff --git a/config/default.nix b/config/default.nix new file mode 100644 index 0000000..fb318ab --- /dev/null +++ b/config/default.nix @@ -0,0 +1,4 @@ +{ + # Import all your configuration modules here + imports = [ ./bufferline.nix ]; +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..dcb5ebe --- /dev/null +++ b/flake.nix @@ -0,0 +1,47 @@ +{ + description = "A nixvim configuration"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixvim.url = "github:nix-community/nixvim"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; + + outputs = + { nixvim, flake-parts, ... }@inputs: + flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + + perSystem = + { pkgs, system, ... }: + let + nixvimLib = nixvim.lib.${system}; + nixvim' = nixvim.legacyPackages.${system}; + nixvimModule = { + inherit pkgs; + module = import ./config; # import the module directly + # You can use `extraSpecialArgs` to pass additional arguments to your module files + extraSpecialArgs = { + # inherit (inputs) foo; + }; + }; + nvim = nixvim'.makeNixvimWithModule nixvimModule; + in + { + checks = { + # Run `nix flake check .` to verify that your config is not broken + default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule; + }; + + packages = { + # Lets you run `nix run .` to start nixvim + default = nvim; + }; + }; + }; +} From 3424f7d909d5b3997bc21c76101bee185d182119 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 01:38:49 +0300 Subject: [PATCH 002/219] add flake.loc --- flake.lock | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..55a52d9 --- /dev/null +++ b/flake.lock @@ -0,0 +1,356 @@ +{ + "nodes": { + "devshell": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1733935885, + "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks", + "home-manager": "home-manager", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_2", + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1734103614, + "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "owner": "NuschtOS", + "repo": "search", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "nixvim": "nixvim" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} From 950f27047d2d599534fe5311f7b34b39266a6d04 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 02:02:22 +0300 Subject: [PATCH 003/219] disable default plugins --- config/bufferline.nix | 4 ++-- flake.lock | 20 +++----------------- flake.nix | 5 ++++- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/config/bufferline.nix b/config/bufferline.nix index 2dfee9e..8473f6a 100644 --- a/config/bufferline.nix +++ b/config/bufferline.nix @@ -1,6 +1,6 @@ { plugins = { - bufferline.enable = true; - web-devicons.enable = true; + # bufferline.enable = true; + # web-devicons.enable = true; }; } diff --git a/flake.lock b/flake.lock index 55a52d9..a988c99 100644 --- a/flake.lock +++ b/flake.lock @@ -242,22 +242,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -266,7 +250,9 @@ "git-hooks": "git-hooks", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, diff --git a/flake.nix b/flake.nix index dcb5ebe..c6ac067 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - nixvim.url = "github:nix-community/nixvim"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-parts.url = "github:hercules-ci/flake-parts"; }; From b4eb1fed611151f2ed857134f04674ec094fb3ae Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 02:30:55 +0300 Subject: [PATCH 004/219] more basic setup --- config/bufferline.nix | 6 --- config/default.nix | 9 +++- config/plugins/default.nix | 3 ++ flake.lock | 96 ++++++++++++++++++++++++-------------- flake.nix | 83 +++++++++++++++++++------------- 5 files changed, 121 insertions(+), 76 deletions(-) delete mode 100644 config/bufferline.nix create mode 100644 config/plugins/default.nix diff --git a/config/bufferline.nix b/config/bufferline.nix deleted file mode 100644 index 8473f6a..0000000 --- a/config/bufferline.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - plugins = { - # bufferline.enable = true; - # web-devicons.enable = true; - }; -} diff --git a/config/default.nix b/config/default.nix index fb318ab..a92b6dd 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,4 +1,9 @@ { - # Import all your configuration modules here - imports = [ ./bufferline.nix ]; + options = { + # Enable relative line numbers + number = true; + relativenumber = true; + + + }; } diff --git a/config/plugins/default.nix b/config/plugins/default.nix new file mode 100644 index 0000000..0e0dcd2 --- /dev/null +++ b/config/plugins/default.nix @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/flake.lock b/flake.lock index a988c99..9fd605b 100644 --- a/flake.lock +++ b/flake.lock @@ -36,24 +36,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -214,39 +196,49 @@ "type": "github" } }, - "nixpkgs": { + "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt" + }, "locked": { - "lastModified": 1733935885, - "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "lastModified": 1729445390, + "narHash": "sha256-TxJ7RZLlBkKWZos1ai3eWIH0fBq1G6SVE+q3dW+0qRU=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "9f4bcf647cad2edafda7e1143071e0daf37cbc41", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", "type": "github" } }, - "nixpkgs-lib": { + "nixpkgs": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixvim": { "inputs": { "devshell": "devshell", "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": "home-manager", "nix-darwin": "nix-darwin", @@ -270,6 +262,38 @@ "type": "github" } }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", + "repo": "nmd", + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", @@ -295,7 +319,7 @@ }, "root": { "inputs": { - "flake-parts": "flake-parts", + "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": "nixpkgs", "nixvim": "nixvim" } diff --git a/flake.nix b/flake.nix index c6ac067..6cf00b2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,50 +1,69 @@ { - description = "A nixvim configuration"; + description = "NixVim config heavily inspired by AstroNvim"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + # Nix formatting pack + # https://gerschtli.github.io/nix-formatter-pack/nix-formatter-pack-options.html + nix-formatter-pack = { + url = "github:Gerschtli/nix-formatter-pack"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; - flake-parts.url = "github:hercules-ci/flake-parts"; }; outputs = - { nixvim, flake-parts, ... }@inputs: - flake-parts.lib.mkFlake { inherit inputs; } { - systems = [ - "x86_64-linux" + { nixpkgs + , nixvim + , nix-formatter-pack + , ... + }: + let + forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" - "x86_64-darwin" + "i686-linux" + "x86_64-linux" "aarch64-darwin" + "x86_64-darwin" ]; + in + { + formatter = forAllSystems (system: + nix-formatter-pack.lib.mkFormatter { + pkgs = nixpkgs.legacyPackages.${system}; - perSystem = - { pkgs, system, ... }: - let - nixvimLib = nixvim.lib.${system}; - nixvim' = nixvim.legacyPackages.${system}; - nixvimModule = { - inherit pkgs; - module = import ./config; # import the module directly - # You can use `extraSpecialArgs` to pass additional arguments to your module files - extraSpecialArgs = { - # inherit (inputs) foo; - }; + config.tools = { + deadnix.enable = true; + nixpkgs-fmt.enable = true; + statix.enable = true; }; - nvim = nixvim'.makeNixvimWithModule nixvimModule; + } + ); + + packages = forAllSystems (system: + let + pkgs = import nixpkgs { inherit system; }; + mkNixvim = specialArgs: + nixvim.legacyPackages.${system}.makeNixvimWithModule { + inherit pkgs; + + module = ./config; + + extraSpecialArgs = specialArgs // { + inherit pkgs; + + }; + }; in { - checks = { - # Run `nix flake check .` to verify that your config is not broken - default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule; - }; - - packages = { - # Lets you run `nix run .` to start nixvim - default = nvim; - }; - }; + default = mkNixvim { }; + lite = mkNixvim { withLSP = false; }; + } + ); }; -} +} \ No newline at end of file From 7534af33d6fc830cc9cdb3439326cbd48de8260e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 02:32:37 +0300 Subject: [PATCH 005/219] formatting --- config/plugins/default.nix | 4 +--- flake.nix | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/plugins/default.nix b/config/plugins/default.nix index 0e0dcd2..ffcd441 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -1,3 +1 @@ -{ - -} \ No newline at end of file +{ } diff --git a/flake.nix b/flake.nix index 6cf00b2..71c5291 100644 --- a/flake.nix +++ b/flake.nix @@ -66,4 +66,4 @@ } ); }; -} \ No newline at end of file +} From c363306635b7010d33339fda447d1202194b09ab Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 03:21:29 +0300 Subject: [PATCH 006/219] try this for now --- config/colorscheme.nix | 14 ++++++++++++++ config/default.nix | 19 ++++++++++++------- config/options.nix | 7 +++++++ default.nix | 26 ++++++++++++++++++++++++++ flake.nix | 2 +- 5 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 config/colorscheme.nix create mode 100644 config/options.nix create mode 100644 default.nix diff --git a/config/colorscheme.nix b/config/colorscheme.nix new file mode 100644 index 0000000..6b7cfed --- /dev/null +++ b/config/colorscheme.nix @@ -0,0 +1,14 @@ +{ + colorschemes = { + catppuccin = { + enable = true; + + settings = { + flavour = "mocha"; + + # Needed to keep terminal transparency, if any + transparent_background = false; + }; + }; + }; +} \ No newline at end of file diff --git a/config/default.nix b/config/default.nix index a92b6dd..1cfc556 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,9 +1,14 @@ -{ - options = { - # Enable relative line numbers - number = true; - relativenumber = true; +{ 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) \ No newline at end of file diff --git a/config/options.nix b/config/options.nix new file mode 100644 index 0000000..a4d8931 --- /dev/null +++ b/config/options.nix @@ -0,0 +1,7 @@ +{ + opts = { + # Enable relative line numbers + number = true; + relativenumber = true; + }; +} \ No newline at end of file diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..b916268 --- /dev/null +++ b/default.nix @@ -0,0 +1,26 @@ +_: + +{ + imports = [ + ./config + # ./plugins + ]; + + config = { + # Use as leader key + # globals.mapleader = " "; + + # 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"; + }; + }; +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index 71c5291..3a956f0 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ nixvim.legacyPackages.${system}.makeNixvimWithModule { inherit pkgs; - module = ./config; + module = ./.; extraSpecialArgs = specialArgs // { inherit pkgs; From bea0d00a8594fc1650f70bb3c7d8c784559865c2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 03:24:46 +0300 Subject: [PATCH 007/219] add plugins --- config/colorscheme.nix | 11 +---------- config/plugins/default.nix | 1 - default.nix | 2 +- plugins/default.nix | 5 +++++ 4 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 config/plugins/default.nix create mode 100644 plugins/default.nix diff --git a/config/colorscheme.nix b/config/colorscheme.nix index 6b7cfed..c5b10d7 100644 --- a/config/colorscheme.nix +++ b/config/colorscheme.nix @@ -1,14 +1,5 @@ { colorschemes = { - catppuccin = { - enable = true; - - settings = { - flavour = "mocha"; - - # Needed to keep terminal transparency, if any - transparent_background = false; - }; - }; + gruvbox.enable = true; }; } \ No newline at end of file diff --git a/config/plugins/default.nix b/config/plugins/default.nix deleted file mode 100644 index ffcd441..0000000 --- a/config/plugins/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ } diff --git a/default.nix b/default.nix index b916268..bf91e9c 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,7 @@ _: { imports = [ ./config - # ./plugins + ./plugins ]; config = { diff --git a/plugins/default.nix b/plugins/default.nix new file mode 100644 index 0000000..3fdb7d1 --- /dev/null +++ b/plugins/default.nix @@ -0,0 +1,5 @@ +{ + plugins = { + treesitter.enable = true; + } +} From a68e502b67ee48b8410890819906a53b5e16af89 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 12:42:49 +0300 Subject: [PATCH 008/219] add commented lines --- plugins/default.nix | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index 3fdb7d1..f960c16 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,5 +1,29 @@ { plugins = { treesitter.enable = true; - } + + # yazi = { + # enable = true; + # lazyLoad = { + # settings = { + # cmd = ["Yazi"]; + # }; + # }; + # }; + # mini = { + # enable = true; + # modules = { + # starter = { + # header = '' + # ██╗ ██╗██╗ ██╗ █████╗ ███╗ ██╗███████╗██╗ ██╗███╗ ██╗██╗██╗ ██╗ + # ██║ ██╔╝██║ ██║██╔══██╗████╗ ██║██╔════╝██║ ██║████╗ ██║██║╚██╗██╔╝ + # █████╔╝ ███████║███████║██╔██╗ ██║█████╗ ██║ ██║██╔██╗ ██║██║ ╚███╔╝ + # ██╔═██╗ ██╔══██║██╔══██║██║╚██╗██║██╔══╝ ██║ ██║██║╚██╗██║██║ ██╔██╗ + # ██║ ██╗██║ ██║██║ ██║██║ ╚████║███████╗███████╗██║██║ ╚████║██║██╔╝ ██╗ + # ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝╚══════╝╚═╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ + # ''; + # }; + # }; + # }; + # }; } From 1ef6ff4c64ff32cf46783ebfd435acbfd7fadb40 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 12:43:55 +0300 Subject: [PATCH 009/219] my bad --- plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index f960c16..7f24c8a 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -25,5 +25,5 @@ # }; # }; # }; - # }; + }; } From f62258d9b712e84a1f1ce8dfb523a2d06abc6610 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Dec 2024 01:11:14 +0300 Subject: [PATCH 010/219] add gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2f5dd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result \ No newline at end of file From 5af22b80e039b17c41b29329fa806c64d7ae0f2c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 11:52:11 +0300 Subject: [PATCH 011/219] show tabs and trailing spaces and whatnot --- config/options.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/options.nix b/config/options.nix index a4d8931..53338b3 100644 --- a/config/options.nix +++ b/config/options.nix @@ -3,5 +3,9 @@ # Enable relative line numbers number = true; relativenumber = true; + + # show spaces tabs and trailing spaces + list = true; + listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; }; -} \ No newline at end of file +} From 19573ffd64bfde1ae18c6ca8ac460e5efeb144cc Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 18 Dec 2024 14:06:41 +0300 Subject: [PATCH 012/219] formatting --- config/colorscheme.nix | 2 +- config/default.nix | 3 +-- config/options.nix | 16 ++++++++-------- default.nix | 4 ++-- plugins/default.nix | 6 +++--- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/config/colorscheme.nix b/config/colorscheme.nix index c5b10d7..4c8771f 100644 --- a/config/colorscheme.nix +++ b/config/colorscheme.nix @@ -2,4 +2,4 @@ colorschemes = { gruvbox.enable = true; }; -} \ No newline at end of file +} diff --git a/config/default.nix b/config/default.nix index 1cfc556..a19604a 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,4 +1,3 @@ - { lib, ... }: let @@ -11,4 +10,4 @@ let (builtins.readDir ./.) ); in -lib.mkMerge (map (file: import ./${file}) definitions) \ No newline at end of file +lib.mkMerge (map (file: import ./${file}) definitions) diff --git a/config/options.nix b/config/options.nix index 53338b3..eb1a996 100644 --- a/config/options.nix +++ b/config/options.nix @@ -1,11 +1,11 @@ { - opts = { - # Enable relative line numbers - number = true; - relativenumber = true; + opts = { + # Enable relative line numbers + number = true; + relativenumber = true; - # show spaces tabs and trailing spaces - list = true; - listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; - }; + # show spaces tabs and trailing spaces + list = true; + listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; + }; } diff --git a/default.nix b/default.nix index bf91e9c..e40d1b9 100644 --- a/default.nix +++ b/default.nix @@ -17,10 +17,10 @@ _: # Setup clipboard support clipboard = { # Use xsel as clipboard provider - # providers.xsel.enable = true; + # providers.xsel.enable = true; # Sync system clipboard register = "unnamedplus"; }; }; -} \ No newline at end of file +} diff --git a/plugins/default.nix b/plugins/default.nix index 7f24c8a..c946797 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,6 +1,6 @@ { - plugins = { - treesitter.enable = true; + plugins = { + treesitter.enable = true; # yazi = { # enable = true; @@ -25,5 +25,5 @@ # }; # }; # }; - }; + }; } From a348380e642a711f52fa92625132570c9cc30fbb Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 18 Dec 2024 16:42:22 +0300 Subject: [PATCH 013/219] update flake lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9fd605b..21d1b44 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734103614, - "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=", + "lastModified": 1734472356, + "narHash": "sha256-RIoG3zXarfuHfzM/z/NPjoHHxl3sqYrtEatSLA1/bIk=", "owner": "nix-community", "repo": "nixvim", - "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3", + "rev": "4f1fe403b18c45614d6b81423038a34cff371244", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -347,11 +347,11 @@ ] }, "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { From 5b4e49be0feef884e281de8e946957aa7902833c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 18 Dec 2024 21:48:35 +0300 Subject: [PATCH 014/219] start using some plugins --- plugins/default.nix | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/plugins/default.nix b/plugins/default.nix index c946797..a50312e 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,29 +1,26 @@ { plugins = { - treesitter.enable = true; + treesitter = { + enable = true; + # folding = true; # i dont like the way it starts neovim with everything folded + }; + + mini = { + enable = true; + modules = { + starter = { + header = '' + _ _ + ___ ___| |__ _ __ ___ __| | _____ __ + / _ \/ __| '_ \| '_ ` _ \ / _` |/ _ \ \ / / + | (_) \__ \ |_) | | | | | || (_| | __/\ V / + \___/|___/_.__/|_| |_| |_(_)__,_|\___| \_/ + + ''; + }; + }; + }; + - # yazi = { - # enable = true; - # lazyLoad = { - # settings = { - # cmd = ["Yazi"]; - # }; - # }; - # }; - # mini = { - # enable = true; - # modules = { - # starter = { - # header = '' - # ██╗ ██╗██╗ ██╗ █████╗ ███╗ ██╗███████╗██╗ ██╗███╗ ██╗██╗██╗ ██╗ - # ██║ ██╔╝██║ ██║██╔══██╗████╗ ██║██╔════╝██║ ██║████╗ ██║██║╚██╗██╔╝ - # █████╔╝ ███████║███████║██╔██╗ ██║█████╗ ██║ ██║██╔██╗ ██║██║ ╚███╔╝ - # ██╔═██╗ ██╔══██║██╔══██║██║╚██╗██║██╔══╝ ██║ ██║██║╚██╗██║██║ ██╔██╗ - # ██║ ██╗██║ ██║██║ ██║██║ ╚████║███████╗███████╗██║██║ ╚████║██║██╔╝ ██╗ - # ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═══╝╚══════╝╚══════╝╚═╝╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ - # ''; - # }; - # }; - # }; }; } From c91dc96ba1691e3fcc54cca05cf9902a00c80f45 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 18 Dec 2024 21:48:54 +0300 Subject: [PATCH 015/219] change the descriptioon --- config/options.nix | 10 ++++++++++ flake.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/options.nix b/config/options.nix index eb1a996..d399e6a 100644 --- a/config/options.nix +++ b/config/options.nix @@ -7,5 +7,15 @@ # show spaces tabs and trailing spaces list = true; listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; + + # when i press tab i want to see spaces + expandtab = true; + tabstop = 4; # Number of spaces that a in the file counts for. + shiftwidth = 4; # how many spaces are added in an indent + softtabstop = 4; # how many spaces are added when pressing tab + smarttab = true; # When on, a in front of a line inserts blanks according to 'shiftwidth'. 'tabstop' or 'softtabstop' is used in other places. + # 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? + }; } diff --git a/flake.nix b/flake.nix index 3a956f0..3b30d51 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "NixVim config heavily inspired by AstroNvim"; + description = "My custom neovim configuration that has been mixed and matched from various sources"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; From aaacead00338b04afb8dfc612639ead77bb66c00 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 20 Dec 2024 19:17:03 +0300 Subject: [PATCH 016/219] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 21d1b44..cce3b97 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1734279981, - "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", + "lastModified": 1734425854, + "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", + "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734472356, - "narHash": "sha256-RIoG3zXarfuHfzM/z/NPjoHHxl3sqYrtEatSLA1/bIk=", + "lastModified": 1734688442, + "narHash": "sha256-MjaMAeZH9t09LEQMK559/PMouXxuWcMHXb/Em2Vb9dw=", "owner": "nix-community", "repo": "nixvim", - "rev": "4f1fe403b18c45614d6b81423038a34cff371244", + "rev": "f3ef2721abf6e7f4f9ab8346cb1efebb0ecb9769", "type": "github" }, "original": { From 2d21be4c8264dab7ddab1f3205bfdab7d43407ff Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Dec 2024 13:11:43 +0300 Subject: [PATCH 017/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cce3b97..d7c9dee 100644 --- a/flake.lock +++ b/flake.lock @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734688442, - "narHash": "sha256-MjaMAeZH9t09LEQMK559/PMouXxuWcMHXb/Em2Vb9dw=", + "lastModified": 1734749627, + "narHash": "sha256-5HLarzO44i6tUBIr+DRMeAHJP3p84Z1b9wuElv85O1U=", "owner": "nix-community", "repo": "nixvim", - "rev": "f3ef2721abf6e7f4f9ab8346cb1efebb0ecb9769", + "rev": "9f32e25f3f2b029b76e79ef7c1f48cd3596938d8", "type": "github" }, "original": { From ab0211cb0712c71325de2f3dc6cc35a1c16c6954 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Dec 2024 13:14:52 +0300 Subject: [PATCH 018/219] add workflow --- .github/workflows/nix.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/nix.yml diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml new file mode 100644 index 0000000..83ca975 --- /dev/null +++ b/.github/workflows/nix.yml @@ -0,0 +1,31 @@ +name: Nix + +on: + push: + pull_request: +jobs: + build: + strategy: + matrix: + target-system: + - ymir + - tartarus + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v16 + # TODO: add a binary cache + # - uses: cachix/cachix-action@v10 + # with: + # name: YOURCACHE + # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - run: nix flake check --accept-flake-config + # Pre-build the system configuration + - run: nix build --accept-flake-config . + check-formatting: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v16 + - run: nix shell nixpkgs#alejandra -c alejandra -c . + From d901c300347cca918875d27a566756cf57ad9c69 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Dec 2024 13:15:57 +0300 Subject: [PATCH 019/219] remove strategy --- .github/workflows/nix.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 83ca975..d2e969d 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -5,11 +5,6 @@ on: pull_request: jobs: build: - strategy: - matrix: - target-system: - - ymir - - tartarus runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2 From 4e3bbe5583f9e61d33601236823c7599a51b8fca Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Dec 2024 13:22:37 +0300 Subject: [PATCH 020/219] add names to steps --- .github/workflows/nix.yml | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index d2e969d..5eceb94 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -7,20 +7,39 @@ jobs: build: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v16 + - name: Checkout the repository + uses: actions/checkout@v2 + + - name: Install nix + uses: cachix/install-nix-action@v16 + + # TODO: add a binary cache # - uses: cachix/cachix-action@v10 # with: # name: YOURCACHE # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix flake check --accept-flake-config - # Pre-build the system configuration - - run: nix build --accept-flake-config . + + + - name: Check the flake + run: nix flake check --accept-flake-config + + + - name: Pre-build the system configuration + run: nix build --accept-flake-config . + + - name: Print out the size of /nix/store + run: du -sh /nix/store + check-formatting: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v16 - - run: nix shell nixpkgs#alejandra -c alejandra -c . + - name: Checkout the repository + uses: actions/checkout@v2 + + - name: Install nix + uses: cachix/install-nix-action@v16 + + - name: Check formatting (dont update) + run: nix shell nixpkgs#alejandra -c alejandra -c . From 0bbb0c8a9e89be4c0a04d8461ca118c4730bb00a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Dec 2024 16:34:39 +0300 Subject: [PATCH 021/219] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d7c9dee..2c84ef0 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1734425854, - "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1729445390, - "narHash": "sha256-TxJ7RZLlBkKWZos1ai3eWIH0fBq1G6SVE+q3dW+0qRU=", + "lastModified": 1734904675, + "narHash": "sha256-MoYUUxiLcNwC9woNLoCfXfzcCAHE310DqDcJd/GjM98=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "9f4bcf647cad2edafda7e1143071e0daf37cbc41", + "rev": "19e8cb01a078fea1e6cf824097978c41af74e24b", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734749627, - "narHash": "sha256-5HLarzO44i6tUBIr+DRMeAHJP3p84Z1b9wuElv85O1U=", + "lastModified": 1734956286, + "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", "owner": "nix-community", "repo": "nixvim", - "rev": "9f32e25f3f2b029b76e79ef7c1f48cd3596938d8", + "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", "type": "github" }, "original": { @@ -347,11 +347,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { From 6c52e01c1b8b00ceb86fd5ad96fe75a2d9d36836 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 25 Dec 2024 17:07:44 +0300 Subject: [PATCH 022/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2c84ef0..e04b9b7 100644 --- a/flake.lock +++ b/flake.lock @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734956286, - "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", + "lastModified": 1735124172, + "narHash": "sha256-2X2yCslRVWAmD/2IuiGGRJxEX+CMM7uuI81VZz+WJMU=", "owner": "nix-community", "repo": "nixvim", - "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", + "rev": "ca3c7e29a857084c4b311aa714b88ab789760fe0", "type": "github" }, "original": { From 61eaa22caac9acf455b0a21d4d5f73adc23eebb5 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 26 Dec 2024 14:11:55 +0300 Subject: [PATCH 023/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e04b9b7..a479087 100644 --- a/flake.lock +++ b/flake.lock @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735124172, - "narHash": "sha256-2X2yCslRVWAmD/2IuiGGRJxEX+CMM7uuI81VZz+WJMU=", + "lastModified": 1735169833, + "narHash": "sha256-Wu201kM5vgOUhhwkKuYSZmmTMflgBybqeEIzIH4MRY4=", "owner": "nix-community", "repo": "nixvim", - "rev": "ca3c7e29a857084c4b311aa714b88ab789760fe0", + "rev": "25c13524642cb7fe98583a5dd5f90992c76198b9", "type": "github" }, "original": { From 8070b91694af42c6ba912665901c9fc5ea33744a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 28 Dec 2024 11:41:24 +0300 Subject: [PATCH 024/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a479087..593d753 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735169833, - "narHash": "sha256-Wu201kM5vgOUhhwkKuYSZmmTMflgBybqeEIzIH4MRY4=", + "lastModified": 1735343514, + "narHash": "sha256-CZGsEGSRN5PQnf3ciNFdlpCDorvyo6+YQ1cPQ1ebVxk=", "owner": "nix-community", "repo": "nixvim", - "rev": "25c13524642cb7fe98583a5dd5f90992c76198b9", + "rev": "0307cdf297cd6bdafd55a66d69c54b55c482edf8", "type": "github" }, "original": { From 6114c88ef3619157f09a6c96f6ec09b0e3f48dd8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 16:17:55 +0300 Subject: [PATCH 025/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 593d753..bc587f2 100644 --- a/flake.lock +++ b/flake.lock @@ -249,11 +249,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735343514, - "narHash": "sha256-CZGsEGSRN5PQnf3ciNFdlpCDorvyo6+YQ1cPQ1ebVxk=", + "lastModified": 1735378670, + "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", "owner": "nix-community", "repo": "nixvim", - "rev": "0307cdf297cd6bdafd55a66d69c54b55c482edf8", + "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", "type": "github" }, "original": { From 791cb4b6e099be3924b7e04c62091137e82a7a7f Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 4 Jan 2025 17:59:38 +0300 Subject: [PATCH 026/219] update flake.lock and disable nixvim dependency --- flake.lock | 78 ++++++++++++++++++++++++++++++------------------------ flake.nix | 5 +--- 2 files changed, 45 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index bc587f2..08c05c9 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -84,18 +84,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -134,11 +130,11 @@ ] }, "locked": { - "lastModified": 1734862405, - "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", + "lastModified": 1735979091, + "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", "type": "github" }, "original": { @@ -183,11 +179,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1735956190, + "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", "type": "github" }, "original": { @@ -220,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -234,6 +230,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -242,18 +254,16 @@ "git-hooks": "git-hooks", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735378670, - "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", + "lastModified": 1735980252, + "narHash": "sha256-aVFpRYFmLP6jECp9SwsoJkSBTOSOJKYOjHgsR0RcbCQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", + "rev": "9fec10597383c024a2a1a8b71fb58d6b1f30ebb9", "type": "github" }, "original": { @@ -304,11 +314,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -347,11 +357,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3b30d51..179a1d4 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixvim.url = "github:nix-community/nixvim"; }; outputs = From 0914453481cdafe08495976625f923c6edf3762c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 07:53:25 +0300 Subject: [PATCH 027/219] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 08c05c9..a43e272 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1735979091, - "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1735956190, - "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735980252, - "narHash": "sha256-aVFpRYFmLP6jECp9SwsoJkSBTOSOJKYOjHgsR0RcbCQ=", + "lastModified": 1736292108, + "narHash": "sha256-0mGe0okcNDKp0A9lS/birSP0Z5oheqgrXzQeolHM9U8=", "owner": "nix-community", "repo": "nixvim", - "rev": "9fec10597383c024a2a1a8b71fb58d6b1f30ebb9", + "rev": "0ebc64a2328fc0a0532f9544eb6c6e297135962e", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1736115332, + "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", "type": "github" }, "original": { From ca1959e41e2b16d8693950bf1bcfb3d35377a500 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 9 Jan 2025 16:20:14 +0300 Subject: [PATCH 028/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a43e272..3536ce2 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736292108, - "narHash": "sha256-0mGe0okcNDKp0A9lS/birSP0Z5oheqgrXzQeolHM9U8=", + "lastModified": 1736374433, + "narHash": "sha256-oziJ5klXSS/wTJaoyL6oSYmRGpRFCYpJhq8Jl6q6NRU=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ebc64a2328fc0a0532f9544eb6c6e297135962e", + "rev": "83153e96c25d989020d028af51cf947aa843dc3c", "type": "github" }, "original": { From 8dc1f974d3582030a427ea7c5d1b6725766cf21e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 12 Jan 2025 20:13:15 +0300 Subject: [PATCH 029/219] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 3536ce2..b79540b 100644 --- a/flake.lock +++ b/flake.lock @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1736085891, - "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736374433, - "narHash": "sha256-oziJ5klXSS/wTJaoyL6oSYmRGpRFCYpJhq8Jl6q6NRU=", + "lastModified": 1736598781, + "narHash": "sha256-Y0o9ahm6Kk0DumTo80/vKspkHOkbtFgKCNiICyRjhMs=", "owner": "nix-community", "repo": "nixvim", - "rev": "83153e96c25d989020d028af51cf947aa843dc3c", + "rev": "2fc2132a78753fc3d7ec732044eff7ad69530055", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1736115332, - "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { From fdedca413f7f682a6d3f97c61cc5b47afe398765 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Jan 2025 16:24:55 +0300 Subject: [PATCH 030/219] add new LSPs --- plugins/default.nix | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/plugins/default.nix b/plugins/default.nix index a50312e..3c9f580 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,3 +1,5 @@ +{ self, lib, pkgs, ... }: + { plugins = { treesitter = { @@ -21,6 +23,80 @@ }; }; + lsp = { + servers = { + nixd = { + enable = true; + settings = + let + flake = ''(builtins.getFlake "${self}")''; + in + { + nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; + formatting = { + command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; + }; + }; + }; + typos_lsp = { + enable = true; + extraOptions = { + init_options = { + diagnosticSeverity = "Hint"; + }; + }; + }; + pylsp = { + enable = true; + settings = { + configurationSources = ["flake8"]; + plugins = { + pycodestyle = { + enabled = true; + maxLineLength = 120; + }; + flake8 = { + enabled = true; + maxLineLength = 120; + }; + }; + }; + }; + astro = { + enable = true; + }; + arduino_language_server = { + enable = true; + }; + bashls= { + enable = true; + }; + clangd = { + enable = true; + }; + dartls = { + enable = true; + }; + lua_ls = { + enable = true; + }; + mdx_analyzer = { + enable = true; + }; + fish_lsp = { + enable = true; + }; + docker_compose_language_service = { + enable = true; + }; + dockerls = { + enable = true; + }; + marksman = { + enable = true; + }; + }; + }; }; } From 51696e8089884bf66d3706c4becad1da630ff743 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Feb 2025 14:10:25 +0300 Subject: [PATCH 031/219] update flake.lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index b79540b..573cbf5 100644 --- a/flake.lock +++ b/flake.lock @@ -23,12 +23,12 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1738753876, + "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { @@ -232,16 +232,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1738734093, + "narHash": "sha256-UEYOKfXXKU49fR7dGB05As0s2pGbLK4xDo48Qtdm7xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "5b2753b0356d1c951d7a3ef1d086ba5a71fff43c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736598781, - "narHash": "sha256-Y0o9ahm6Kk0DumTo80/vKspkHOkbtFgKCNiICyRjhMs=", + "lastModified": 1738807015, + "narHash": "sha256-cITxk7u1n+if4Lyd5dGmPVZF8usHWuUspGOv65L3FXs=", "owner": "nix-community", "repo": "nixvim", - "rev": "2fc2132a78753fc3d7ec732044eff7ad69530055", + "rev": "2ecc5359f804bc98901dee0c95999ac3fa308388", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { From 7879616d77892e5a1de767783883f4ec04b26e77 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Feb 2025 15:55:40 +0300 Subject: [PATCH 032/219] enable todo-comments --- plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/default.nix b/plugins/default.nix index 3c9f580..ee0b4de 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -23,6 +23,9 @@ }; }; + todo-comments.enable = true; + + lsp = { servers = { nixd = { From b6b29f3a1a15ccf71ef7b974d75f11c78504ec59 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Feb 2025 16:11:59 +0300 Subject: [PATCH 033/219] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 573cbf5..91463c8 100644 --- a/flake.lock +++ b/flake.lock @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1738753876, - "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1738961098, + "narHash": "sha256-yWNBf6VDW38tl179FEuJ0qukthVfB02kv+mRsfUsWC0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a3eaf5e8eca7cab680b964138fb79073704aca75", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738734093, - "narHash": "sha256-UEYOKfXXKU49fR7dGB05As0s2pGbLK4xDo48Qtdm7xs=", + "lastModified": 1738797219, + "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b2753b0356d1c951d7a3ef1d086ba5a71fff43c", + "rev": "1da52dd49a127ad74486b135898da2cef8c62665", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738807015, - "narHash": "sha256-cITxk7u1n+if4Lyd5dGmPVZF8usHWuUspGOv65L3FXs=", + "lastModified": 1738966895, + "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", "owner": "nix-community", "repo": "nixvim", - "rev": "2ecc5359f804bc98901dee0c95999ac3fa308388", + "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", "type": "github" }, "original": { From 1d1a1e95b63ae1471574276ec13cf1e37104de4e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Feb 2025 16:53:35 +0300 Subject: [PATCH 034/219] update formatting --- config/colorscheme.nix | 6 +--- config/default.nix | 14 +++------ config/options.nix | 3 +- default.nix | 5 +--- flake.nix | 24 +++++---------- plugins/default.nix | 68 ++++++++++++------------------------------ 6 files changed, 35 insertions(+), 85 deletions(-) diff --git a/config/colorscheme.nix b/config/colorscheme.nix index 4c8771f..0ae6765 100644 --- a/config/colorscheme.nix +++ b/config/colorscheme.nix @@ -1,5 +1 @@ -{ - colorschemes = { - gruvbox.enable = true; - }; -} +{ colorschemes = { gruvbox.enable = true; }; } diff --git a/config/default.nix b/config/default.nix index a19604a..7890c95 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,13 +1,7 @@ { 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) + definitions = lib.attrNames (lib.filterAttrs (filename: kind: + filename != "default.nix" && (kind == "regular" || kind == "directory")) + (builtins.readDir ./.)); +in lib.mkMerge (map (file: import ./${file}) definitions) diff --git a/config/options.nix b/config/options.nix index d399e6a..be7d9d1 100644 --- a/config/options.nix +++ b/config/options.nix @@ -13,7 +13,8 @@ tabstop = 4; # Number of spaces that a in the file counts for. shiftwidth = 4; # how many spaces are added in an indent softtabstop = 4; # how many spaces are added when pressing tab - smarttab = true; # When on, a in front of a line inserts blanks according to 'shiftwidth'. 'tabstop' or 'softtabstop' is used in other places. + smarttab = + true; # When on, a in front of a line inserts blanks according to 'shiftwidth'. 'tabstop' or 'softtabstop' is used in other places. # 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? diff --git a/default.nix b/default.nix index e40d1b9..316fc46 100644 --- a/default.nix +++ b/default.nix @@ -1,10 +1,7 @@ _: { - imports = [ - ./config - ./plugins - ]; + imports = [ ./config ./plugins ]; config = { # Use as leader key diff --git a/flake.nix b/flake.nix index 179a1d4..5c2d3ac 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,6 @@ { - description = "My custom neovim configuration that has been mixed and matched from various sources"; + description = + "My custom neovim configuration that has been mixed and matched from various sources"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -14,12 +15,7 @@ nixvim.url = "github:nix-community/nixvim"; }; - outputs = - { nixpkgs - , nixvim - , nix-formatter-pack - , ... - }: + outputs = { nixpkgs, nixvim, nix-formatter-pack, ... }: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" @@ -28,19 +24,17 @@ "aarch64-darwin" "x86_64-darwin" ]; - in - { + in { formatter = forAllSystems (system: nix-formatter-pack.lib.mkFormatter { pkgs = nixpkgs.legacyPackages.${system}; config.tools = { deadnix.enable = true; - nixpkgs-fmt.enable = true; + nixfmt.enable = true; statix.enable = true; }; - } - ); + }); packages = forAllSystems (system: let @@ -56,11 +50,9 @@ }; }; - in - { + in { default = mkNixvim { }; lite = mkNixvim { withLSP = false; }; - } - ); + }); }; } diff --git a/plugins/default.nix b/plugins/default.nix index ee0b4de..cd3e641 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -25,34 +25,26 @@ todo-comments.enable = true; - lsp = { servers = { nixd = { enable = true; - settings = - let - flake = ''(builtins.getFlake "${self}")''; - in - { - nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; - formatting = { - command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; - }; + settings = let flake = ''(builtins.getFlake "${self}")''; + in { + nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; + formatting = { + command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; }; + }; }; typos_lsp = { enable = true; - extraOptions = { - init_options = { - diagnosticSeverity = "Hint"; - }; - }; + extraOptions = { init_options = { diagnosticSeverity = "Hint"; }; }; }; pylsp = { enable = true; settings = { - configurationSources = ["flake8"]; + configurationSources = [ "flake8" ]; plugins = { pycodestyle = { enabled = true; @@ -66,39 +58,17 @@ }; }; - astro = { - enable = true; - }; - arduino_language_server = { - enable = true; - }; - bashls= { - enable = true; - }; - clangd = { - enable = true; - }; - dartls = { - enable = true; - }; - lua_ls = { - enable = true; - }; - mdx_analyzer = { - enable = true; - }; - fish_lsp = { - enable = true; - }; - docker_compose_language_service = { - enable = true; - }; - dockerls = { - enable = true; - }; - marksman = { - enable = true; - }; + astro = { enable = true; }; + arduino_language_server = { enable = true; }; + bashls = { enable = true; }; + clangd = { enable = true; }; + dartls = { enable = true; }; + lua_ls = { enable = true; }; + mdx_analyzer = { enable = true; }; + fish_lsp = { enable = true; }; + docker_compose_language_service = { enable = true; }; + dockerls = { enable = true; }; + marksman = { enable = true; }; }; }; }; From e2633c0e3c3e4624d1a419fb7e9de992a1fc8c55 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Feb 2025 16:13:43 +0300 Subject: [PATCH 035/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 91463c8..51c3103 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738961098, - "narHash": "sha256-yWNBf6VDW38tl179FEuJ0qukthVfB02kv+mRsfUsWC0=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3eaf5e8eca7cab680b964138fb79073704aca75", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738966895, - "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", + "lastModified": 1739121491, + "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", + "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", "type": "github" }, "original": { From d5efd47b9d61a19db6a855706ebd73afae7bf3c3 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Feb 2025 16:47:06 +0300 Subject: [PATCH 036/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 51c3103..41fe483 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739121491, - "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", + "lastModified": 1739353096, + "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", "owner": "nix-community", "repo": "nixvim", - "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", + "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", "type": "github" }, "original": { From a38608489079d4a876ea8774fb59ad5b9e53c803 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 15 Feb 2025 03:20:12 +0300 Subject: [PATCH 037/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 41fe483..cf06b7d 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739353096, - "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", + "lastModified": 1739527837, + "narHash": "sha256-dsb5iSthp5zCWhdV0aXPunFSCkS0pCvRXMMgTEFjzew=", "owner": "nix-community", "repo": "nixvim", - "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", + "rev": "a39e0a651657046f3b936d842147fa51523b6818", "type": "github" }, "original": { From 9ba62e343e7f9c8309fd011a235474b3ce125a9d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:34:33 +0300 Subject: [PATCH 038/219] seperate out mini --- plugins/default.nix | 39 +++++++++++++++++++++++---------------- plugins/mini.nix | 17 +++++++++++++++++ 2 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 plugins/mini.nix diff --git a/plugins/default.nix b/plugins/default.nix index cd3e641..a036186 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,28 +1,16 @@ { self, lib, pkgs, ... }: { + imports = [ + ./mini.nix + ]; + plugins = { treesitter = { enable = true; # folding = true; # i dont like the way it starts neovim with everything folded }; - mini = { - enable = true; - modules = { - starter = { - header = '' - _ _ - ___ ___| |__ _ __ ___ __| | _____ __ - / _ \/ __| '_ \| '_ ` _ \ / _` |/ _ \ \ / / - | (_) \__ \ |_) | | | | | || (_| | __/\ V / - \___/|___/_.__/|_| |_| |_(_)__,_|\___| \_/ - - ''; - }; - }; - }; - todo-comments.enable = true; lsp = { @@ -71,5 +59,24 @@ marksman = { enable = true; }; }; }; + + lualine = { + enable = true; + }; + + cmp = { + # TODO read what this does + # basically, it's a completion plugin + enable = true; + autoEnableSources = true; + }; + + oil.enable = true; # shell scripting + + #telescope + telescope = { + enable = true; + }; + web-devicons.enable = true; # be concious of this choice }; } diff --git a/plugins/mini.nix b/plugins/mini.nix new file mode 100644 index 0000000..455ad2b --- /dev/null +++ b/plugins/mini.nix @@ -0,0 +1,17 @@ +{ + plugins.mini = { + enable = true; + modules = { + starter = { + header = '' + _ _ + ___ ___| |__ _ __ ___ __| | _____ __ + / _ \/ __| '_ \| '_ ` _ \ / _` |/ _ \ \ / / + | (_) \__ \ |_) | | | | | || (_| | __/\ V / + \___/|___/_.__/|_| |_| |_(_)__,_|\___| \_/ + + ''; + }; + }; + }; +} \ No newline at end of file From c7deb01578dec435c0dbc3a9a50789fd96b03ebe Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:36:48 +0300 Subject: [PATCH 039/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cf06b7d..a450803 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739527837, - "narHash": "sha256-dsb5iSthp5zCWhdV0aXPunFSCkS0pCvRXMMgTEFjzew=", + "lastModified": 1739632145, + "narHash": "sha256-maNBjf9whO303r4+8ekfAZOrf3sHnw6DLiSph5xnXJw=", "owner": "nix-community", "repo": "nixvim", - "rev": "a39e0a651657046f3b936d842147fa51523b6818", + "rev": "b8c55873998948bf14a2b6cf30f9ad5ecdf79818", "type": "github" }, "original": { From 9d60e67d07c1f5fa81e1708a1ac38320a0a9cf6f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:42:03 +0300 Subject: [PATCH 040/219] formatting --- plugins/default.nix | 12 +++--------- plugins/mini.nix | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/plugins/default.nix b/plugins/default.nix index a036186..3cc758c 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,9 +1,7 @@ { self, lib, pkgs, ... }: { - imports = [ - ./mini.nix - ]; + imports = [ ./mini.nix ]; plugins = { treesitter = { @@ -60,9 +58,7 @@ }; }; - lualine = { - enable = true; - }; + lualine = { enable = true; }; cmp = { # TODO read what this does @@ -74,9 +70,7 @@ oil.enable = true; # shell scripting #telescope - telescope = { - enable = true; - }; + telescope = { enable = true; }; web-devicons.enable = true; # be concious of this choice }; } diff --git a/plugins/mini.nix b/plugins/mini.nix index 455ad2b..c1940e2 100644 --- a/plugins/mini.nix +++ b/plugins/mini.nix @@ -1,17 +1,17 @@ { plugins.mini = { - enable = true; - modules = { - starter = { - header = '' - _ _ - ___ ___| |__ _ __ ___ __| | _____ __ - / _ \/ __| '_ \| '_ ` _ \ / _` |/ _ \ \ / / - | (_) \__ \ |_) | | | | | || (_| | __/\ V / - \___/|___/_.__/|_| |_| |_(_)__,_|\___| \_/ + enable = true; + modules = { + starter = { + header = '' + _ _ + ___ ___| |__ _ __ ___ __| | _____ __ + / _ \/ __| '_ \| '_ ` _ \ / _` |/ _ \ \ / / + | (_) \__ \ |_) | | | | | || (_| | __/\ V / + \___/|___/_.__/|_| |_| |_(_)__,_|\___| \_/ - ''; - }; + ''; }; }; -} \ No newline at end of file + }; +} From 4d580248edabe065adab6c793e62b10d3c6fa469 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 14:16:39 +0300 Subject: [PATCH 041/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a450803..2f86db2 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739632145, - "narHash": "sha256-maNBjf9whO303r4+8ekfAZOrf3sHnw6DLiSph5xnXJw=", + "lastModified": 1739751913, + "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8c55873998948bf14a2b6cf30f9ad5ecdf79818", + "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", "type": "github" }, "original": { From bf8104af417170d1e11f9a59aaf7948381251f82 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 19:49:47 +0300 Subject: [PATCH 042/219] update flake.lock --- flake.lock | 166 +++-------------------------------------------------- 1 file changed, 7 insertions(+), 159 deletions(-) diff --git a/flake.lock b/flake.lock index 2f86db2..4856b28 100644 --- a/flake.lock +++ b/flake.lock @@ -1,40 +1,5 @@ { "nodes": { - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -74,75 +39,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -171,27 +67,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -216,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -248,22 +123,16 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager", - "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1739751913, - "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", + "lastModified": 1740413069, + "narHash": "sha256-DUentJypG+n1yuL60WBYM+SOfH4tFivKzuuJRQLCtF0=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", + "rev": "4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10", "type": "github" }, "original": { @@ -348,27 +217,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", From fe01f0d6507b6639e5faea730987baf53a485982 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 12:37:45 +0300 Subject: [PATCH 043/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4856b28..60fea44 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740413069, - "narHash": "sha256-DUentJypG+n1yuL60WBYM+SOfH4tFivKzuuJRQLCtF0=", + "lastModified": 1740432393, + "narHash": "sha256-uXlB7bTlrl0q2jryKMSRlU+GptkVJN7PTsqdKkaFg1M=", "owner": "nix-community", "repo": "nixvim", - "rev": "4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10", + "rev": "53f9d242ffdf0997109d0b5b8bbbcc67a4296077", "type": "github" }, "original": { From 2a8094b5e0a64b139d8ee49804e5173f1d851198 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 14:53:29 +0300 Subject: [PATCH 044/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 60fea44..db6d505 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740432393, - "narHash": "sha256-uXlB7bTlrl0q2jryKMSRlU+GptkVJN7PTsqdKkaFg1M=", + "lastModified": 1740520037, + "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", "owner": "nix-community", "repo": "nixvim", - "rev": "53f9d242ffdf0997109d0b5b8bbbcc67a4296077", + "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", "type": "github" }, "original": { From 637601d75d5fe92aceceef98cef4b62cc2bfe502 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 03:50:33 +0300 Subject: [PATCH 045/219] add extra packages --- default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 316fc46..808205b 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -_: +{pkgs, ...}: { imports = [ ./config ./plugins ]; @@ -19,5 +19,13 @@ _: # Sync system clipboard register = "unnamedplus"; }; + extraPackages = with pkgs; [ + nixd + git + git-lfs + cloc + ripgrep + lazygit + ]; }; } From 108b93651510d6e90ba079f441c094d26be7381b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 03:52:28 +0300 Subject: [PATCH 046/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index db6d505..73e0ff0 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740520037, - "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "type": "github" }, "original": { From 659be8fd810bebac219f031e6612ba9a9910ce31 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 16:32:50 +0300 Subject: [PATCH 047/219] make lsp folder --- plugins/default.nix | 59 +++++------------------------------------ plugins/lsp/default.nix | 12 +++++++++ plugins/lsp/nix.nix | 12 +++++++++ 3 files changed, 30 insertions(+), 53 deletions(-) create mode 100644 plugins/lsp/default.nix create mode 100644 plugins/lsp/nix.nix diff --git a/plugins/default.nix b/plugins/default.nix index 3cc758c..c69b086 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,7 +1,8 @@ -{ self, lib, pkgs, ... }: - { - imports = [ ./mini.nix ]; + imports = [ + ./mini.nix + ./lsp + ]; plugins = { treesitter = { @@ -10,55 +11,7 @@ }; todo-comments.enable = true; - - lsp = { - servers = { - nixd = { - enable = true; - settings = let flake = ''(builtins.getFlake "${self}")''; - in { - nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; - formatting = { - command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; - }; - }; - }; - typos_lsp = { - enable = true; - extraOptions = { init_options = { diagnosticSeverity = "Hint"; }; }; - }; - pylsp = { - enable = true; - settings = { - configurationSources = [ "flake8" ]; - plugins = { - pycodestyle = { - enabled = true; - maxLineLength = 120; - }; - flake8 = { - enabled = true; - maxLineLength = 120; - }; - }; - }; - - }; - astro = { enable = true; }; - arduino_language_server = { enable = true; }; - bashls = { enable = true; }; - clangd = { enable = true; }; - dartls = { enable = true; }; - lua_ls = { enable = true; }; - mdx_analyzer = { enable = true; }; - fish_lsp = { enable = true; }; - docker_compose_language_service = { enable = true; }; - dockerls = { enable = true; }; - marksman = { enable = true; }; - }; - }; - - lualine = { enable = true; }; + lualine.enable = true; cmp = { # TODO read what this does @@ -70,7 +23,7 @@ oil.enable = true; # shell scripting #telescope - telescope = { enable = true; }; + telescope.enable = true; web-devicons.enable = true; # be concious of this choice }; } diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix new file mode 100644 index 0000000..fbdc4aa --- /dev/null +++ b/plugins/lsp/default.nix @@ -0,0 +1,12 @@ +{ + imports = [ + ./nix.nix + ]; + plugins.lsp.servers = { + typos_lsp = { + enable = true; + extraOptions.init_options.diagnosticSeverity = "Hint"; + }; + astro.enable = true; + }; +} diff --git a/plugins/lsp/nix.nix b/plugins/lsp/nix.nix new file mode 100644 index 0000000..d78bea3 --- /dev/null +++ b/plugins/lsp/nix.nix @@ -0,0 +1,12 @@ +{lib, pkgs, self, ...}: { + plugins.lsp.servers.nixd = { + enable = true; + settings = let flake = ''(builtins.getFlake "${self}")''; + in { + nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; + formatting = { + command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; + }; + }; + }; +} \ No newline at end of file From d14dce5233d6184700399bb1ea73d1ac859b847a Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 16:33:22 +0300 Subject: [PATCH 048/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 73e0ff0..259d76c 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { From 5419ff210d3167867862b9e8e72d31aac7eac51c Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 16:40:15 +0300 Subject: [PATCH 049/219] formatting --- plugins/lsp/nix.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/lsp/nix.nix b/plugins/lsp/nix.nix index d78bea3..2538126 100644 --- a/plugins/lsp/nix.nix +++ b/plugins/lsp/nix.nix @@ -1,12 +1,10 @@ -{lib, pkgs, self, ...}: { +{ lib, pkgs, self, ... }: { plugins.lsp.servers.nixd = { enable = true; settings = let flake = ''(builtins.getFlake "${self}")''; in { nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; - formatting = { - command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; - }; + formatting.command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; }; }; -} \ No newline at end of file +} From 39c7f5fcc260addc1138b9061eef99683dd2d65b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 17:30:11 +0300 Subject: [PATCH 050/219] add nix-inspect --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index 808205b..5ff353e 100644 --- a/default.nix +++ b/default.nix @@ -20,6 +20,7 @@ register = "unnamedplus"; }; extraPackages = with pkgs; [ + nix-inspect nixd git git-lfs From 5f7df2f2638af31387859fc9da171ff2dc83bb8f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 18:28:03 +0300 Subject: [PATCH 051/219] add nix-inspect --- plugins/mini.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/plugins/mini.nix b/plugins/mini.nix index c1940e2..f2b0a1b 100644 --- a/plugins/mini.nix +++ b/plugins/mini.nix @@ -1,4 +1,4 @@ -{ +{config, lib, ...}:{ plugins.mini = { enable = true; modules = { @@ -9,8 +9,29 @@ / _ \/ __| '_ \| '_ ` _ \ / _` |/ _ \ \ / / | (_) \__ \ |_) | | | | | || (_| | __/\ V / \___/|___/_.__/|_| |_| |_(_)__,_|\___| \_/ - ''; + + items = { + "__unkeyed-1.builtin_actions".__raw = "require('mini.starter').sections.builtin_actions()"; + "__unkeyed-2.recent_files_current_directory".__raw = + "require('mini.starter').sections.recent_files(10, true)"; + "__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, false)"; + "__unkeyed-4.sessions".__raw = lib.mkIf ( + config.plugins.mini.enable && lib.hasAttr "sessions" config.plugins.mini.modules + ) "require('mini.starter').sections.sessions(5, true)"; + __unkeyed-5 = lib.mkIf config.plugins.persistence.enable { + name = "Restore session"; + action.__raw = "[[lua require('persistence').load()]]"; + section = "Session"; + }; + }; + + content_hooks = { + "__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()"; + "__unkeyed-2.indexing".__raw = + "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; + "__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')"; + }; }; }; }; From b8cea0f31e8ce0a6c22d8898c8fd2507313ee162 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 18:32:41 +0300 Subject: [PATCH 052/219] formatting --- plugins/mini.nix | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/plugins/mini.nix b/plugins/mini.nix index f2b0a1b..f79fc50 100644 --- a/plugins/mini.nix +++ b/plugins/mini.nix @@ -10,29 +10,30 @@ | (_) \__ \ |_) | | | | | || (_| | __/\ V / \___/|___/_.__/|_| |_| |_(_)__,_|\___| \_/ ''; - - items = { - "__unkeyed-1.builtin_actions".__raw = "require('mini.starter').sections.builtin_actions()"; - "__unkeyed-2.recent_files_current_directory".__raw = - "require('mini.starter').sections.recent_files(10, true)"; - "__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, false)"; - "__unkeyed-4.sessions".__raw = lib.mkIf ( - config.plugins.mini.enable && lib.hasAttr "sessions" config.plugins.mini.modules - ) "require('mini.starter').sections.sessions(5, true)"; - __unkeyed-5 = lib.mkIf config.plugins.persistence.enable { - name = "Restore session"; - action.__raw = "[[lua require('persistence').load()]]"; - section = "Session"; - }; + # this items and content_hooks are copied from khanelivim config + # but i want to understand them + items = { + "__unkeyed-1.builtin_actions".__raw = "require('mini.starter').sections.builtin_actions()"; + "__unkeyed-2.recent_files_current_directory".__raw = + "require('mini.starter').sections.recent_files(10, true)"; + "__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, false)"; + "__unkeyed-4.sessions".__raw = lib.mkIf ( + config.plugins.mini.enable && lib.hasAttr "sessions" config.plugins.mini.modules + ) "require('mini.starter').sections.sessions(5, true)"; + __unkeyed-5 = lib.mkIf config.plugins.persistence.enable { + name = "Restore session"; + action.__raw = "[[lua require('persistence').load()]]"; + section = "Session"; }; + }; - content_hooks = { - "__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()"; - "__unkeyed-2.indexing".__raw = - "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; - "__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')"; - }; - }; + content_hooks = { + "__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()"; + "__unkeyed-2.indexing".__raw = + "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; + "__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')"; + }; + }; }; }; } From eb82e2f01695411f909a45017625f43d8b69d6ac Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 20:48:04 +0300 Subject: [PATCH 053/219] add black --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index 5ff353e..55bb05e 100644 --- a/default.nix +++ b/default.nix @@ -27,6 +27,7 @@ cloc ripgrep lazygit + black ]; }; } From 6dee74d3670e1da6ffa4627c1b91eac8cbd32ae8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 00:29:33 +0300 Subject: [PATCH 054/219] yippie --- config/options.nix | 13 ++++++------- plugins/default.nix | 14 ++++++++------ plugins/lsp/default.nix | 1 + plugins/lsp/python.nix | 5 +++++ 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 plugins/lsp/python.nix diff --git a/config/options.nix b/config/options.nix index be7d9d1..30543b2 100644 --- a/config/options.nix +++ b/config/options.nix @@ -8,13 +8,12 @@ list = true; listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; - # when i press tab i want to see spaces - expandtab = true; - tabstop = 4; # Number of spaces that a in the file counts for. - shiftwidth = 4; # how many spaces are added in an indent - softtabstop = 4; # how many spaces are added when pressing tab - smarttab = - true; # When on, a in front of a line inserts blanks according to 'shiftwidth'. 'tabstop' or 'softtabstop' is used in other places. + # Tab options + tabstop = 2; # Number of spaces a in the text stands for (local to buffer) + shiftwidth = 2; # Number of spaces used for each step of (auto)indent (local to buffer) + softtabstop = 0; # If non-zero, number of spaces to insert for a (local to buffer) + expandtab = true; # Expand to spaces in Insert mode (local to buffer) + 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? diff --git a/plugins/default.nix b/plugins/default.nix index c69b086..84fd410 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -13,12 +13,14 @@ todo-comments.enable = true; lualine.enable = true; - cmp = { - # TODO read what this does - # basically, it's a completion plugin - enable = true; - autoEnableSources = true; - }; + # cmp = { + # # TODO read what this does + # # basically, it's a completion plugin + # enable = true; + # autoEnableSources = true; + # }; + cmp-nvim-lsp.enable = true; + oil.enable = true; # shell scripting diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix index fbdc4aa..d008afc 100644 --- a/plugins/lsp/default.nix +++ b/plugins/lsp/default.nix @@ -1,6 +1,7 @@ { imports = [ ./nix.nix + ./python.nix ]; plugins.lsp.servers = { typos_lsp = { diff --git a/plugins/lsp/python.nix b/plugins/lsp/python.nix new file mode 100644 index 0000000..4bc0f9b --- /dev/null +++ b/plugins/lsp/python.nix @@ -0,0 +1,5 @@ +{ + plugins.lsp.servers.pyright = { + enable = true; + }; +} \ No newline at end of file From adef6f1d93484d3af6ddc35f7ccf18884f4a5600 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 00:53:25 +0300 Subject: [PATCH 055/219] dont need seperation for LSPs --- flake.nix | 2 -- plugins/default.nix | 5 +++-- plugins/lsp/default.nix | 19 +++++++++++++------ plugins/lsp/nix.nix | 10 ---------- plugins/lsp/python.nix | 5 ----- 5 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 plugins/lsp/nix.nix delete mode 100644 plugins/lsp/python.nix diff --git a/flake.nix b/flake.nix index 5c2d3ac..c250c4d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - - # Nix formatting pack # https://gerschtli.github.io/nix-formatter-pack/nix-formatter-pack-options.html nix-formatter-pack = { url = "github:Gerschtli/nix-formatter-pack"; diff --git a/plugins/default.nix b/plugins/default.nix index 84fd410..43ccaa6 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,7 +1,7 @@ { imports = [ - ./mini.nix ./lsp + ./mini.nix ]; plugins = { @@ -19,8 +19,9 @@ # enable = true; # autoEnableSources = true; # }; - cmp-nvim-lsp.enable = true; + # cmp-nvim-lsp.enable = true; + blink-cmp.enable = true; oil.enable = true; # shell scripting diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix index d008afc..4cb4465 100644 --- a/plugins/lsp/default.nix +++ b/plugins/lsp/default.nix @@ -1,13 +1,20 @@ -{ - imports = [ - ./nix.nix - ./python.nix - ]; +{ lib, pkgs, self, ... }: { plugins.lsp.servers = { + astro.enable = true; + nixd = { + enable = true; + settings = let flake = ''(builtins.getFlake "${self}")''; + in { + nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; + formatting.command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; + }; + }; + pyright = { + enable = true; + }; typos_lsp = { enable = true; extraOptions.init_options.diagnosticSeverity = "Hint"; }; - astro.enable = true; }; } diff --git a/plugins/lsp/nix.nix b/plugins/lsp/nix.nix deleted file mode 100644 index 2538126..0000000 --- a/plugins/lsp/nix.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, pkgs, self, ... }: { - plugins.lsp.servers.nixd = { - enable = true; - settings = let flake = ''(builtins.getFlake "${self}")''; - in { - nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; - formatting.command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; - }; - }; -} diff --git a/plugins/lsp/python.nix b/plugins/lsp/python.nix deleted file mode 100644 index 4bc0f9b..0000000 --- a/plugins/lsp/python.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - plugins.lsp.servers.pyright = { - enable = true; - }; -} \ No newline at end of file From 19f034777c26d11887a7fac43e727354113242bf Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 03:20:43 +0300 Subject: [PATCH 056/219] plugins --- plugins/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/default.nix b/plugins/default.nix index 43ccaa6..e8784a5 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -19,11 +19,16 @@ # enable = true; # autoEnableSources = true; # }; - # cmp-nvim-lsp.enable = true; + cmp-nvim-lsp.enable = true; + # blink completion blink-cmp.enable = true; + blink-compat.enable = true; - oil.enable = true; # shell scripting + # Extensible UI for Neovim notifications and LSP progress messages. + fidget.enable = true; + # fast create folders and files + oil.enable = true; #telescope telescope.enable = true; From a5b0c4751d108415272dc8b0baf7280695d4f587 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 03:20:52 +0300 Subject: [PATCH 057/219] add dockerls --- plugins/lsp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix index 4cb4465..9c25b2a 100644 --- a/plugins/lsp/default.nix +++ b/plugins/lsp/default.nix @@ -1,6 +1,7 @@ { lib, pkgs, self, ... }: { plugins.lsp.servers = { astro.enable = true; + dockerls.enable = true; nixd = { enable = true; settings = let flake = ''(builtins.getFlake "${self}")''; From b8283ec9cb95575ac5ef7553d2e1bcbfc9cfb89d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 03:30:21 +0300 Subject: [PATCH 058/219] add performance section --- default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/default.nix b/default.nix index 55bb05e..7e35e9a 100644 --- a/default.nix +++ b/default.nix @@ -29,5 +29,14 @@ lazygit black ]; + + performance = { + byteCompileLua = { + enable = true; + nvimRuntime = true; + configs = true; + plugins = true; + }; + }; }; } From d8ba9d94018a059a2c8d212ef6544d19edc32631 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 03:40:17 +0300 Subject: [PATCH 059/219] add comments and navic --- plugins/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index e8784a5..1b119f2 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -27,11 +27,22 @@ # Extensible UI for Neovim notifications and LSP progress messages. fidget.enable = true; + + # A navigation plugin that uses lsp symbols to provide a breadcrumb trail + navic.enable = true; # TODO: not seeing the output rn + # fast create folders and files oil.enable = true; - #telescope + # a file explorer telescope.enable = true; + + # vim exercises + vim-be-good.enable = true; + web-devicons.enable = true; # be concious of this choice + + # TODO: add floating command inputter + }; } From 20d8d4f837896e2791b17c00fc1e45192e3ca788 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Mar 2025 15:42:36 +0300 Subject: [PATCH 060/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 259d76c..8ec8b77 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { From ca46eddbe42556317659b35d7fd824fca70e5762 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Mar 2025 15:44:39 +0300 Subject: [PATCH 061/219] add telescope utils --- default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default.nix b/default.nix index 7e35e9a..ee8537a 100644 --- a/default.nix +++ b/default.nix @@ -28,6 +28,8 @@ ripgrep lazygit black + fd + ripgrep ]; performance = { From 20ad9eaa16d399c4fd8231dd34cd14ef80684fea Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 19:02:57 +0300 Subject: [PATCH 062/219] make sure to install these languages --- plugins/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index 1b119f2..8dfa412 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,4 +1,4 @@ -{ +{pkgs, ...}: { imports = [ ./lsp ./mini.nix @@ -8,6 +8,23 @@ treesitter = { enable = true; # folding = true; # i dont like the way it starts neovim with everything folded + settings = { + ensure_installed = [ + "python" + "astro" + "just" + "dockerfile" + "json" + "yaml" + "lua" + "nix" + "c" + "markdown" + ]; + highlight = { + enable = true; + }; + }; }; todo-comments.enable = true; From f5ac9c18418c85d93cc1cf00cdea724f8b5f0ce1 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 20:05:54 +0300 Subject: [PATCH 063/219] formatting --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index ee8537a..d4cf777 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: +{ pkgs, ... }: { imports = [ ./config ./plugins ]; From 60cfc451ef8d6b8741645368018df26f3ecee261 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 20:06:21 +0300 Subject: [PATCH 064/219] formatting --- plugins/lsp/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix index 9c25b2a..94a3103 100644 --- a/plugins/lsp/default.nix +++ b/plugins/lsp/default.nix @@ -10,9 +10,7 @@ formatting.command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; }; }; - pyright = { - enable = true; - }; + pyright.enable = true; typos_lsp = { enable = true; extraOptions.init_options.diagnosticSeverity = "Hint"; From 1287118d162e6448d74b2ae36149b5d4a1337585 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 21:14:33 +0300 Subject: [PATCH 065/219] acceptable --- plugins/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/default.nix b/plugins/default.nix index 8dfa412..eb97031 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -21,9 +21,7 @@ "c" "markdown" ]; - highlight = { - enable = true; - }; + highlight = { enable = true; }; }; }; From 08b00ba398db728196ee0d1b29b3a9ca11cd0c7e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 03:11:42 +0300 Subject: [PATCH 066/219] update plugins --- flake.nix | 1 - plugins/cmp.nix | 11 ++++++ plugins/default.nix | 54 +++++++++++----------------- plugins/{lsp/default.nix => lsp.nix} | 0 plugins/mini.nix | 1 - plugins/treesitter.nix | 20 +++++++++++ 6 files changed, 52 insertions(+), 35 deletions(-) create mode 100644 plugins/cmp.nix rename plugins/{lsp/default.nix => lsp.nix} (100%) create mode 100644 plugins/treesitter.nix diff --git a/flake.nix b/flake.nix index c250c4d..e6a561c 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,6 @@ formatter = forAllSystems (system: nix-formatter-pack.lib.mkFormatter { pkgs = nixpkgs.legacyPackages.${system}; - config.tools = { deadnix.enable = true; nixfmt.enable = true; diff --git a/plugins/cmp.nix b/plugins/cmp.nix new file mode 100644 index 0000000..423698f --- /dev/null +++ b/plugins/cmp.nix @@ -0,0 +1,11 @@ +{ + plugins.cmp = { + autoEnableSources = true; + settings.sources = [ + { name = "nvim_lsp"; } + { name = "path"; } + { name = "buffer"; } + { name = "cmdline"; } + ]; + }; +} \ No newline at end of file diff --git a/plugins/default.nix b/plugins/default.nix index eb97031..8da40d5 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,44 +1,26 @@ {pkgs, ...}: { imports = [ - ./lsp + ./cmp.nix + ./lsp.nix ./mini.nix + ./treesitter.nix ]; plugins = { - treesitter = { - enable = true; - # folding = true; # i dont like the way it starts neovim with everything folded - settings = { - ensure_installed = [ - "python" - "astro" - "just" - "dockerfile" - "json" - "yaml" - "lua" - "nix" - "c" - "markdown" - ]; - highlight = { enable = true; }; - }; - }; - + # todo comments highlighter todo-comments.enable = true; + + # a statusline plugin lualine.enable = true; - # cmp = { - # # TODO read what this does - # # basically, it's a completion plugin - # enable = true; - # autoEnableSources = true; - # }; - cmp-nvim-lsp.enable = true; + # syntax highlighting + treesitter.enable = true; - # blink completion - blink-cmp.enable = true; - blink-compat.enable = true; + # completion plugin + cmp.enable = true; + + # blink completion plugin (disabled in favor of cmp) + blink-cmp.enable = false; # Extensible UI for Neovim notifications and LSP progress messages. fidget.enable = true; @@ -55,9 +37,15 @@ # vim exercises vim-be-good.enable = true; - web-devicons.enable = true; # be concious of this choice + # Provides Nerd Font icons + web-devicons.enable = true; + + # better ui experience + noice.enable = true; + + # an introduction plugin + mini.enable = true; # TODO look more into the mini plugin - # TODO: add floating command inputter }; } diff --git a/plugins/lsp/default.nix b/plugins/lsp.nix similarity index 100% rename from plugins/lsp/default.nix rename to plugins/lsp.nix diff --git a/plugins/mini.nix b/plugins/mini.nix index f79fc50..5ed71fc 100644 --- a/plugins/mini.nix +++ b/plugins/mini.nix @@ -1,6 +1,5 @@ {config, lib, ...}:{ plugins.mini = { - enable = true; modules = { starter = { header = '' diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix new file mode 100644 index 0000000..00301be --- /dev/null +++ b/plugins/treesitter.nix @@ -0,0 +1,20 @@ +{ + plugins.treesitter = { + # folding = true; # i dont like the way it starts neovim with everything folded + settings = { + ensure_installed = [ + "python" + "astro" + "just" + "dockerfile" + "json" + "yaml" + "lua" + "nix" + "c" + "markdown" + ]; + highlight = { enable = true; }; + }; + }; +} \ No newline at end of file From 7b0b562950a1d4122c8654da5a1a61d1fd62ec51 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 03:12:37 +0300 Subject: [PATCH 067/219] clarification --- plugins/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index 8da40d5..208084d 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ + # settings of these plugins live in their respective files imports = [ ./cmp.nix ./lsp.nix From 541d921b78a33be189933a65475f0931f5645059 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 04:51:16 +0300 Subject: [PATCH 068/219] formatting --- plugins/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index 208084d..61b47e4 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -47,6 +47,5 @@ # an introduction plugin mini.enable = true; # TODO look more into the mini plugin - }; } From 3cb80069c957779499c5cd8a19ec7081f965103e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 15:45:08 +0300 Subject: [PATCH 069/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8ec8b77..57bd9c0 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "lastModified": 1741637833, + "narHash": "sha256-1uBkdOwxNmkdXXjoycnEBZUoHZ/22GitQRVXjZlsVK0=", "owner": "nix-community", "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "rev": "bc34099731a7e3799c0d52ccdf4599409a2ef9b9", "type": "github" }, "original": { From d32017e435ffd6a935856b78f4f6c34ab82ab57e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Mar 2025 22:20:40 +0300 Subject: [PATCH 070/219] enable smear --- plugins/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/default.nix b/plugins/default.nix index 61b47e4..8ef462f 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -47,5 +47,7 @@ # an introduction plugin mini.enable = true; # TODO look more into the mini plugin + # cursor animation + smear-cursor.enable = true; }; } From 1f2042d897eb65419a72933a15c5e5ba481ca1da Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Mar 2025 22:20:47 +0300 Subject: [PATCH 071/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 57bd9c0..8d34c7b 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741637833, - "narHash": "sha256-1uBkdOwxNmkdXXjoycnEBZUoHZ/22GitQRVXjZlsVK0=", + "lastModified": 1741709061, + "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", "owner": "nix-community", "repo": "nixvim", - "rev": "bc34099731a7e3799c0d52ccdf4599409a2ef9b9", + "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", "type": "github" }, "original": { From 341d0cc713d4b4ace717a59f6be6e6becbd271ac Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Mar 2025 16:27:18 +0300 Subject: [PATCH 072/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8d34c7b..6754629 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { From 81ca0e7d488a3e547338623ffb802912449c5a73 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 15 Mar 2025 23:27:18 +0300 Subject: [PATCH 073/219] delete comment --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index e6a561c..6693dd9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,6 @@ url = "github:Gerschtli/nix-formatter-pack"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim.url = "github:nix-community/nixvim"; }; From e57b9c080bfe4dd1d8d56c608df681125ca259ec Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 15 Mar 2025 23:27:45 +0300 Subject: [PATCH 074/219] add my first keymap --- plugins/cmp.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/cmp.nix b/plugins/cmp.nix index 423698f..3d700a1 100644 --- a/plugins/cmp.nix +++ b/plugins/cmp.nix @@ -1,11 +1,16 @@ { plugins.cmp = { autoEnableSources = true; - settings.sources = [ - { name = "nvim_lsp"; } - { name = "path"; } - { name = "buffer"; } - { name = "cmdline"; } - ]; + settings = { + sources = [ + { name = "nvim_lsp"; } + { name = "path"; } + { name = "buffer"; } + { name = "cmdline"; } + ]; + mapping = { + "" = "cmp.mapping.confirm({ select = true })"; + }; + }; }; } \ No newline at end of file From 178c7f94bfd5789b533b4b3313ecb8e5cac0e050 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 00:35:30 +0300 Subject: [PATCH 075/219] add keymaps to nvim-cmp --- plugins/cmp.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/cmp.nix b/plugins/cmp.nix index 3d700a1..628823f 100644 --- a/plugins/cmp.nix +++ b/plugins/cmp.nix @@ -3,13 +3,21 @@ autoEnableSources = true; settings = { sources = [ + # LSP source { name = "nvim_lsp"; } + # For path completion { name = "path"; } + # For buffer completion { name = "buffer"; } + # For command line completion { name = "cmdline"; } ]; mapping = { + # means enter "" = "cmp.mapping.confirm({ select = true })"; + "" = "cmp.mapping.select_next_item()"; + "" = "cmp.mapping.select_prev_item()"; + "" = "cmp.mapping.close()"; }; }; }; From 4bea1284bf3afb86b7bbc4154d596b8aac49707c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 00:35:42 +0300 Subject: [PATCH 076/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6754629..e81ff48 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741709061, - "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", + "lastModified": 1741814789, + "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", + "rev": "33097dcf776d1fad0ff3842096c4e3546312f251", "type": "github" }, "original": { From a900a9796aea1e3dcbce5eeebae90a73cd42ca27 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 02:16:00 +0300 Subject: [PATCH 077/219] improve completion --- plugins/cmp.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/cmp.nix b/plugins/cmp.nix index 628823f..2ec48c1 100644 --- a/plugins/cmp.nix +++ b/plugins/cmp.nix @@ -8,17 +8,17 @@ # For path completion { name = "path"; } # For buffer completion - { name = "buffer"; } + { name = "buffer"; keyword_length = 5; } # For command line completion { name = "cmdline"; } ]; mapping = { # means enter "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping.select_next_item()"; - "" = "cmp.mapping.select_prev_item()"; + "" = "cmp.mapping.select_next_item()"; + "" = "cmp.mapping.select_prev_item()"; "" = "cmp.mapping.close()"; }; }; }; -} \ No newline at end of file +} From d81f41af131cad764a359679603efac8f7f0b7ac Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 02:17:01 +0300 Subject: [PATCH 078/219] add bufferline plugin --- plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/default.nix b/plugins/default.nix index 8ef462f..55c6a6b 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -49,5 +49,8 @@ # cursor animation smear-cursor.enable = true; + + # add buffer tab plugin + bufferline.enable = true; }; } From 970cc18d62047ecda5d0e5e72d2e0bc1919bc5f2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 02:17:27 +0300 Subject: [PATCH 079/219] add oil keymap --- plugins/default.nix | 1 + plugins/oil.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 plugins/oil.nix diff --git a/plugins/default.nix b/plugins/default.nix index 55c6a6b..d2d6c6d 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -4,6 +4,7 @@ ./cmp.nix ./lsp.nix ./mini.nix + ./oil.nix ./treesitter.nix ]; diff --git a/plugins/oil.nix b/plugins/oil.nix new file mode 100644 index 0000000..b54bc19 --- /dev/null +++ b/plugins/oil.nix @@ -0,0 +1,15 @@ +{config, lib, ...}: { + plugins.oil = { + }; + # add this keymaps only if oil plugin is enabled + keymaps = lib.mkIf config.plugins.oil.enable [ + { + action = "Oil"; + key = "-"; + options = { + silent = true; + # TODO what does silent do? + }; + } + ]; +} \ No newline at end of file From 9addbe931a76349b8529077164dd9917c586197f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 16:47:45 +0300 Subject: [PATCH 080/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e81ff48..dd63701 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { From 72f087c33dca2ea6967630173075490e3f71ce86 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 21:13:57 +0300 Subject: [PATCH 081/219] formatting --- config/options.nix | 9 ++++++--- plugins/cmp.nix | 13 ++++++++++--- plugins/default.nix | 8 +------- plugins/mini.nix | 22 +++++++++++++--------- plugins/oil.nix | 25 +++++++++++-------------- plugins/treesitter.nix | 2 +- 6 files changed, 42 insertions(+), 37 deletions(-) diff --git a/config/options.nix b/config/options.nix index 30543b2..8556e51 100644 --- a/config/options.nix +++ b/config/options.nix @@ -9,9 +9,12 @@ listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; # Tab options - tabstop = 2; # Number of spaces a in the text stands for (local to buffer) - shiftwidth = 2; # Number of spaces used for each step of (auto)indent (local to buffer) - softtabstop = 0; # If non-zero, number of spaces to insert for a (local to buffer) + tabstop = + 2; # Number of spaces a in the text stands for (local to buffer) + shiftwidth = + 2; # Number of spaces used for each step of (auto)indent (local to buffer) + softtabstop = + 0; # If non-zero, number of spaces to insert for a (local to buffer) expandtab = true; # Expand to spaces in Insert mode (local to buffer) 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 diff --git a/plugins/cmp.nix b/plugins/cmp.nix index 2ec48c1..8cfb197 100644 --- a/plugins/cmp.nix +++ b/plugins/cmp.nix @@ -4,11 +4,18 @@ settings = { sources = [ # LSP source - { name = "nvim_lsp"; } + { + name = "nvim_lsp"; + } # For path completion - { name = "path"; } + { + name = "path"; + } # For buffer completion - { name = "buffer"; keyword_length = 5; } + { + name = "buffer"; + keyword_length = 5; + } # For command line completion { name = "cmdline"; } ]; diff --git a/plugins/default.nix b/plugins/default.nix index d2d6c6d..0639d6f 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,12 +1,6 @@ { # settings of these plugins live in their respective files - imports = [ - ./cmp.nix - ./lsp.nix - ./mini.nix - ./oil.nix - ./treesitter.nix - ]; + imports = [ ./cmp.nix ./lsp.nix ./mini.nix ./oil.nix ./treesitter.nix ]; plugins = { # todo comments highlighter diff --git a/plugins/mini.nix b/plugins/mini.nix index 5ed71fc..d50c80a 100644 --- a/plugins/mini.nix +++ b/plugins/mini.nix @@ -1,4 +1,4 @@ -{config, lib, ...}:{ +{ config, lib, ... }: { plugins.mini = { modules = { starter = { @@ -12,13 +12,15 @@ # this items and content_hooks are copied from khanelivim config # but i want to understand them items = { - "__unkeyed-1.builtin_actions".__raw = "require('mini.starter').sections.builtin_actions()"; + "__unkeyed-1.builtin_actions".__raw = + "require('mini.starter').sections.builtin_actions()"; "__unkeyed-2.recent_files_current_directory".__raw = "require('mini.starter').sections.recent_files(10, true)"; - "__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, false)"; - "__unkeyed-4.sessions".__raw = lib.mkIf ( - config.plugins.mini.enable && lib.hasAttr "sessions" config.plugins.mini.modules - ) "require('mini.starter').sections.sessions(5, true)"; + "__unkeyed-3.recent_files".__raw = + "require('mini.starter').sections.recent_files(10, false)"; + "__unkeyed-4.sessions".__raw = lib.mkIf (config.plugins.mini.enable + && lib.hasAttr "sessions" config.plugins.mini.modules) + "require('mini.starter').sections.sessions(5, true)"; __unkeyed-5 = lib.mkIf config.plugins.persistence.enable { name = "Restore session"; action.__raw = "[[lua require('persistence').load()]]"; @@ -27,12 +29,14 @@ }; content_hooks = { - "__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()"; + "__unkeyed-1.adding_bullet".__raw = + "require('mini.starter').gen_hook.adding_bullet()"; "__unkeyed-2.indexing".__raw = "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; - "__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')"; + "__unkeyed-3.padding".__raw = + "require('mini.starter').gen_hook.aligning('center', 'center')"; }; - }; + }; }; }; } diff --git a/plugins/oil.nix b/plugins/oil.nix index b54bc19..44fe414 100644 --- a/plugins/oil.nix +++ b/plugins/oil.nix @@ -1,15 +1,12 @@ -{config, lib, ...}: { - plugins.oil = { - }; +{ config, lib, ... }: { + plugins.oil = { }; # add this keymaps only if oil plugin is enabled - keymaps = lib.mkIf config.plugins.oil.enable [ - { - action = "Oil"; - key = "-"; - options = { - silent = true; - # TODO what does silent do? - }; - } - ]; -} \ No newline at end of file + keymaps = lib.mkIf config.plugins.oil.enable [{ + action = "Oil"; + key = "-"; + options = { + silent = true; + # TODO what does silent do? + }; + }]; +} diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix index 00301be..adf95e5 100644 --- a/plugins/treesitter.nix +++ b/plugins/treesitter.nix @@ -17,4 +17,4 @@ highlight = { enable = true; }; }; }; -} \ No newline at end of file +} From 7e2b6e5906ce84692e0452376a6c4f3cb8f0272c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 21:15:18 +0300 Subject: [PATCH 082/219] formatting alejandra --- config/colorscheme.nix | 2 +- config/default.nix | 9 +++-- config/options.nix | 1 - default.nix | 6 ++-- flake.nix | 79 ++++++++++++++++++++++-------------------- plugins/cmp.nix | 2 +- plugins/default.nix | 2 +- plugins/lsp.nix | 12 +++++-- plugins/mini.nix | 26 +++++++------- plugins/oil.nix | 26 ++++++++------ plugins/treesitter.nix | 2 +- 11 files changed, 88 insertions(+), 79 deletions(-) diff --git a/config/colorscheme.nix b/config/colorscheme.nix index 0ae6765..f124d28 100644 --- a/config/colorscheme.nix +++ b/config/colorscheme.nix @@ -1 +1 @@ -{ colorschemes = { gruvbox.enable = true; }; } +{colorschemes = {gruvbox.enable = true;};} diff --git a/config/default.nix b/config/default.nix index 7890c95..c8b1cd7 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,7 +1,6 @@ -{ lib, ... }: - -let +{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) + (builtins.readDir ./.)); +in + lib.mkMerge (map (file: import ./${file}) definitions) diff --git a/config/options.nix b/config/options.nix index 8556e51..1c33d6f 100644 --- a/config/options.nix +++ b/config/options.nix @@ -19,6 +19,5 @@ 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? - }; } diff --git a/default.nix b/default.nix index d4cf777..ab57f39 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,5 @@ -{ pkgs, ... }: - -{ - imports = [ ./config ./plugins ]; +{pkgs, ...}: { + imports = [./config ./plugins]; config = { # Use as leader key diff --git a/flake.nix b/flake.nix index 6693dd9..4382f92 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,5 @@ { - description = - "My custom neovim configuration that has been mixed and matched from various sources"; + description = "My custom neovim configuration that has been mixed and matched from various sources"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -12,43 +11,47 @@ nixvim.url = "github:nix-community/nixvim"; }; - outputs = { nixpkgs, nixvim, nix-formatter-pack, ... }: - let - forAllSystems = nixpkgs.lib.genAttrs [ - "aarch64-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - in { - formatter = forAllSystems (system: - nix-formatter-pack.lib.mkFormatter { - pkgs = nixpkgs.legacyPackages.${system}; - config.tools = { - deadnix.enable = true; - nixfmt.enable = true; - statix.enable = true; - }; - }); + outputs = { + nixpkgs, + nixvim, + nix-formatter-pack, + ... + }: let + forAllSystems = nixpkgs.lib.genAttrs [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + in { + formatter = forAllSystems (system: + nix-formatter-pack.lib.mkFormatter { + pkgs = nixpkgs.legacyPackages.${system}; + config.tools = { + deadnix.enable = true; + alejandra.enable = true; + statix.enable = true; + }; + }); - packages = forAllSystems (system: - let - pkgs = import nixpkgs { inherit system; }; - mkNixvim = specialArgs: - nixvim.legacyPackages.${system}.makeNixvimWithModule { + packages = forAllSystems (system: let + pkgs = import nixpkgs {inherit system;}; + mkNixvim = specialArgs: + nixvim.legacyPackages.${system}.makeNixvimWithModule { + inherit pkgs; + + module = ./.; + + extraSpecialArgs = + specialArgs + // { inherit pkgs; - - module = ./.; - - extraSpecialArgs = specialArgs // { - inherit pkgs; - - }; }; - in { - default = mkNixvim { }; - lite = mkNixvim { withLSP = false; }; - }); - }; + }; + in { + default = mkNixvim {}; + lite = mkNixvim {withLSP = false;}; + }); + }; } diff --git a/plugins/cmp.nix b/plugins/cmp.nix index 8cfb197..e9eacab 100644 --- a/plugins/cmp.nix +++ b/plugins/cmp.nix @@ -17,7 +17,7 @@ keyword_length = 5; } # For command line completion - { name = "cmdline"; } + {name = "cmdline";} ]; mapping = { # means enter diff --git a/plugins/default.nix b/plugins/default.nix index 0639d6f..7292825 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,6 +1,6 @@ { # settings of these plugins live in their respective files - imports = [ ./cmp.nix ./lsp.nix ./mini.nix ./oil.nix ./treesitter.nix ]; + imports = [./cmp.nix ./lsp.nix ./mini.nix ./oil.nix ./treesitter.nix]; plugins = { # todo comments highlighter diff --git a/plugins/lsp.nix b/plugins/lsp.nix index 94a3103..e545733 100644 --- a/plugins/lsp.nix +++ b/plugins/lsp.nix @@ -1,13 +1,19 @@ -{ lib, pkgs, self, ... }: { +{ + lib, + pkgs, + self, + ... +}: { plugins.lsp.servers = { astro.enable = true; dockerls.enable = true; nixd = { enable = true; - settings = let flake = ''(builtins.getFlake "${self}")''; + settings = let + flake = ''(builtins.getFlake "${self}")''; in { nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }"; - formatting.command = [ "${lib.getExe pkgs.nixfmt-rfc-style}" ]; + formatting.command = ["${lib.getExe pkgs.nixfmt-rfc-style}"]; }; }; pyright.enable = true; diff --git a/plugins/mini.nix b/plugins/mini.nix index d50c80a..7875b5e 100644 --- a/plugins/mini.nix +++ b/plugins/mini.nix @@ -1,4 +1,8 @@ -{ config, lib, ... }: { +{ + config, + lib, + ... +}: { plugins.mini = { modules = { starter = { @@ -12,15 +16,12 @@ # this items and content_hooks are copied from khanelivim config # but i want to understand them items = { - "__unkeyed-1.builtin_actions".__raw = - "require('mini.starter').sections.builtin_actions()"; - "__unkeyed-2.recent_files_current_directory".__raw = - "require('mini.starter').sections.recent_files(10, true)"; - "__unkeyed-3.recent_files".__raw = - "require('mini.starter').sections.recent_files(10, false)"; + "__unkeyed-1.builtin_actions".__raw = "require('mini.starter').sections.builtin_actions()"; + "__unkeyed-2.recent_files_current_directory".__raw = "require('mini.starter').sections.recent_files(10, true)"; + "__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, false)"; "__unkeyed-4.sessions".__raw = lib.mkIf (config.plugins.mini.enable && lib.hasAttr "sessions" config.plugins.mini.modules) - "require('mini.starter').sections.sessions(5, true)"; + "require('mini.starter').sections.sessions(5, true)"; __unkeyed-5 = lib.mkIf config.plugins.persistence.enable { name = "Restore session"; action.__raw = "[[lua require('persistence').load()]]"; @@ -29,12 +30,9 @@ }; content_hooks = { - "__unkeyed-1.adding_bullet".__raw = - "require('mini.starter').gen_hook.adding_bullet()"; - "__unkeyed-2.indexing".__raw = - "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; - "__unkeyed-3.padding".__raw = - "require('mini.starter').gen_hook.aligning('center', 'center')"; + "__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()"; + "__unkeyed-2.indexing".__raw = "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; + "__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')"; }; }; }; diff --git a/plugins/oil.nix b/plugins/oil.nix index 44fe414..755d47c 100644 --- a/plugins/oil.nix +++ b/plugins/oil.nix @@ -1,12 +1,18 @@ -{ config, lib, ... }: { - plugins.oil = { }; +{ + config, + lib, + ... +}: { + plugins.oil = {}; # add this keymaps only if oil plugin is enabled - keymaps = lib.mkIf config.plugins.oil.enable [{ - action = "Oil"; - key = "-"; - options = { - silent = true; - # TODO what does silent do? - }; - }]; + keymaps = lib.mkIf config.plugins.oil.enable [ + { + action = "Oil"; + key = "-"; + options = { + silent = true; + # TODO what does silent do? + }; + } + ]; } diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix index adf95e5..8489715 100644 --- a/plugins/treesitter.nix +++ b/plugins/treesitter.nix @@ -14,7 +14,7 @@ "c" "markdown" ]; - highlight = { enable = true; }; + highlight = {enable = true;}; }; }; } From 3b828b947fdd35f02a4438ff54e9528b7c519f41 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 21:23:26 +0300 Subject: [PATCH 083/219] add gitsigns --- plugins/default.nix | 12 +++++++++++- plugins/gitsigns.nix | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 plugins/gitsigns.nix diff --git a/plugins/default.nix b/plugins/default.nix index 7292825..ff18101 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,6 +1,13 @@ { # settings of these plugins live in their respective files - imports = [./cmp.nix ./lsp.nix ./mini.nix ./oil.nix ./treesitter.nix]; + imports = [ + ./cmp.nix + ./gitsigns.nix + ./lsp.nix + ./mini.nix + ./oil.nix + ./treesitter.nix + ]; plugins = { # todo comments highlighter @@ -47,5 +54,8 @@ # add buffer tab plugin bufferline.enable = true; + + # git integration + gitsigns.enable = true; }; } diff --git a/plugins/gitsigns.nix b/plugins/gitsigns.nix new file mode 100644 index 0000000..1b38099 --- /dev/null +++ b/plugins/gitsigns.nix @@ -0,0 +1,5 @@ +{ + plugins.gitsigns.settings = { + current_line_blame = true; + }; +} From 91bca05eb6d7e9591b0c35f68b3029c451e92490 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Mar 2025 18:30:23 +0300 Subject: [PATCH 084/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index dd63701..3b1ae9d 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1734904675, - "narHash": "sha256-MoYUUxiLcNwC9woNLoCfXfzcCAHE310DqDcJd/GjM98=", + "lastModified": 1742249870, + "narHash": "sha256-U37ECk3zpfp92D3H0gzfWPyb5sf0RdOdublCq1zjq+w=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "19e8cb01a078fea1e6cf824097978c41af74e24b", + "rev": "fe5b4498e3161191bd93fe0683dff347f6f689df", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741814789, - "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=", + "lastModified": 1742255305, + "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", "owner": "nix-community", "repo": "nixvim", - "rev": "33097dcf776d1fad0ff3842096c4e3546312f251", + "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", "type": "github" }, "original": { From a8b87b89ef3b9d7e63f9f0a354f0c43b6c149dc2 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 19 Mar 2025 20:01:49 +0300 Subject: [PATCH 085/219] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3b1ae9d..b92f303 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1742272065, + "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "3549532663732bfd89993204d40543e9edaec4f2", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742255305, - "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", + "lastModified": 1742396414, + "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", "owner": "nix-community", "repo": "nixvim", - "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", + "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "type": "github" }, "original": { From 5bb771b253493042079712487d4f92a72837b361 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 20 Mar 2025 20:33:25 +0300 Subject: [PATCH 086/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b92f303..1bdf127 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742396414, - "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "lastModified": 1742488644, + "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=", "owner": "nix-community", "repo": "nixvim", - "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13", "type": "github" }, "original": { From 2dccc8f65561e3b03334ef99ffbc49b407cfbd13 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 12:27:44 +0300 Subject: [PATCH 087/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1bdf127..81530b8 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { From f469af2e5d28175466fcaae83256f5ae52e95c29 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 13:34:06 +0300 Subject: [PATCH 088/219] lets just be able to see the lua code --- default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/default.nix b/default.nix index ab57f39..7093209 100644 --- a/default.nix +++ b/default.nix @@ -30,13 +30,13 @@ ripgrep ]; - performance = { - byteCompileLua = { - enable = true; - nvimRuntime = true; - configs = true; - plugins = true; - }; - }; + # performance = { + # byteCompileLua = { + # enable = true; + # nvimRuntime = true; + # configs = true; + # plugins = true; + # }; + # }; }; } From a2066fc6d5de55002301f4081f4d056824ab63fa Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 13:35:23 +0300 Subject: [PATCH 089/219] add comment plugin --- plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/default.nix b/plugins/default.nix index ff18101..9db9e2d 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -57,5 +57,8 @@ # git integration gitsigns.enable = true; + + # commenting related plugin + comment.enable = true; }; } From 9611d8d8a94fd7c9d10db4d5fee8ded97b0772d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 15:25:46 +0300 Subject: [PATCH 090/219] formatting --- plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index 9db9e2d..9a6c7d9 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -57,7 +57,7 @@ # git integration gitsigns.enable = true; - + # commenting related plugin comment.enable = true; }; From 56a8257a3e9aa9d86a0ed1cdb6846fe7ff483560 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 16:37:47 +0300 Subject: [PATCH 091/219] add comment plugin --- plugins/comment.nix | 7 +++++++ plugins/default.nix | 1 + 2 files changed, 8 insertions(+) create mode 100644 plugins/comment.nix diff --git a/plugins/comment.nix b/plugins/comment.nix new file mode 100644 index 0000000..f70040d --- /dev/null +++ b/plugins/comment.nix @@ -0,0 +1,7 @@ +{ + plugins.comment.settings = { + toggler = { + line = ""; + }; + }; +} diff --git a/plugins/default.nix b/plugins/default.nix index 9a6c7d9..43f3180 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,6 +2,7 @@ # settings of these plugins live in their respective files imports = [ ./cmp.nix + ./comment.nix ./gitsigns.nix ./lsp.nix ./mini.nix From e91c012933e8914bef59d08395ae897ba2461012 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 16:38:17 +0300 Subject: [PATCH 092/219] add todo --- plugins/comment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/comment.nix b/plugins/comment.nix index f70040d..a6e2831 100644 --- a/plugins/comment.nix +++ b/plugins/comment.nix @@ -1,7 +1,7 @@ { plugins.comment.settings = { toggler = { - line = ""; + line = ""; # TODO check if this works }; }; } From bca13186402b12c26fcd2ae3ff9651c88dc2197d Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 22:49:26 +0300 Subject: [PATCH 093/219] fix the commenter --- plugins/comment.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/comment.nix b/plugins/comment.nix index a6e2831..aa5a156 100644 --- a/plugins/comment.nix +++ b/plugins/comment.nix @@ -1,7 +1,6 @@ { plugins.comment.settings = { - toggler = { - line = ""; # TODO check if this works - }; + toggler.line = ""; + opleader.line = ""; }; } From 32fe78420b2a335e504d1a391776e08fe3f45e02 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 22:49:40 +0300 Subject: [PATCH 094/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 81530b8..9f4d93e 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742272065, - "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", + "lastModified": 1742456341, + "narHash": "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3549532663732bfd89993204d40543e9edaec4f2", + "rev": "7344a3b78128f7b1765dba89060b015fb75431a7", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742488644, - "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=", + "lastModified": 1742559284, + "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", "owner": "nix-community", "repo": "nixvim", - "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13", + "rev": "c980271267ef146a6c30394c611a97e077471cf2", "type": "github" }, "original": { From 24d256c3dc261725b00c31c3913fe5fcc34e54f0 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 23:00:15 +0300 Subject: [PATCH 095/219] i will see if nixvim command works with this enabled --- default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/default.nix b/default.nix index 7093209..ab57f39 100644 --- a/default.nix +++ b/default.nix @@ -30,13 +30,13 @@ ripgrep ]; - # performance = { - # byteCompileLua = { - # enable = true; - # nvimRuntime = true; - # configs = true; - # plugins = true; - # }; - # }; + performance = { + byteCompileLua = { + enable = true; + nvimRuntime = true; + configs = true; + plugins = true; + }; + }; }; } From 8c827aae95783aae3c0805ea2fac339d1f655767 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 23:30:16 +0300 Subject: [PATCH 096/219] i am a fucking idiot i didnt enable the lsp support --- flake.nix | 3 ++- plugins/default.nix | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 4382f92..2c0fcc5 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ }; outputs = { + self, nixpkgs, nixvim, nix-formatter-pack, @@ -46,7 +47,7 @@ extraSpecialArgs = specialArgs // { - inherit pkgs; + inherit pkgs self; }; }; in { diff --git a/plugins/default.nix b/plugins/default.nix index 43f3180..28dc0b3 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -61,5 +61,8 @@ # commenting related plugin comment.enable = true; + + # lsp support + lsp.enable = true; }; } From 07027c587545887691607810316d2f4dc933d4d4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 00:45:09 +0300 Subject: [PATCH 097/219] i wanna see the init lua --- .github/workflows/{nix.yml => ci.yml} | 4 ++++ 1 file changed, 4 insertions(+) rename .github/workflows/{nix.yml => ci.yml} (90%) diff --git a/.github/workflows/nix.yml b/.github/workflows/ci.yml similarity index 90% rename from .github/workflows/nix.yml rename to .github/workflows/ci.yml index 5eceb94..28af84f 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,10 @@ jobs: - name: Print out the size of /nix/store run: du -sh /nix/store + + - name: Get the init.lua path + run: | + cat result/bin/nixvim-print-init check-formatting: runs-on: ubuntu-24.04 From 1de8bbc90f6c5cbf5b6ac5477cbf4cb5804877b0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 00:49:47 +0300 Subject: [PATCH 098/219] try this --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28af84f..b03fc6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,8 @@ jobs: - name: Get the init.lua path run: | - cat result/bin/nixvim-print-init + init_path=$(grep "init=" result/bin/nixvim-print-init | awk -F'=' '{print $2}') + cat $init_path check-formatting: runs-on: ubuntu-24.04 From dc888960b322c7b1785eb250463bf38ab1c29d7a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 00:55:47 +0300 Subject: [PATCH 099/219] add artifact upload --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b03fc6e..639eecd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,11 +30,17 @@ jobs: - name: Print out the size of /nix/store run: du -sh /nix/store - + - name: Get the init.lua path run: | init_path=$(grep "init=" result/bin/nixvim-print-init | awk -F'=' '{print $2}') - cat $init_path + cp $init_path init.lua + + - name: Upload the artifact + uses: actions/upload-artifact@v4 + with: + name: init + path: init.lua check-formatting: runs-on: ubuntu-24.04 From 0f653f79f9c7e0f5c2814d727e31a77d6d377aba Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 01:04:57 +0300 Subject: [PATCH 100/219] this looks promising --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 639eecd..ba0eb15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,9 +39,19 @@ jobs: - name: Upload the artifact uses: actions/upload-artifact@v4 with: - name: init + name: neovim-configuration path: init.lua + - name: Publish the init.lua to an orphan github branch + run: | + git config --global user.name github-actions + git config --global user.email github-actions@github.com + git checkout --orphan init-lua + git rm -rf . + git add init.lua + git commit -m "Publish init.lua" + git push origin init-lua + check-formatting: runs-on: ubuntu-24.04 steps: From bd5e0bd6512793ec9c3401ca9fe2907f85016987 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 01:10:18 +0300 Subject: [PATCH 101/219] lets not run this on PRs --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba0eb15..529256e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,8 @@ name: Nix on: push: - pull_request: + workflow_dispatch: + jobs: build: runs-on: ubuntu-24.04 From 8595d33ba5a1520fff57eb42dab159c5f00a2224 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 01:20:23 +0300 Subject: [PATCH 102/219] show hidden files --- plugins/oil.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/oil.nix b/plugins/oil.nix index 755d47c..220ae70 100644 --- a/plugins/oil.nix +++ b/plugins/oil.nix @@ -3,7 +3,11 @@ lib, ... }: { - plugins.oil = {}; + plugins.oil.settings = { + view_options = { + show_hidden = false; + }; + }; # add this keymaps only if oil plugin is enabled keymaps = lib.mkIf config.plugins.oil.enable [ { From e6f6e243bfe740008701551a6e003cc8b6dd222b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 01:30:00 +0300 Subject: [PATCH 103/219] dont forget to enable --- plugins/oil.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/oil.nix b/plugins/oil.nix index 220ae70..8297a2b 100644 --- a/plugins/oil.nix +++ b/plugins/oil.nix @@ -5,7 +5,7 @@ }: { plugins.oil.settings = { view_options = { - show_hidden = false; + show_hidden = true; }; }; # add this keymaps only if oil plugin is enabled From 943a474095c9b9d80b289b5fdf3b7d03830f9073 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Mar 2025 10:35:13 +0300 Subject: [PATCH 104/219] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9f4d93e..bbdace4 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742456341, - "narHash": "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c=", + "lastModified": 1742707865, + "narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7344a3b78128f7b1765dba89060b015fb75431a7", + "rev": "dd613136ee91f67e5dba3f3f41ac99ae89c5406b", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742559284, - "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", + "lastModified": 1742862631, + "narHash": "sha256-TGeFlONiQxKbgt39pKPnh5gD0NQ/DD8v6FRisD7q+MI=", "owner": "nix-community", "repo": "nixvim", - "rev": "c980271267ef146a6c30394c611a97e077471cf2", + "rev": "ec92a1816e7deb33d03ff0ab7692fa504e3d1910", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { From ef4a08e2e85c2cf4dde763530edd6f332da3843f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Mar 2025 21:25:42 +0300 Subject: [PATCH 105/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bbdace4..f35f497 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742707865, - "narHash": "sha256-RVQQZy38O3Zb8yoRJhuFgWo/iDIDj0hEdRTVfhOtzRk=", + "lastModified": 1742800061, + "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd613136ee91f67e5dba3f3f41ac99ae89c5406b", + "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742862631, - "narHash": "sha256-TGeFlONiQxKbgt39pKPnh5gD0NQ/DD8v6FRisD7q+MI=", + "lastModified": 1742916868, + "narHash": "sha256-2eN75OsaNpL3FzAs3hz9Xm3+htIP3iLdfRP6PGfOoS8=", "owner": "nix-community", "repo": "nixvim", - "rev": "ec92a1816e7deb33d03ff0ab7692fa504e3d1910", + "rev": "6b95b825529aa2d8536f7684fe64382ef4d15d84", "type": "github" }, "original": { From 710f53089d3a3eef5119a99a754e2c8028c27dcb Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Mar 2025 19:14:45 +0300 Subject: [PATCH 106/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f35f497..6c8cec4 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742916868, - "narHash": "sha256-2eN75OsaNpL3FzAs3hz9Xm3+htIP3iLdfRP6PGfOoS8=", + "lastModified": 1742991302, + "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=", "owner": "nix-community", "repo": "nixvim", - "rev": "6b95b825529aa2d8536f7684fe64382ef4d15d84", + "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622", "type": "github" }, "original": { From 12eb6ecd11b1f36e8a95fb75fca1a0eb615c8c0b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 23:53:31 +0300 Subject: [PATCH 107/219] force --- .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 529256e..471c361 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: git rm -rf . git add init.lua git commit -m "Publish init.lua" - git push origin init-lua + git push --force origin init-lua check-formatting: runs-on: ubuntu-24.04 From 5e99c8c8f07078fef3a7b29ae382356d63d81a1c Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 28 Mar 2025 15:53:03 +0300 Subject: [PATCH 108/219] update readme --- README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index bff36b7..5131eda 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,2 @@ -# Nixvim template -This template gives you a good starting point for configuring nixvim standalone. - -## Configuring - -To start configuring, just add or modify the nix files in `./config`. -If you add a new configuration file, remember to add it to the -[`config/default.nix`](./config/default.nix) file - -## Testing your new configuration - -To test your configuration simply run the following command - -``` -nix run . -``` +This is my neovim configuration. I am using [nix](https://github.com/nixos/nix) and [nixvim](https://github.com/nix-community/nixvim) to generate the neovim configuration. From 1668b8bc97238feff395d7d2fd81997ee6911261 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 28 Mar 2025 15:54:59 +0300 Subject: [PATCH 109/219] mention init.lua --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 5131eda..f128cb9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ This is my neovim configuration. I am using [nix](https://github.com/nixos/nix) and [nixvim](https://github.com/nix-community/nixvim) to generate the neovim configuration. + +I am also pushing the generated neovim configuration in another branch using github actions. You can see my generated init.lua file [here](https://github.com/osbm/osbm-nvim/blob/init-lua/init.lua). + + From 8047dfe331af73305f1ad5278416847030751147 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Mar 2025 22:18:53 +0300 Subject: [PATCH 110/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6c8cec4..204c15a 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742991302, - "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=", + "lastModified": 1743350730, + "narHash": "sha256-i44zW+TWC74EhmhUBpvnt5ZfYDVbZjRzSZdy4vGrKkY=", "owner": "nix-community", "repo": "nixvim", - "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622", + "rev": "a3b16fa00404dce7eccc289ce0b54a8111628d4f", "type": "github" }, "original": { From 864da9f45001e8319328fc44902ff920f1cf9dfc Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 00:31:42 +0300 Subject: [PATCH 111/219] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 204c15a..09a5993 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1743538100, + "narHash": "sha256-Bl/ynRPIb4CdtbEw3gfJYpKiHmRmrKltXc8zipqpO0o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "b9d43b3fe5152d1dc5783a2ba865b2a03388b741", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743350730, - "narHash": "sha256-i44zW+TWC74EhmhUBpvnt5ZfYDVbZjRzSZdy4vGrKkY=", + "lastModified": 1743598191, + "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=", "owner": "nix-community", "repo": "nixvim", - "rev": "a3b16fa00404dce7eccc289ce0b54a8111628d4f", + "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1742659553, - "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", + "lastModified": 1743201766, + "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", "owner": "NuschtOS", "repo": "search", - "rev": "508752835128a3977985a4d5225ff241f7756181", + "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", "type": "github" }, "original": { From 6368ad14ec6b4fd167204d046590eef2afdff455 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 7 Apr 2025 04:16:11 +0300 Subject: [PATCH 112/219] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 09a5993..8c57898 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743448293, - "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743538100, - "narHash": "sha256-Bl/ynRPIb4CdtbEw3gfJYpKiHmRmrKltXc8zipqpO0o=", + "lastModified": 1743814133, + "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9d43b3fe5152d1dc5783a2ba865b2a03388b741", + "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743598191, - "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=", + "lastModified": 1743964204, + "narHash": "sha256-DFktXTeZWVM4kEET+GQHhI0XlrUG0HUAi+hZ7C/MEp0=", "owner": "nix-community", "repo": "nixvim", - "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e", + "rev": "99a2f96cf0f54034201b40d878aa9bb21b72cdf2", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1743201766, - "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", + "lastModified": 1743683223, + "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", "owner": "NuschtOS", "repo": "search", - "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", + "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", "type": "github" }, "original": { From 0bafaff3fe5a24b2b3f36e638ef9695d5c651735 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 8 Apr 2025 23:17:45 +0300 Subject: [PATCH 113/219] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8c57898..d3744cb 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1743964447, + "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743814133, - "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=", + "lastModified": 1744032190, + "narHash": "sha256-KSlfrncSkcu1YE+uuJ/PTURsSlThoGkRqiGDVdbiE/k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b", + "rev": "b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743964204, - "narHash": "sha256-DFktXTeZWVM4kEET+GQHhI0XlrUG0HUAi+hZ7C/MEp0=", + "lastModified": 1744119992, + "narHash": "sha256-XtwL/QfMjJtqO//mAjEfiC7noaAtH/gtQttcBE8dufs=", "owner": "nix-community", "repo": "nixvim", - "rev": "99a2f96cf0f54034201b40d878aa9bb21b72cdf2", + "rev": "7114362f36123a8401f4905c2e833fd9a0c2ddd1", "type": "github" }, "original": { From 95894ef5fc71c098d0c25b1bc0e07a1e94ac0a30 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 9 Apr 2025 01:30:49 +0300 Subject: [PATCH 114/219] add markdown request for my future self --- plugins/treesitter.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix index 8489715..954f711 100644 --- a/plugins/treesitter.nix +++ b/plugins/treesitter.nix @@ -13,6 +13,7 @@ "nix" "c" "markdown" + # TODO: add mdx ]; highlight = {enable = true;}; }; From d9af039bc613f843b6c613381a9a71b8ad08457e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 10 Apr 2025 22:09:17 +0300 Subject: [PATCH 115/219] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d3744cb..14142b0 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744032190, - "narHash": "sha256-KSlfrncSkcu1YE+uuJ/PTURsSlThoGkRqiGDVdbiE/k=", + "lastModified": 1744157173, + "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b", + "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744119992, - "narHash": "sha256-XtwL/QfMjJtqO//mAjEfiC7noaAtH/gtQttcBE8dufs=", + "lastModified": 1744272522, + "narHash": "sha256-cFuxYOLp/6L0eu5wX7xmaF4VhqEm/aT08awzEHGMMQE=", "owner": "nix-community", "repo": "nixvim", - "rev": "7114362f36123a8401f4905c2e833fd9a0c2ddd1", + "rev": "33c3f98fdc9a62183ec7d535bf910e04f141284b", "type": "github" }, "original": { From 00ba86a8620c479d0300c2af922a123226e0c234 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 11 Apr 2025 22:36:52 +0300 Subject: [PATCH 116/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 14142b0..53b110e 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1744232761, + "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744272522, - "narHash": "sha256-cFuxYOLp/6L0eu5wX7xmaF4VhqEm/aT08awzEHGMMQE=", + "lastModified": 1744383153, + "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", "owner": "nix-community", "repo": "nixvim", - "rev": "33c3f98fdc9a62183ec7d535bf910e04f141284b", + "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", "type": "github" }, "original": { From a50c90b515447e17d8b225469fd3583001c0e58d Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Apr 2025 19:38:56 +0000 Subject: [PATCH 117/219] Publish init.lua --- init.lua | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) create mode 100644 init.lua diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..ec72bb4 --- /dev/null +++ b/init.lua @@ -0,0 +1,212 @@ +-- Ignore the user lua configuration +vim.opt.runtimepath:remove(vim.fn.stdpath("config")) -- ~/.config/nvim +vim.opt.runtimepath:remove(vim.fn.stdpath("config") .. "/after") -- ~/.config/nvim/after + +-- Nixvim's internal module table +-- Can be used to share code throughout init.lua +local _M = {} + +-- Set up options {{{ +do + local nixvim_options = { + autoindent = true, + clipboard = "unnamedplus", + expandtab = true, + list = true, + listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕", + number = true, + relativenumber = true, + shiftwidth = 2, + softtabstop = 0, + tabstop = 2, + termguicolors = true, + } + + for k, v in pairs(nixvim_options) do + vim.opt[k] = v + end +end +-- }}} + +require("gruvbox").setup({}) + +vim.cmd([[let $BAT_THEME = 'gruvbox' + +colorscheme gruvbox +]]) +require("nvim-web-devicons").setup({}) + +require("mini.starter").setup({ + content_hooks = { + require("mini.starter").gen_hook.adding_bullet(), + require("mini.starter").gen_hook.indexing("all", { "Builtin actions" }), + require("mini.starter").gen_hook.aligning("center", "center"), + }, + header = " _ _\n ___ ___| |__ _ __ ___ __| | _____ __\n / _ \\/ __| '_ \\| '_ ` _ \\ / _` |/ _ \\ \\ / /\n| (_) \\__ \\ |_) | | | | | || (_| | __/\\ V /\n \\___/|___/_.__/|_| |_| |_(_)__,_|\\___| \\_/\n", + items = { + require("mini.starter").sections.builtin_actions(), + require("mini.starter").sections.recent_files(10, true), + require("mini.starter").sections.recent_files(10, false), + }, +}) + +-- LSP {{{ +do + local __lspServers = { + { extraOptions = { init_options = { diagnosticSeverity = "Hint" } }, name = "typos_lsp" }, + { name = "pyright" }, + { + extraOptions = { + settings = { + nixd = { + formatting = { + command = { + "/nix/store/8dy4rqc44frv0wi4k6akn0a2znmj7bym-nixfmt-unstable-2025-04-04/bin/nixfmt", + }, + }, + nixpkgs = { + expr = 'import (builtins.getFlake "/nix/store/gv8kpbbakfkw91b3xkr0xgkhwzmnqq6r-source").inputs.nixpkgs { }', + }, + }, + }, + }, + name = "nixd", + }, + { name = "dockerls" }, + { name = "astro" }, + } + -- Adding lspOnAttach function to nixvim module lua table so other plugins can hook into it. + _M.lspOnAttach = function(client, bufnr) end + local __lspCapabilities = function() + capabilities = vim.lsp.protocol.make_client_capabilities() + + capabilities = vim.tbl_deep_extend("force", capabilities, require("cmp_nvim_lsp").default_capabilities()) + + return capabilities + end + + local __setup = { + on_attach = _M.lspOnAttach, + capabilities = __lspCapabilities(), + } + + for i, server in ipairs(__lspServers) do + if type(server) == "string" then + require("lspconfig")[server].setup(__setup) + else + local options = server.extraOptions + + if options == nil then + options = __setup + else + options = vim.tbl_extend("keep", options, __setup) + end + + require("lspconfig")[server.name].setup(options) + end + end +end +-- }}} + +local cmp = require("cmp") +cmp.setup({ + mapping = { + [""] = cmp.mapping.close(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.confirm({ select = true }), + }, + sources = { + { name = "nvim_lsp" }, + { name = "path" }, + { keyword_length = 5, name = "buffer" }, + { name = "cmdline" }, + }, +}) + +vim.opt.runtimepath:prepend(vim.fs.joinpath(vim.fn.stdpath("data"), "site")) +require("nvim-treesitter.configs").setup({ + ensure_installed = { "python", "astro", "just", "dockerfile", "json", "yaml", "lua", "nix", "c", "markdown" }, + highlight = { enable = true }, + parser_install_dir = vim.fs.joinpath(vim.fn.stdpath("data"), "site"), +}) + +require("todo-comments").setup({}) + +require("telescope").setup({}) + +local __telescopeExtensions = {} +for i, extension in ipairs(__telescopeExtensions) do + require("telescope").load_extension(extension) +end + +require("smear_cursor").setup({}) + +require("oil").setup({ view_options = { show_hidden = true } }) + +require("noice").setup({}) + +require("nvim-navic").setup({}) + +require("lualine").setup({}) + +require("gitsigns").setup({ current_line_blame = true }) + +require("fidget").setup({}) + +require("Comment").setup({ opleader = { line = "" }, toggler = { line = "" } }) + +require("bufferline").setup({}) + +-- Set up keybinds {{{ +do + local __nixvim_binds = { { action = "Oil", key = "-", mode = "", options = { silent = true } } } + for i, map in ipairs(__nixvim_binds) do + vim.keymap.set(map.mode, map.key, map.action, map.options) + end +end +-- }}} + +-- Set up autogroups {{ +do + local __nixvim_autogroups = { nixvim_binds_LspAttach = { clear = true } } + + for group_name, options in pairs(__nixvim_autogroups) do + vim.api.nvim_create_augroup(group_name, options) + end +end +-- }} +-- Set up autocommands {{ +do + local __nixvim_autocommands = { + { + callback = function(args) + do + local __nixvim_binds = {} + + for i, map in ipairs(__nixvim_binds) do + local options = vim.tbl_extend("keep", map.options or {}, { buffer = args.buf }) + vim.keymap.set(map.mode, map.key, map.action, options) + end + end + end, + desc = "Load keymaps for LspAttach", + event = "LspAttach", + group = "nixvim_binds_LspAttach", + }, + } + + for _, autocmd in ipairs(__nixvim_autocommands) do + vim.api.nvim_create_autocmd(autocmd.event, { + group = autocmd.group, + pattern = autocmd.pattern, + buffer = autocmd.buffer, + desc = autocmd.desc, + callback = autocmd.callback, + command = autocmd.command, + once = autocmd.once, + nested = autocmd.nested, + }) + end +end +-- }} From 801746e96c06751cb5fca2735f750687dfa51020 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 19:20:19 +0300 Subject: [PATCH 118/219] try this meaningless commit for git.osbm.dev --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f128cb9..46b53ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ This is my neovim configuration. I am using [nix](https://github.com/nixos/nix) and [nixvim](https://github.com/nix-community/nixvim) to generate the neovim configuration. + I am also pushing the generated neovim configuration in another branch using github actions. You can see my generated init.lua file [here](https://github.com/osbm/osbm-nvim/blob/init-lua/init.lua). From be66b5c4ec6b06f709c7d3fb3070414e5fa5c676 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 19:33:21 +0300 Subject: [PATCH 119/219] Revert "try this meaningless commit for git.osbm.dev" This reverts commit 801746e96c06751cb5fca2735f750687dfa51020. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 46b53ab..f128cb9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ This is my neovim configuration. I am using [nix](https://github.com/nixos/nix) and [nixvim](https://github.com/nix-community/nixvim) to generate the neovim configuration. - I am also pushing the generated neovim configuration in another branch using github actions. You can see my generated init.lua file [here](https://github.com/osbm/osbm-nvim/blob/init-lua/init.lua). From 4325cb612a86cec0a772b5fe93f12df6d653b407 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 00:30:37 +0300 Subject: [PATCH 120/219] try blink-cmp --- plugins/blink-cmp.nix | 6 ++++++ plugins/default.nix | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 plugins/blink-cmp.nix diff --git a/plugins/blink-cmp.nix b/plugins/blink-cmp.nix new file mode 100644 index 0000000..cb98844 --- /dev/null +++ b/plugins/blink-cmp.nix @@ -0,0 +1,6 @@ +{ + plugins.blink-cmp = { + settings = { + }; + }; +} diff --git a/plugins/default.nix b/plugins/default.nix index 28dc0b3..61e7feb 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -1,6 +1,7 @@ { # settings of these plugins live in their respective files imports = [ + ./blink-cmp.nix ./cmp.nix ./comment.nix ./gitsigns.nix @@ -21,10 +22,10 @@ treesitter.enable = true; # completion plugin - cmp.enable = true; + cmp.enable = false; # blink completion plugin (disabled in favor of cmp) - blink-cmp.enable = false; + blink-cmp.enable = true; # Extensible UI for Neovim notifications and LSP progress messages. fidget.enable = true; From 2621cc6f3e9fb503cfc086f42f3e5ca317760cdc Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 00:30:45 +0300 Subject: [PATCH 121/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 53b110e..b99d8b8 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744383153, - "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", + "lastModified": 1744588744, + "narHash": "sha256-57yF0pk7IUMiwq5XA9X/TX1fuIJYVnBfqhJWD/1+W0Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", + "rev": "d15f5e6f422e353901a425f26925129929e8a38a", "type": "github" }, "original": { From 8c1c951d7201d1e4fa1fa7864e34fff56e5e9d44 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 18:36:39 +0300 Subject: [PATCH 122/219] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b99d8b8..52d55cd 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744588744, - "narHash": "sha256-57yF0pk7IUMiwq5XA9X/TX1fuIJYVnBfqhJWD/1+W0Q=", + "lastModified": 1744669903, + "narHash": "sha256-gtfLmGx/N+BzIck9sGLIfzETxocYjVKo4gmSeH6zfaY=", "owner": "nix-community", "repo": "nixvim", - "rev": "d15f5e6f422e353901a425f26925129929e8a38a", + "rev": "ee9655637cbf898415e09c399bc504180e246d42", "type": "github" }, "original": { From c88d9dbecdbc1846c864cc3140310a587268dd37 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 20 Apr 2025 15:31:11 +0300 Subject: [PATCH 123/219] update flake.lock --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 52d55cd..d4f790e 100644 --- a/flake.lock +++ b/flake.lock @@ -53,16 +53,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744157173, - "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a39c6e495eefabc935d8ddf66aa45d85b85fa3f", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744669903, - "narHash": "sha256-gtfLmGx/N+BzIck9sGLIfzETxocYjVKo4gmSeH6zfaY=", + "lastModified": 1745099712, + "narHash": "sha256-fj/S+L9nQyJYdWFk3+8BGPp4tg5rY3uaF6jGADm7OA0=", "owner": "nix-community", "repo": "nixvim", - "rev": "ee9655637cbf898415e09c399bc504180e246d42", + "rev": "710f9cbd520b8e78fa95d4c5d255891e2b14a277", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { From 1fc8a27649406f669f0a0d38ec950453f49d7c0f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Apr 2025 00:56:05 +0300 Subject: [PATCH 124/219] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d4f790e..87ffb8f 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745099712, - "narHash": "sha256-fj/S+L9nQyJYdWFk3+8BGPp4tg5rY3uaF6jGADm7OA0=", + "lastModified": 1745697134, + "narHash": "sha256-WvozW6IXhuRfGlDy7S777S5fjZeGSOEIRRbo2eK6K5o=", "owner": "nix-community", "repo": "nixvim", - "rev": "710f9cbd520b8e78fa95d4c5d255891e2b14a277", + "rev": "8d8a8568968f0e77b90749929c4683633d1ebdf6", "type": "github" }, "original": { From 862cdf8829b524ac5d7a4e1188c37e04dfd8951d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Apr 2025 19:20:11 +0300 Subject: [PATCH 125/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 87ffb8f..8431aa6 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1745794561, + "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745697134, - "narHash": "sha256-WvozW6IXhuRfGlDy7S777S5fjZeGSOEIRRbo2eK6K5o=", + "lastModified": 1745927529, + "narHash": "sha256-9ofvr5N24TOLjJTkUNdoaHE20l/+r04/9PMw4tmj6dE=", "owner": "nix-community", "repo": "nixvim", - "rev": "8d8a8568968f0e77b90749929c4683633d1ebdf6", + "rev": "944a3168813367bb71389c53b94992f69b5be79f", "type": "github" }, "original": { From c871d7a1db48594fe82429f3cc71f63fa5709fdb Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 5 May 2025 12:45:51 +0300 Subject: [PATCH 126/219] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8431aa6..1f419e9 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745377448, - "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", + "lastModified": 1746300365, + "narHash": "sha256-thYTdWqCRipwPRxWiTiH1vusLuAy0okjOyzRx4hLWh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", + "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745927529, - "narHash": "sha256-9ofvr5N24TOLjJTkUNdoaHE20l/+r04/9PMw4tmj6dE=", + "lastModified": 1746387720, + "narHash": "sha256-x8k0DKiQYRNaf9Hg+di+WCKxb76zJVWSjKOlPiuc22o=", "owner": "nix-community", "repo": "nixvim", - "rev": "944a3168813367bb71389c53b94992f69b5be79f", + "rev": "7d18194a22325f212e17eb876d9c00afcc434113", "type": "github" }, "original": { From 21f521695929a042c94312e6c956b9bb5f7b30a3 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 14 May 2025 13:17:07 +0300 Subject: [PATCH 127/219] update flake.lock --- flake.lock | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 1f419e9..50923e6 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746300365, - "narHash": "sha256-thYTdWqCRipwPRxWiTiH1vusLuAy0okjOyzRx4hLWh4=", + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", "type": "github" }, "original": { @@ -125,14 +125,15 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_2" }, "locked": { - "lastModified": 1746387720, - "narHash": "sha256-x8k0DKiQYRNaf9Hg+di+WCKxb76zJVWSjKOlPiuc22o=", + "lastModified": 1747173002, + "narHash": "sha256-06aYCSKtw1nlDn7PEAXwAYncSn8Fky4rtYrALep7f6I=", "owner": "nix-community", "repo": "nixvim", - "rev": "7d18194a22325f212e17eb876d9c00afcc434113", + "rev": "1c53ad9b2f5fd4a3c1f644d03895cda7756c92a3", "type": "github" }, "original": { @@ -217,6 +218,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", From 11ad650d6bec470c064ea217ebc001e80155edbe Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 19 May 2025 17:24:52 +0300 Subject: [PATCH 128/219] add new plugin --- plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/default.nix b/plugins/default.nix index 61e7feb..59b74eb 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -65,5 +65,8 @@ # lsp support lsp.enable = true; + + # gives me hardtime about my bad habits + hardtime.enable = true; }; } From 7568f6ed0daa22d33766b47c6ab7adc4b065a875 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 19 May 2025 17:25:32 +0300 Subject: [PATCH 129/219] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 50923e6..9da4f4e 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "lastModified": 1747467164, + "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1747173002, - "narHash": "sha256-06aYCSKtw1nlDn7PEAXwAYncSn8Fky4rtYrALep7f6I=", + "lastModified": 1747610601, + "narHash": "sha256-vfK+K+bQZF5fHdsyjDECx6t5yv6Gg51B6i4AVvneAxU=", "owner": "nix-community", "repo": "nixvim", - "rev": "1c53ad9b2f5fd4a3c1f644d03895cda7756c92a3", + "rev": "f4a7447d27d3c43c59555c053c203f1abb45e899", "type": "github" }, "original": { From ed901855e4cfef2c10fdf9b4d46f9cec80e91622 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 29 May 2025 13:21:59 +0300 Subject: [PATCH 130/219] add license --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0a54b1a --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Osman F Bayram + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From cedab38bfd8e2ceabe020dd523e66350a3f5d535 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 29 May 2025 13:22:09 +0300 Subject: [PATCH 131/219] update flake.lock --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 9da4f4e..f6139ae 100644 --- a/flake.lock +++ b/flake.lock @@ -53,16 +53,16 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747467164, - "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", + "lastModified": 1748344075, + "narHash": "sha256-PsZAY3H0e/PBoDVn4fLwGEmeSwESj7SZPZ6CMfgbWFU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", + "rev": "e0042dedfbc9134ef973f64e5c7f56a38cc5cc97", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1747610601, - "narHash": "sha256-vfK+K+bQZF5fHdsyjDECx6t5yv6Gg51B6i4AVvneAxU=", + "lastModified": 1748477044, + "narHash": "sha256-X6tA9XTFhgZqZGUCqP8F8/Fl0/ZQoo4husc3JoHa0fk=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4a7447d27d3c43c59555c053c203f1abb45e899", + "rev": "28a2abf874c3ecbbf91edf1b2b9fe595f0f54099", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1748298102, + "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", "type": "github" }, "original": { From 57e978815b82564b4e0bfdbc7aa558c0da555757 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Jun 2025 01:08:21 +0300 Subject: [PATCH 132/219] wha --- plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index 59b74eb..660d56f 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -24,7 +24,7 @@ # completion plugin cmp.enable = false; - # blink completion plugin (disabled in favor of cmp) + # blink completion plugin blink-cmp.enable = true; # Extensible UI for Neovim notifications and LSP progress messages. From 35729d451c3fe92399f9e428d4243a79e4aa42aa Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Jun 2025 01:08:48 +0300 Subject: [PATCH 133/219] got too hard :[ --- plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/default.nix b/plugins/default.nix index 660d56f..20056ff 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -67,6 +67,6 @@ lsp.enable = true; # gives me hardtime about my bad habits - hardtime.enable = true; + hardtime.enable = false; # TODO: enable when I get used to my new keyboard }; } From c601f9989ade6b13525483fb0e3a68ba44164e29 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Jun 2025 01:09:25 +0300 Subject: [PATCH 134/219] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f6139ae..54a340a 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748344075, - "narHash": "sha256-PsZAY3H0e/PBoDVn4fLwGEmeSwESj7SZPZ6CMfgbWFU=", + "lastModified": 1748406211, + "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0042dedfbc9134ef973f64e5c7f56a38cc5cc97", + "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748477044, - "narHash": "sha256-X6tA9XTFhgZqZGUCqP8F8/Fl0/ZQoo4husc3JoHa0fk=", + "lastModified": 1748564405, + "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", "owner": "nix-community", "repo": "nixvim", - "rev": "28a2abf874c3ecbbf91edf1b2b9fe595f0f54099", + "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", "type": "github" }, "original": { From e81909fefe7910f4553b64d296daef34c832c526 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Jun 2025 23:56:10 +0300 Subject: [PATCH 135/219] set leader key keymap --- default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index ab57f39..bd21b78 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,8 @@ config = { # Use as leader key - # globals.mapleader = " "; + globals.mapleader = " "; + globals.maplocalleader = " "; # Set 'vi' and 'vim' aliases to nixvim viAlias = true; From 8af06711b8ae616345d3a2774113a4ab8a0d345f Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 5 Jun 2025 18:25:13 +0300 Subject: [PATCH 136/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 54a340a..2e74adb 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1748564405, - "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", + "lastModified": 1749107808, + "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", "owner": "nix-community", "repo": "nixvim", - "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", + "rev": "635a9e770f77a7c586c60f84b1debf054318034a", "type": "github" }, "original": { From 810fa58928c9da8f65466b9a155e8660f4f16694 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 11:20:42 +0300 Subject: [PATCH 137/219] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2e74adb..4132e1c 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1749107808, - "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", + "lastModified": 1749496904, + "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", "owner": "nix-community", "repo": "nixvim", - "rev": "635a9e770f77a7c586c60f84b1debf054318034a", + "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", "type": "github" }, "original": { From 9fad4826a62a21d956a4694a6b25508ad7527abf Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 18:28:47 +0300 Subject: [PATCH 138/219] add which-key --- plugins/default.nix | 3 +++ plugins/which-key.nix | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 plugins/which-key.nix diff --git a/plugins/default.nix b/plugins/default.nix index 20056ff..c9dc1b5 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -9,6 +9,7 @@ ./mini.nix ./oil.nix ./treesitter.nix + ./which-key.nix ]; plugins = { @@ -68,5 +69,7 @@ # gives me hardtime about my bad habits hardtime.enable = false; # TODO: enable when I get used to my new keyboard + + which-key.enable = true; }; } diff --git a/plugins/which-key.nix b/plugins/which-key.nix new file mode 100644 index 0000000..6bae82e --- /dev/null +++ b/plugins/which-key.nix @@ -0,0 +1,6 @@ +{ + plugins.which-key.settings = { + delay = 500; + + }; +} From 49e286b41c11dcb3848fb53b06ddcac8eb89a89b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 18:40:21 +0300 Subject: [PATCH 139/219] finally --- plugins/which-key.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/which-key.nix b/plugins/which-key.nix index 6bae82e..59973ae 100644 --- a/plugins/which-key.nix +++ b/plugins/which-key.nix @@ -1,6 +1,8 @@ { plugins.which-key.settings = { delay = 500; - + win = { + border = "single"; + }; }; } From 3192b7db201dd5a5cd52ce04d4c421c80abc8b85 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 23:07:54 +0300 Subject: [PATCH 140/219] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4132e1c..5ae264e 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748406211, - "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", + "lastModified": 1749523198, + "narHash": "sha256-How2kQw0psKmCdXgojc95Sf3K5maHB3qfINxTZFCAPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", + "rev": "cdc68935eba9f86d155585fdf6f17af6824f38ac", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1749496904, - "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", + "lastModified": 1749761870, + "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", + "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749531675, + "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "4029d450d0266909ee52775849b7da54e79b328e", "type": "github" }, "original": { From 08527bdc1297630a17160e015aec083ee7c3a0a9 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 23:29:51 +0300 Subject: [PATCH 141/219] update color scheme --- config/colorscheme.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config/colorscheme.nix b/config/colorscheme.nix index f124d28..18da321 100644 --- a/config/colorscheme.nix +++ b/config/colorscheme.nix @@ -1 +1,8 @@ -{colorschemes = {gruvbox.enable = true;};} +{ + colorschemes = { + catppuccin = { + enable = true; + settings.flavor = "mocha"; + }; + }; +} From ed465411313591207c3644068ad11add91e27b99 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:01:07 +0300 Subject: [PATCH 142/219] add comment --- plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/default.nix b/plugins/default.nix index c9dc1b5..0af3fea 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -70,6 +70,7 @@ # gives me hardtime about my bad habits hardtime.enable = false; # TODO: enable when I get used to my new keyboard + # tip pop-up which-key.enable = true; }; } From 0b1b25d11b822aca6eb4847815d67f6e0174c18b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:40:17 +0300 Subject: [PATCH 143/219] add this section --- default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/default.nix b/default.nix index bd21b78..b3b896b 100644 --- a/default.nix +++ b/default.nix @@ -31,6 +31,23 @@ 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; From 608bf58ff8490ac33f518c121589dfe86280710d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 01:45:40 +0300 Subject: [PATCH 144/219] 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 145/219] 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 146/219] 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 147/219] 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 148/219] 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 149/219] 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 150/219] 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 151/219] 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 152/219] 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 153/219] 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 154/219] 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 155/219] 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 156/219] 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 157/219] 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 158/219] 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 159/219] 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 160/219] 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 161/219] 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 162/219] 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 163/219] 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 164/219] 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 165/219] 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 166/219] 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 167/219] 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 168/219] 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 169/219] 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 170/219] 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 171/219] 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 172/219] 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 173/219] 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 174/219] 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 175/219] 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 176/219] 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 177/219] 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 178/219] 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 179/219] 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 180/219] 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 181/219] 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 182/219] 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 183/219] 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 184/219] 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 185/219] 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 186/219] 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 187/219] 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 188/219] 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 189/219] 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 190/219] 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 191/219] 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 192/219] 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 193/219] 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 194/219] 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 195/219] 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 196/219] 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 197/219] 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 198/219] 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 199/219] 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 200/219] 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 201/219] 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 202/219] 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 203/219] 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 204/219] 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 205/219] 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 206/219] 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 207/219] 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 208/219] 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 209/219] 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 210/219] 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 211/219] 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 212/219] 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 213/219] 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 214/219] 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 215/219] 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 216/219] 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 217/219] 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 218/219] 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 219/219] 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": {