diff --git a/flake.lock b/flake.lock index 3778b4c..3959e0c 100644 --- a/flake.lock +++ b/flake.lock @@ -599,17 +599,17 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1649225869, - "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=", + "lastModified": 1649456639, + "narHash": "sha256-rZCjaEAZgOtT9kYTBigksof64SqKAXOuoHhlzHvfl0E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", + "rev": "c48167590e3258daac6ab12a41bc2b7341e9b2ec", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", + "rev": "c48167590e3258daac6ab12a41bc2b7341e9b2ec", "type": "github" } }, diff --git a/flake.nix b/flake.nix index b938c20..5e3c000 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # https://status.nixos.org/ # # This ensures that we always use the official nix cache. - nixpkgs.url = "github:nixos/nixpkgs/b6966d911da89e5a7301aaef8b4f0a44c77e103c"; + nixpkgs.url = "github:nixos/nixpkgs/c48167590e3258daac6ab12a41bc2b7341e9b2ec"; darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/neovim.nix b/home/neovim.nix index f757541..afceee9 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -1,27 +1,41 @@ { pkgs, inputs, system, ... }: -let - neovim-nightly = inputs.neovim-nightly-overlay.packages.${system}.neovim; -in { programs.neovim = { enable = true; - package = neovim-nightly; - viAlias = true; - # withNodeJs = true; + package = inputs.neovim-nightly-overlay.packages.${system}.neovim; extraPackages = [ ]; + # Full list here, + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix plugins = with pkgs.vimPlugins; [ + # Status bar for vim vim-airline + + # Preferred theme papercolor-theme + + telescope-nvim + telescope-zoxide ]; extraConfig = '' + set nobackup + + " Use spave instead of \ as leader key, like doom-emacs + map + " papercolor-theme " set t_Co=256 " This is may or may not needed. set background=light colorscheme PaperColor + + " telescope + nnoremap ff Telescope find_files + nnoremap fg Telescope live_grep + nnoremap fb Telescope buffers + nnoremap fh Telescope help_tags ''; };