Compare commits

..

No commits in common. "87e0890bff11597944399292d52f4362ea75d63b" and "48cb5623ffaec125f9ccbf3fbaf403ac5f64bb0e" have entirely different histories.

4 changed files with 151 additions and 94 deletions

111
flake.lock generated
View file

@ -1,15 +1,31 @@
{ {
"nodes": { "nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1760813311, "lastModified": 1756770412,
"narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759362264, "lastModified": 1756770412,
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,13 +74,17 @@
} }
}, },
"git-hooks": { "git-hooks": {
"flake": false, "inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs"
},
"locked": { "locked": {
"lastModified": 1760663237, "lastModified": 1759523803,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,6 +93,27 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"ixx": { "ixx": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -103,16 +144,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1760878510, "lastModified": 1759070547,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "rev": "647e5c14cbd5067f44ac86b74f014962df460840",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -134,11 +175,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1760725957, "lastModified": 1759735786,
"narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=", "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "81b927b14b7b3988334d5282ef9cba802e193fe1", "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +191,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1759632233, "lastModified": 1759036355,
"narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1758763312,
"narHash": "sha256-puBMviZhYlqOdUUgEmMVJpXqC/ToEqSvkyZ30qQ09xM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", "rev": "e57b3b16ad8758fd681511a078f35c416a8cc939",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,16 +224,16 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1760906375, "lastModified": 1759217440,
"narHash": "sha256-inbXtSqhaDOxvosjvt8hP/Az/wWwRCxjipH4x5DSD6A=", "narHash": "sha256-qP3wDVcwOMKSIhPKH0m+DmpFXIx9dZNNgw9wyRMz+Dw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "5c1be58f6d938ff93516d00cc3d2c0def4d80198", "rev": "9faa339d9e930be3eb7d751af35ecfed7c493d14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,7 +269,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixvim": "nixvim", "nixvim": "nixvim",
"systems": "systems_3" "systems": "systems_3"

View file

@ -1,10 +1,8 @@
{ {
plugins.illuminate = { plugins.illuminate = {
enable = true; enable = true;
underCursor = false;
settings = { filetypesDenylist = [
under_cursor = false;
filetypes_denylist = [
"Outline" "Outline"
"TelescopePrompt" "TelescopePrompt"
"alpha" "alpha"
@ -12,5 +10,4 @@
"reason" "reason"
]; ];
}; };
};
} }

View file

@ -15,14 +15,11 @@ in
mkdnflow = { mkdnflow = {
enable = true; enable = true;
toDo.symbols = [
settings = {
to_do.symbols = [
" " " "
"" ""
"x" "x"
]; ];
mappings = { mappings = {
MkdnEnter = { MkdnEnter = {
key = "<cr>"; key = "<cr>";
@ -40,7 +37,6 @@ in
}; };
}; };
}; };
};
glow = { glow = {
enable = true; enable = true;
@ -49,6 +45,16 @@ in
cmd = "Glow"; cmd = "Glow";
}; };
}; };
conform-nvim.settings = {
formatters_by_ft = {
markdown = {
__unkeyed-1 = "prettierd";
__unkeyed-2 = "prettier";
stop_after_first = true;
};
};
};
}; };
autoCmd = [ autoCmd = [

View file

@ -7,32 +7,30 @@ in
plugins.neo-tree = { plugins.neo-tree = {
enable = true; enable = true;
settings = {
sources = [ sources = [
"filesystem" "filesystem"
"buffers" "buffers"
"git_status" "git_status"
"document_symbols" "document_symbols"
]; ];
addBlankLineAtTop = false;
add_blank_line_at_top = false;
filesystem = { filesystem = {
bind_to_cwd = false; bindToCwd = false;
follow_current_file = { followCurrentFile = {
enabled = true; enabled = true;
}; };
}; };
default_component_configs = { defaultComponentConfigs = {
indent = { indent = {
with_expanders = true; withExpanders = true;
expander_collapsed = "󰅂"; expanderCollapsed = "󰅂";
expander_expanded = "󰅀"; expanderExpanded = "󰅀";
expander_highlight = "NeoTreeExpander"; expanderHighlight = "NeoTreeExpander";
}; };
git_status = with icons.git; { gitStatus = with icons.git; {
symbols = { symbols = {
added = "${Added}"; added = "${Added}";
conflict = "${Conflict}"; conflict = "${Conflict}";
@ -47,7 +45,6 @@ in
}; };
}; };
}; };
};
wKeyList = [ wKeyList = [
(wKeyObj [ (wKeyObj [