daniel/dotfiles
1
0
Fork 0
Code Actions Activity

nvim Updates

Browse source
This commit is contained in:
Daniel Kempkens 2022-04-24 13:30:38 +02:00
parent ee45da74f4
commit 04c23cf778
4 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/nvim/nifoc/formatting.fnl
View file

@ -15,13 +15,13 @@
(fn mod.maybe-format-buffer [] (fn mod.maybe-format-buffer []
(let [formatprg (vim.opt_local.formatprg:get) (let [formatprg (vim.opt_local.formatprg:get)
formatprg-exe (-> formatprg (vim.split " " {:trimempty true}) (. 1)) formatprg-exe (-> formatprg (vim.split " " {:trimempty true}) (. 1))]
neoformat (.. "Neoformat " formatprg-exe)]
(if (= b.nifoc_lsp_formatter_enabled 1) (if (= b.nifoc_lsp_formatter_enabled 1)
(vim.lsp.buf.formatting_sync nil 1000) (vim.lsp.buf.formatting_sync nil 1000)
(not= formatprg-exe nil) (not= formatprg-exe nil)
(cmd (.. "try | undojoin | " neoformat " | catch /E790/ | " neoformat (let [neoformat (.. "Neoformat " formatprg-exe)]
" | endtry"))))) (cmd (.. "try | undojoin | " neoformat " | catch /E790/ | "
neoformat " | endtry"))))))
mod) mod)

7
config/nvim/nifoc/nix.fnl Normal file
View file

@ -0,0 +1,7 @@
;; Move certain PATH entries to the end of the variable, because XCode CLI is not installed
;; (and I don't want to see the prompt)
(let [current-path vim.env.PATH
move-paths ":/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
new-path (-> current-path (string.gsub move-paths "") (.. move-paths))]
(set vim.env.PATH new-path))

24
flake.lock
View file

@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650478719, "lastModified": 1650784624,
"narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=", "narHash": "sha256-RTYGFBlxEmhhLLH9UfObyz2d4alhCSf6NQpyID7Mqvg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644", "rev": "65a32578d9b1394bea5c6336721ec392aadc89fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -96,11 +96,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1650672068, "lastModified": 1650772118,
"narHash": "sha256-lt++oCZbD3+qrdMlqVBmecckUExg9A1PhLWkImqLgPM=", "narHash": "sha256-NraNzPwGZGBu6RXirOJQ8932uqsrQ3Qet9GsZF7RJ2E=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "4e4914ab2e523f100c06fc5fb253f8625cc67232", "rev": "843d9223a14c599fda1b2abf1e7072be738fb831",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650701691, "lastModified": 1650788138,
"narHash": "sha256-JwvkAgRMtdMKQLjoBFcCu7IyAlAJUisPiksLONWGp1A=", "narHash": "sha256-Iot/SCprDCfV8TpZnYd6dSbpwaBlZHDhDz/3Iq+s1j8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "ee0dc151a425951a0a6d95a7164b7184e6e0766a", "rev": "59ae20737472f594ab0922a7cd74124fc13cb78a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1650647760, "lastModified": 1650726686,
"narHash": "sha256-Ng8CGYLSTxeI+oEux0x+tSRA6K7ydoyfJNQf56ld+Uo=", "narHash": "sha256-hE5PCqQlsdgWH3AUTwesvjZWs5ZUZ8SjMS5cnFB6W54=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b80f570a92d04e8ace67ff09c34aa48708a5c88c", "rev": "3c0f57e36ed0cf9947281e3b31f1bebb7ce5d4a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
programs/nvim/plugins.nix
View file

@ -91,23 +91,23 @@
}; };
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2022-04-23"; version = "2022-04-24";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "909b5d26fddad5043e354046571e7c7353b53b61"; rev = "91f912f2d17d1e2048cccca537d78f48753d7458";
sha256 = "1x1b7r73g41nqra4bar0k8alzawzc81xxcgj9cw05r3504imvnf4"; sha256 = "1jpmr41mknd01pwbjmyix1b2amm27jxpdbb2afaqh2yf5k7v1nsy";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow"; pname = "nvim-ts-rainbow";
version = "2022-04-17"; version = "2022-04-24";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "p00f"; owner = "p00f";
repo = "nvim-ts-rainbow"; repo = "nvim-ts-rainbow";
rev = "04284dc97eac0d0ecfea68e10be824d1a6585de0"; rev = "a7767e2a1761078abb97f6516e45c56147e0952e";
sha256 = "1i8i58m1r1322wvs8jl0nzs6lgqw78ibkp5hah07kgi2ynzr3dj3"; sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -362,12 +362,12 @@
}; };
lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "lualine.nvim"; pname = "lualine.nvim";
version = "2022-04-18"; version = "2022-04-24";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-lualine"; owner = "nvim-lualine";
repo = "lualine.nvim"; repo = "lualine.nvim";
rev = "18a07f790ed7ed1f11d1b130c02782e9dfd8dd7d"; rev = "de2c4beaf50552647273b5eaa33095e90a6d00a0";
sha256 = "09bfj2g7jn693xwi5f3zk90p4vg6jpijr1y8pl5k4hjbrg8nb68k"; sha256 = "0whcwy5xmkmmj7lb4w9g31rm6clx1pcnng3q22hcwyvrlxbkk263";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };