daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps

Browse source
This commit is contained in:
Daniel Kempkens 2022-06-05 22:50:28 +02:00
parent 8fa207a8dd
commit 07c096dffd
5 changed files with 119 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
flake.lock
View file

@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653943687, "lastModified": 1654422613,
"narHash": "sha256-xXW9t24HLf89+n/92kOqRRfOBE3KDna+9rAOefs5WSQ=", "narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8f3e26705178cc8c1d982d37d881fc0d5b5b1837", "rev": "20703892473d01c70fb10248442231fe94f4ceb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -96,11 +96,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1653958105, "lastModified": 1654382923,
"narHash": "sha256-ZY5R/CHxneWdMoAtI8l+utQopIe2vyliPu/MEEj+P+w=", "narHash": "sha256-ZE8kGYScCnb/Z+CyeKrFXhcu7wJ6BBlZ8D3C1OcOQpo=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "b7d70de345dbdc52bc2690246b6a329a3b6bda09", "rev": "e13dcdf162d166084f19f1dcf3b79071290d2766",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653985206, "lastModified": 1654416917,
"narHash": "sha256-dhZq+HbBXLsE6B3ta3tryOZJBuW9CDDhmIWRK9RUfzk=", "narHash": "sha256-DQ4mSFJ0q4hUkyNzr/ZJzHYEriBVZY1eDtQha3k04yk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "ca286837138cc963c391195a87e410e48c031083", "rev": "e65d79d4a7ff35e29aa2a4d3d83b626e84bb917c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653918805, "lastModified": 1654398695,
"narHash": "sha256-6ahwAnBNGgqSNSn/6RnsxrlFi+fkA+RyT6o/5S1915o=", "narHash": "sha256-Kw/KeoFXszNsF5mORP45mrxCP+k9Aq03hWcuWCL9sdI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a0a69be4b5ee63f1b5e75887a406e9194012b492", "rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653785090, "lastModified": 1654390147,
"narHash": "sha256-fj0PjfoKPv/WhpBmUZaiDos1I+2/vH2Rn5hKsdFwEcw=", "narHash": "sha256-pvxzMzJp5enao7KjeNh+7C77glbImcOvax0aF35zfGo=",
"owner": "arqv", "owner": "arqv",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "ac04bc02a012c75804d9c96d0e2dab185c83bace", "rev": "1c372df074f2e97faa0d191a89206620fcf528fc",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
home.nix
View file

@ -65,16 +65,6 @@
$DRY_RUN_CMD rm -f $HOME/.cache/nvim/luacache* $DRY_RUN_CMD rm -f $HOME/.cache/nvim/luacache*
echo 'Done' echo 'Done'
''; '';
updateRuntimeDependencies = lib.hm.dag.entryAfter [ "updateAppCaches" ] ''
# neovim
nvim_bin="$newGenPath/home-path/bin/nvim"
if [ -e "$nvim_bin" ]; then
echo -n '[nvim] Running TSUpdateSync ... '
$DRY_RUN_CMD $nvim_bin -c 'try | execute "TSUpdateSync" | echo "Done" | catch /.*/ | echo "Command not found" | endtry | q' --headless
printf '\n'
fi
'';
}; };
}; };

63
programs/nvim/default.nix
View file

@ -28,8 +28,6 @@ in
''; '';
extraPackages = with pkgs; [ extraPackages = with pkgs; [
gcc
gnumake
git git
nodejs nodejs
tree-sitter tree-sitter
@ -98,12 +96,6 @@ in
dracula-nvim dracula-nvim
# Syntax # Syntax
{
plugin = nvim-treesitter;
config = builtins.readFile ../../config/nvim/plugins/treesitter.fnl;
type = "fennel";
}
nvim-ts-rainbow nvim-ts-rainbow
playground playground
@ -115,6 +107,19 @@ in
} }
telescope-zf-native-nvim telescope-zf-native-nvim
{
plugin = project-nvim;
config = builtins.readFile ../../config/nvim/plugins/project.fnl;
type = "fennel";
}
{
plugin = todo-comments-nvim;
config = builtins.readFile ../../config/nvim/plugins/todo-comments.fnl;
type = "fennel";
}
telescope-ui-select-nvim telescope-ui-select-nvim
telescope-toggleterm-nvim telescope-toggleterm-nvim
@ -281,16 +286,40 @@ in
# Fixes # Fixes
FixCursorHold-nvim FixCursorHold-nvim
# Telescope # Syntax
{ {
plugin = project-nvim; plugin = nvim-treesitter.withPlugins (
config = builtins.readFile ../../config/nvim/plugins/project.fnl; plugins: with plugins; [
type = "fennel"; tree-sitter-bash
} tree-sitter-comment
tree-sitter-css
{ tree-sitter-dockerfile
plugin = todo-comments-nvim; tree-sitter-elixir
config = builtins.readFile ../../config/nvim/plugins/todo-comments.fnl; tree-sitter-erlang
tree-sitter-fennel
tree-sitter-fish
tree-sitter-heex
tree-sitter-html
tree-sitter-http
tree-sitter-javascript
tree-sitter-jsdoc
tree-sitter-json
tree-sitter-lua
tree-sitter-make
tree-sitter-nix
tree-sitter-query
tree-sitter-regex
tree-sitter-ruby
tree-sitter-scss
tree-sitter-svelte
tree-sitter-toml
tree-sitter-tsx
tree-sitter-typescript
tree-sitter-vim
tree-sitter-yaml
]
);
config = builtins.readFile ../../config/nvim/plugins/treesitter.fnl;
type = "fennel"; type = "fennel";
} }

99
programs/nvim/plugins.nix
View file

@ -25,12 +25,12 @@
}; };
plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "plenary.nvim"; pname = "plenary.nvim";
version = "2022-05-21"; version = "2022-06-01";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-lua"; owner = "nvim-lua";
repo = "plenary.nvim"; repo = "plenary.nvim";
rev = "1da13add868968802157a0234136d5b1fbc34dfe"; rev = "54b2e3d58f567983feabaeb9408eccf6b7f32206";
sha256 = "019kj1iv941shzzj8343yqavw894f4819r5h58p4fhs3fk40qq6b"; sha256 = "1ldjdc7yq4awlllr9dcv8fnkcwgdpvj0py5mhvx3v1yjniwrkn2i";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -69,12 +69,12 @@
}; };
substitute-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { substitute-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "substitute.nvim"; pname = "substitute.nvim";
version = "2022-05-30"; version = "2022-06-03";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "gbprod"; owner = "gbprod";
repo = "substitute.nvim"; repo = "substitute.nvim";
rev = "400819cefa697010a7af02e3a94c1efb9b120f8b"; rev = "0a9eec9e7a650396f42481a96e0ed1dc7553db86";
sha256 = "03qix89s5w31jddidky80w6byv6c5njlbq48173f4cmdvrag7m86"; sha256 = "1l3grsln0b7zyiiqjwbw83prqgjl7chzprgnwsmj3hkck65zhis0";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -100,17 +100,6 @@
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2022-05-31";
src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "5e24e8d6a7b81755b7374f04b914d1e2b867f49a";
sha256 = "13ki34ycz1xq4zz6ds68jpgyqgbdssadxnsyq9g8nzw43nrg59ch";
fetchSubmodules = false;
};
};
nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow"; pname = "nvim-ts-rainbow";
version = "2022-05-28"; version = "2022-05-28";
@ -135,12 +124,12 @@
}; };
telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "telescope.nvim"; pname = "telescope.nvim";
version = "2022-05-29"; version = "2022-06-02";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "54be102e20ee4acaaa17e9fce8be07fb586630df"; rev = "d3aad43b3fcf707052f7dd8a7c7072fa69773f3c";
sha256 = "0w4h02xkdmjjmz5fr98h24ylcq7jdm3mg1x9hka9cqdvdsdbck1s"; sha256 = "0m84qnm7pxn26a4znf0gxrz2q0kr951lqzk7pph54xdxrcvjha10";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -162,6 +151,28 @@
rm -rf ./xdg_cache rm -rf ./xdg_cache
''; '';
}; };
project-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "project.nvim";
version = "2022-05-29";
src = pkgs.fetchFromGitHub {
owner = "ahmedkhalf";
repo = "project.nvim";
rev = "541115e762764bc44d7d3bf501b6e367842d3d4f";
sha256 = "0vabnhb5d8nc25ap9zixazmr4sm5ylq0iqzsc89cc3h1907xp6lz";
fetchSubmodules = false;
};
};
todo-comments-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "todo-comments.nvim";
version = "2022-01-19";
src = pkgs.fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
rev = "98b1ebf198836bdc226c0562b9f906584e6c400e";
sha256 = "02qjn45qpvxhw7zifw0a86alika5r8b5a98y1199jpdx2d7zks7j";
fetchSubmodules = false;
};
};
telescope-ui-select-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { telescope-ui-select-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "telescope-ui-select.nvim"; pname = "telescope-ui-select.nvim";
version = "2022-04-30"; version = "2022-04-30";
@ -186,12 +197,12 @@
}; };
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2022-05-31"; version = "2022-06-03";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "84252b08b7f9831b0b1329f2a90ff51dd873e58f"; rev = "2a455c148341c4faf2dd60401397fed35d084c59";
sha256 = "0dv2ss2xyf92d59mvjfp3wfr14k80qwm5ijda9yl0pgvj1fwrn2r"; sha256 = "1plhjirvg4xvh147xdr339z7jvw2mf973rkahhgxfwfzp1g1gjq9";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -373,12 +384,12 @@
}; };
neoformat = pkgs.vimUtils.buildVimPluginFrom2Nix { neoformat = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "neoformat"; pname = "neoformat";
version = "2022-05-27"; version = "2022-06-02";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "sbdchd"; owner = "sbdchd";
repo = "neoformat"; repo = "neoformat";
rev = "c010862fa151f1d6a009d94a0acbe49514781cdc"; rev = "e8ce68ba5b57df18b54b96adb80ad533c7a2eb3d";
sha256 = "08y0srr1i5n7d15w3shp8cdj4gqhdxpb6311k879amb28am5n8zk"; sha256 = "09ylazsa933dqhx0x9qc4v2ackqvr22dpzbgyhkvqfs476fj5pn4";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -428,23 +439,23 @@
}; };
heirline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { heirline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "heirline.nvim"; pname = "heirline.nvim";
version = "2022-05-31"; version = "2022-06-05";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "rebelot"; owner = "rebelot";
repo = "heirline.nvim"; repo = "heirline.nvim";
rev = "7e951f4cff83c13e3c337ee60ce3166d951e424a"; rev = "6e51e4ad13a6278f15b75438c6c71cb6fb704318";
sha256 = "0jhzbmy6cp9jv4j6nsqwq450kiv6cbrshqv6n2438gsacs2z1nxv"; sha256 = "1bb9w6cbhc7jp88987dyzycp5sz0mrg49a0s6gjvh3grmnkbqcyl";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
bufferline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { bufferline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "bufferline.nvim"; pname = "bufferline.nvim";
version = "2022-05-29"; version = "2022-06-05";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "akinsho"; owner = "akinsho";
repo = "bufferline.nvim"; repo = "bufferline.nvim";
rev = "e2b1e99deb077bf49f8e167d1320292e66b22477"; rev = "c78b3ecf9539a719828bca82fc7ddb9b3ba0c353";
sha256 = "1m7jxmf9gfnqz3im167dbviw820clagl1yanp2x556zh94jxp4hf"; sha256 = "03sf49s26nb9aqr16f776p58vs3dx9kyyach2jj4k1lp318w6ikp";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -472,12 +483,12 @@
}; };
toggleterm-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { toggleterm-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "toggleterm.nvim"; pname = "toggleterm.nvim";
version = "2022-05-22"; version = "2022-06-04";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "akinsho"; owner = "akinsho";
repo = "toggleterm.nvim"; repo = "toggleterm.nvim";
rev = "93c2f2ca96af74f22f470e2fbcbd5e89b1faa63d"; rev = "5bf839a558bf313fdbbe44824bcf3c4fe60502d0";
sha256 = "0449qbkskzfgbnn2xgr0cydjjs8gvzgcrv7x77bqki7wsr0mqgx7"; sha256 = "019p1yjh929fn6pawig3sbzgf98qqkr21s6jva6nd1hfrrbfs9r5";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -494,12 +505,12 @@
}; };
neogit = pkgs.vimUtils.buildVimPluginFrom2Nix { neogit = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "neogit"; pname = "neogit";
version = "2022-05-16"; version = "2022-06-01";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "TimUntersberger"; owner = "TimUntersberger";
repo = "neogit"; repo = "neogit";
rev = "1453acd27c38fb4374093bc5c2c85dd1fc03d689"; rev = "441c23d355b77f4067a1ad018c5dba64efd7ff7f";
sha256 = "1hrk8p0ma43p30ka8zv3k0czv66qxy88kmv34m5lc813qsrzhivn"; sha256 = "0yay92x3jmvpgqhx0hv0w19fjisakmmdzd286m656v5g26hmfxj1";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -516,23 +527,23 @@
}; };
spellsitter-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { spellsitter-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "spellsitter.nvim"; pname = "spellsitter.nvim";
version = "2022-03-29"; version = "2022-06-03";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "spellsitter.nvim"; repo = "spellsitter.nvim";
rev = "f84e7a31c516f2a9cb857a02e4b551b009a81afb"; rev = "430a25393abbf482bddf03c224cd5b8eeb27b5e1";
sha256 = "10f76mk8k5rj30fiq136dpwmwbf0ha8cbxs9rg6miikgv01r734m"; sha256 = "1cypvpyaarn9ckin2cgf2hpsq5qj517pz64imvyckzg22x9cf6yi";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-notify"; pname = "nvim-notify";
version = "2022-05-16"; version = "2022-06-05";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "rcarriga"; owner = "rcarriga";
repo = "nvim-notify"; repo = "nvim-notify";
rev = "c6ca279271f03db5ee03523d1c312ba624d3fa75"; rev = "1b851fb56f3b333bd49cc950bd758ddb792221e0";
sha256 = "096pk6gzxvwg55acz9r3wmrmdbz9s0ccyikmm0r91y42aa13xl73"; sha256 = "1a9h5a38g771spdhkc23dbzbbbhb8zzbq8ripn57n6yk9qmci4dr";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

4
programs/nvim/plugins.yaml
View file

@ -16,7 +16,7 @@
- src: Mofiqul/dracula.nvim - src: Mofiqul/dracula.nvim
# Syntax # Syntax
- src: nvim-treesitter/nvim-treesitter # - src: nvim-treesitter/nvim-treesitter
- src: p00f/nvim-ts-rainbow - src: p00f/nvim-ts-rainbow
- src: nvim-treesitter/playground - src: nvim-treesitter/playground
@ -32,6 +32,8 @@
XDG_CACHE_HOME=./xdg_cache just build XDG_CACHE_HOME=./xdg_cache just build
mv lib/libzf.so lib/libzf-osx-arm64.so mv lib/libzf.so lib/libzf-osx-arm64.so
rm -rf ./xdg_cache rm -rf ./xdg_cache
- src: ahmedkhalf/project.nvim
- src: folke/todo-comments.nvim
- src: nvim-telescope/telescope-ui-select.nvim - src: nvim-telescope/telescope-ui-select.nvim
- src: "https://git.sr.ht/~havi/telescope-toggleterm.nvim" - src: "https://git.sr.ht/~havi/telescope-toggleterm.nvim"