diff --git a/flake.lock b/flake.lock index f125fe7..4c13d1b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,21 @@ "type": "gitlab" } }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -41,7 +56,65 @@ "type": "github" } }, + "myneovim": { + "inputs": { + "nil": "nil", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1663440717, + "narHash": "sha256-//t5hYTdJ2PlN62Sh1TuP2XZw+n0DHY58RZXqfwA77s=", + "rev": "04533149717ba7d45987444bd7885a13e10ce6f6", + "revCount": 18, + "type": "git", + "url": "https://git.pleshevski.ru/mynix/neovim" + }, + "original": { + "rev": "04533149717ba7d45987444bd7885a13e10ce6f6", + "type": "git", + "url": "https://git.pleshevski.ru/mynix/neovim" + } + }, + "nil": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1663265701, + "narHash": "sha256-0sZULukbNmlhkH2+dwWK83zN5gRaZCoUBlSjMENg2o8=", + "owner": "oxalica", + "repo": "nil", + "rev": "9e395607ad6dd8e771b8b0979ae738e845e7000c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1662096612, + "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1663087123, "narHash": "sha256-cNIRkF/J4mRxDtNYw+9/fBNq/NOA2nCuPOa3EdIyeDs=", @@ -61,7 +134,35 @@ "inputs": { "dedsec-grub-theme": "dedsec-grub-theme", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "myneovim": "myneovim", + "nixpkgs": "nixpkgs_2" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "myneovim", + "nil", + "flake-utils" + ], + "nixpkgs": [ + "myneovim", + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1662173844, + "narHash": "sha256-+ZgW98Y8fZkgFSylE+Mzalumw+kw3SVivZznbJqQaj8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8ac6d40380dc4ec86f1ff591d5c14c8ae1d77a18", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "utils": { @@ -78,6 +179,21 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1dc9089..4339faa 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,11 @@ url = "gitlab:VandalByte/dedsec-grub-theme"; inputs.nixpkgs.follows = "nixpkgs"; }; + + myneovim = { + url = "git+https://git.pleshevski.ru/mynix/neovim?rev=04533149717ba7d45987444bd7885a13e10ce6f6"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs @ { self, nixpkgs, ... }: diff --git a/home/progs/nvim/default.nix b/home/progs/nvim/default.nix index 27128c9..7c6deaf 100644 --- a/home/progs/nvim/default.nix +++ b/home/progs/nvim/default.nix @@ -56,9 +56,11 @@ in }; config = mkIf cfg.enable { - home.packages = additionalPackages; + home.packages = with pkgs; [ myneovim ]; + /* + home.packages = additionalPackages; - programs.neovim = { + programs.neovim = { enable = true; extraConfig = vimConfig; plugins = myVimPlugins; @@ -68,11 +70,12 @@ in enable = true; settings = cocConfig; }; - }; + }; - xdg.configFile = { + xdg.configFile = { "nvim/lua".source = ./lua; - }; + }; + */ home.sessionVariables = mkIf cfg.default { EDITOR = "nvim"; diff --git a/outputs/home.nix b/outputs/home.nix index 9856127..1370bdb 100644 --- a/outputs/home.nix +++ b/outputs/home.nix @@ -3,7 +3,13 @@ with inputs; let - pkgs = import nixpkgs { inherit system; }; + pkgs = import nixpkgs { + inherit system; + + overlays = [ + inputs.myneovim.overlays.${system} + ]; + }; in { homeMe = home-manager.lib.homeManagerConfiguration {