jalil/configuration.nix
1
1
Fork 0
Code Issues 1 Pull requests Projects Activity Actions

[chore] flake.lock: update #9

Merged
jalil merged 2 commits from update_flake_lock_action into main 2024-06-22 19:25:27 +02:00
Conversation 0 Commits 2 Files changed 6 +507 -478
6 changed files with 507 additions and 478 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
flake.lock
View file

@ -334,11 +334,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717527182, "lastModified": 1718530513,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3", "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +371,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718316862, "lastModified": 1718902806,
"narHash": "sha256-/hsqsiw3p5qMpazedgFFZF2sQghbCJIoef7XCpegTXw=", "narHash": "sha256-cAkgZoiP2eHB+V2cPJMcXACzdaWZIMgI5sg4vpH+DYo=",
"rev": "068576042b3b58f8180b24a36c07199a1a3fd380", "rev": "e44dcd63c4d96807536cdcf2afb688a537cce9be",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/068576042b3b58f8180b24a36c07199a1a3fd380.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/e44dcd63c4d96807536cdcf2afb688a537cce9be.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -396,11 +396,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717647344, "lastModified": 1718778751,
"narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=", "narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=",
"rev": "4e25f1ab68f2270f9cff59216056c21073db0164", "rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4e25f1ab68f2270f9cff59216056c21073db0164.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -409,11 +409,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1718349360, "lastModified": 1718894893,
"narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", "rev": "083823b7904e43a4fc1c7229781417e875359a42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +424,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718208800, "lastModified": 1718835956,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,16 +453,16 @@
], ],
"nix-darwin": [], "nix-darwin": [],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "unstable"
], ],
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1718376125, "lastModified": 1718869672,
"narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=", "narHash": "sha256-artyEBzWUsNXtYj7jBr816wRJj2Y3DYDHw6ECrQotX0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "7a2a25af02be25987aa43cd681312f4b5ba12317", "rev": "744dfea48bdd331e66b9e874822559fa6fae98af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -544,11 +544,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718139168, "lastModified": 1718522839,
"narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -559,11 +559,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1718318537, "lastModified": 1718714799,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -46,8 +46,7 @@
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs = { inputs = {
# Disable until fixed upstream: https://github.com/nix-community/nixvim/issues/1699 # Disable until fixed upstream: https://github.com/nix-community/nixvim/issues/1699
# nixpkgs.follows = "unstable"; nixpkgs.follows = "unstable";
nixpkgs.follows = "nixpkgs";
devshell.follows = "devshell"; devshell.follows = "devshell";
nix-darwin.follows = ""; # disable MacOS stuff nix-darwin.follows = ""; # disable MacOS stuff
home-manager.follows = "home-manager"; home-manager.follows = "home-manager";

24
nvim/augroups.nix
View file

@ -1,4 +1,13 @@
{ {
lib,
config,
helpers,
...
}: let
inherit (helpers) mkRaw;
cfg = config.jhome.nvim;
in
lib.mkIf cfg.enable {
autoGroups = { autoGroups = {
"highlightOnYank" = {}; "highlightOnYank" = {};
"lspConfig" = {}; "lspConfig" = {};
@ -9,8 +18,7 @@
group = "highlightOnYank"; group = "highlightOnYank";
event = "TextYankPost"; event = "TextYankPost";
pattern = "*"; pattern = "*";
callback = { callback = mkRaw ''
__raw = ''
function() function()
vim.highlight.on_yank { vim.highlight.on_yank {
higroup = ( higroup = (
@ -20,21 +28,18 @@
} }
end end
''; '';
};
} }
{ {
group = "restoreCursorPosition"; group = "restoreCursorPosition";
event = "BufReadPost"; event = "BufReadPost";
pattern = "*"; pattern = "*";
callback = { callback = mkRaw ''
__raw = ''
function() function()
if vim.fn.line '\'"' > 0 and vim.fn.line '\'"' <= vim.fn.line '$' then if vim.fn.line '\'"' > 0 and vim.fn.line '\'"' <= vim.fn.line '$' then
vim.cmd [[execute "normal! g'\""]] vim.cmd [[execute "normal! g'\""]]
end end
end end
''; '';
};
} }
{ {
group = "lspConfig"; group = "lspConfig";
@ -42,8 +47,8 @@
pattern = "*"; pattern = "*";
callback = let callback = let
opts = "noremap = true, buffer = bufnr"; opts = "noremap = true, buffer = bufnr";
in { in
__raw = '' mkRaw ''
function(opts) function(opts)
local bufnr = opts.buf local bufnr = opts.buf
local client = vim.lsp.get_client_by_id(opts.data.client_id) local client = vim.lsp.get_client_by_id(opts.data.client_id)
@ -84,7 +89,6 @@
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = '[G]o to [I]mplementation', ${opts} }) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = '[G]o to [I]mplementation', ${opts} })
end end
''; '';
};
} }
]; ];
} }

18
nvim/mappings.nix
View file

@ -1,6 +1,15 @@
let {
mkRaw = data: {__raw = data;}; lib,
in [ config,
helpers,
...
}: let
inherit (helpers) mkRaw;
cfg = config.jhome.nvim;
in
lib.mkIf cfg.enable {
keymaps = [
# Quickfix # Quickfix
{ {
mode = "n"; mode = "n";
@ -145,4 +154,5 @@ in [
action = mkRaw "require('nvim-silicon').clip"; action = mkRaw "require('nvim-silicon').clip";
options.desc = "Snap Code (to clipboard)"; options.desc = "Snap Code (to clipboard)";
} }
] ];
}

7
nvim/nixvim.nix
View file

@ -11,7 +11,7 @@
canSetAsDefault = hmAvailable || nixosAvailable; canSetAsDefault = hmAvailable || nixosAvailable;
notStandalone = hmAvailable || nixosAvailable || darwinAvailable; notStandalone = hmAvailable || nixosAvailable || darwinAvailable;
in { in {
imports = [./options.nix]; imports = [./options.nix ./plugins.nix ./mappings.nix ./augroups.nix];
config = lib.mkMerge [ config = lib.mkMerge [
(lib.optionalAttrs canSetAsDefault {defaultEditor = lib.mkDefault true;}) (lib.optionalAttrs canSetAsDefault {defaultEditor = lib.mkDefault true;})
@ -28,7 +28,7 @@ in {
terminal_colors = true; terminal_colors = true;
}; };
}; };
clipboard.providers.wl-copy.enable = true;
opts = { opts = {
number = true; number = true;
relativenumber = true; relativenumber = true;
@ -50,9 +50,6 @@ in {
# Enable local configuration :h 'exrc' # Enable local configuration :h 'exrc'
exrc = true; # safe since nvim 0.9 exrc = true; # safe since nvim 0.9
}; };
plugins = import ./plugins.nix {inherit lib;};
keymaps = import ./mappings.nix;
inherit (import ./augroups.nix) autoGroups autoCmd;
extraPlugins = let extraPlugins = let
plugins = pkgs.unstable.vimPlugins; plugins = pkgs.unstable.vimPlugins;
extraPlugins = import ./extraPlugins {pkgs = pkgs.unstable;}; extraPlugins = import ./extraPlugins {pkgs = pkgs.unstable;};

51
nvim/plugins.nix
View file

@ -1,4 +1,15 @@
{lib}: { {
lib,
pkgs,
helpers,
config,
...
}: let
inherit (helpers) mkRaw;
cfg = config.jhome.nvim;
in
lib.mkIf cfg.enable {
plugins = {
bacon = { bacon = {
enable = true; enable = true;
settings.quickfix.enabled = true; settings.quickfix.enabled = true;
@ -7,14 +18,14 @@
enable = true; enable = true;
cmdline = { cmdline = {
"/" = { "/" = {
mapping.__raw = "cmp.mapping.preset.cmdline()"; mapping = mkRaw "cmp.mapping.preset.cmdline()";
sources = [ sources = [
{name = "rg";} {name = "rg";}
{name = "buffer";} {name = "buffer";}
]; ];
}; };
":" = { ":" = {
mapping.__raw = "cmp.mapping.preset.cmdline()"; mapping = mkRaw "cmp.mapping.preset.cmdline()";
sources = [ sources = [
{name = "path";} {name = "path";}
{name = "cmdline";} {name = "cmdline";}
@ -75,7 +86,7 @@
groupIndex = 1; groupIndex = 1;
} }
]; ];
mapping.__raw = '' mapping = mkRaw ''
cmp.mapping.preset.insert({ cmp.mapping.preset.insert({
["<C-n>"] = function(fallback) ["<C-n>"] = function(fallback)
if cmp.visible() then if cmp.visible() then
@ -130,13 +141,27 @@
}; };
}; };
gitsigns.enable = true; gitsigns.enable = true;
lint = {
enable = true;
lintersByFt = {
rust = ["typos"];
latex = ["chktex" "typos"];
markdown = ["typos"];
nix = ["statix"];
sh = ["dash"];
zsh = ["zsh"];
};
};
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
bashls.enable = true; bashls.enable = true;
bashls.package = pkgs.unstable.bash-language-server;
# clangd.enable = true; # Adds ~2GiB # clangd.enable = true; # Adds ~2GiB
html.enable = true; html.enable = true;
jsonls.enable = true; jsonls.enable = true;
marksman.enable = true;
nixd.enable = true;
nil-ls = { nil-ls = {
enable = true; enable = true;
settings.nix.flake = { settings.nix.flake = {
@ -197,7 +222,11 @@
mode = "virtualtext"; mode = "virtualtext";
}; };
}; };
rustaceanvim.enable = true; rustaceanvim = {
enable = true;
# Install through rustup
rustAnalyzerPackage = null;
};
telescope = { telescope = {
enable = true; enable = true;
extensions = { extensions = {
@ -214,15 +243,5 @@
enable = true; enable = true;
settings.auto_close = true; settings.auto_close = true;
}; };
lint = {
enable = true;
lintersByFt = {
rust = ["typos"];
latex = ["chktex" "typos"];
markdown = ["typos"];
nix = ["statix"];
sh = ["dash"];
zsh = ["zsh"];
}; };
}; }
}