Configuration for my NixOS based systems and Home Manager
Add neovim overlay
+39
-22
+3
-1
default-home.nix
+3
-1
default-home.nix
···
52
52
bzip3
53
53
p7zip
54
54
rclone
55
+
unstable.vis
55
56
56
57
# Dev tools
57
58
gcc
···
155
156
#package = unstable.fish;
156
157
};
157
158
programs.neovim = {
158
-
#package = unstable.neovim-unwrapped;
159
+
package = unstable.neovim-unwrapped;
159
160
enable = true;
160
161
defaultEditor = true;
161
162
withNodeJs = true;
···
170
171
programs.home-manager.enable = true;
171
172
programs.helix.enable = true;
172
173
programs.jujutsu = {
174
+
package = unstable.jujutsu;
173
175
enable = true;
174
176
};
175
177
programs.git = {
+3
-3
flake.lock
+3
-3
flake.lock
···
401
401
"lastModified": 1731402384,
402
402
"narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=",
403
403
"type": "tarball",
404
-
"url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip"
404
+
"url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"
405
405
},
406
406
"original": {
407
407
"type": "tarball",
408
-
"url": "https://github.com/IBM/plex/releases/download/@ibm%2Fplex-mono@1.1.0/ibm-plex-mono.zip"
408
+
"url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"
409
409
}
410
410
},
411
411
"indigo": {
···
706
706
"lastModified": 1763627666,
707
707
"narHash": "sha256-t8UQ85/bPXrbFs3V/paFtQvv4lSrr2lszrdcgspuAaA=",
708
708
"ref": "refs/tags/v1.11.0-alpha",
709
-
"rev": "12ef7f8f63ee4a14a552ebed603802c79e4d72f8",
709
+
"rev": "50bf484293937a3240fbf7c65e2afb30033f3f9e",
710
710
"revCount": 1678,
711
711
"type": "git",
712
712
"url": "https://tangled.org/@tangled.org/core"
+4
-1
flake.nix
+4
-1
flake.nix
···
216
216
unstable = import nixpkgs-unstable {
217
217
inherit system;
218
218
config.allowUnfree = true;
219
+
overlays = [
220
+
(import ./overlays/neovim.nix)
221
+
];
222
+
219
223
};
220
224
in
221
225
home-manager.lib.homeManagerConfiguration {
···
228
232
nix.package = pkgs.nix;
229
233
}
230
234
];
231
-
232
235
# Optionally use extraSpecialArgs
233
236
# to pass through arguments to home.nix
234
237
extraSpecialArgs = {
+18
-17
nvim/lua/plugins.lua
+18
-17
nvim/lua/plugins.lua
···
143
143
haskell = { "ormolu", "stylish-haskell" },
144
144
go = { "goimports", "gofmt" },
145
145
java = { "google-java-format" },
146
-
javascript = { "prettier" },
147
-
html = { "prettier" },
146
+
javascript = { "prettierd", "prettier", stop_after_first = true },
147
+
typescript = { "prettierd", "prettier", stop_after_first = true },
148
+
html = { "prettierd", "prettier", stop_after_first = true },
148
149
yaml = { "prettier" },
149
150
sh = { "shfmt" },
150
151
c = { "clang-format" },
···
366
367
end)
367
368
368
369
-- Actions
369
-
map('n', '<leader>hs', gitsigns.stage_hunk)
370
-
map('n', '<leader>hr', gitsigns.reset_hunk)
370
+
map('n', '<leader>gs', gitsigns.stage_hunk)
371
+
map('n', '<leader>gr', gitsigns.reset_hunk)
371
372
372
-
map('v', '<leader>hs', function()
373
+
map('v', '<leader>gs', function()
373
374
gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
374
375
end)
375
376
376
-
map('v', '<leader>hr', function()
377
+
map('v', '<leader>gr', function()
377
378
gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
378
379
end)
379
380
380
-
map('n', '<leader>hS', gitsigns.stage_buffer)
381
-
map('n', '<leader>hR', gitsigns.reset_buffer)
382
-
map('n', '<leader>hp', gitsigns.preview_hunk)
383
-
map('n', '<leader>hi', gitsigns.preview_hunk_inline)
381
+
map('n', '<leader>gS', gitsigns.stage_buffer)
382
+
map('n', '<leader>gR', gitsigns.reset_buffer)
383
+
map('n', '<leader>gp', gitsigns.preview_hunk)
384
+
map('n', '<leader>gi', gitsigns.preview_hunk_inline)
384
385
385
-
map('n', '<leader>hb', function()
386
+
map('n', '<leader>gb', function()
386
387
gitsigns.blame_line({ full = true })
387
388
end)
388
389
389
-
map('n', '<leader>hd', gitsigns.diffthis)
390
+
map('n', '<leader>gd', gitsigns.diffthis)
390
391
391
-
map('n', '<leader>hD', function()
392
+
map('n', '<leader>gD', function()
392
393
gitsigns.diffthis('~')
393
394
end)
394
395
395
-
map('n', '<leader>hQ', function() gitsigns.setqflist('all') end)
396
-
map('n', '<leader>hq', gitsigns.setqflist)
396
+
map('n', '<leader>gQ', function() gitsigns.setqflist('all') end)
397
+
map('n', '<leader>gq', gitsigns.setqflist)
397
398
398
399
-- Toggles
399
-
map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
400
-
map('n', '<leader>tw', gitsigns.toggle_word_diff)
400
+
map('n', '<leader>gtb', gitsigns.toggle_current_line_blame)
401
+
map('n', '<leader>gtw', gitsigns.toggle_word_diff)
401
402
402
403
-- Text object
403
404
map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
+11
overlays/neovim.nix
+11
overlays/neovim.nix
···
1
+
final: prev: {
2
+
neovim-unwrapped = prev.neovim-unwrapped.overrideAttrs (old: rec {
3
+
version = "0.12.0";
4
+
src = final.fetchFromGitHub {
5
+
owner = "neovim";
6
+
repo = "neovim";
7
+
tag = "v${version}";
8
+
hash = "sha256-uWhrGAwQ2nnAkyJ46qGkYxJ5K1jtyUIQOAVu3yTlquk=";
9
+
};
10
+
});
11
+
}