diff --git a/flake.lock b/flake.lock index 24260d2..477dce5 100644 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,31 @@ { "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": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760813311, - "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -26,11 +42,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -58,13 +74,17 @@ } }, "git-hooks": { - "flake": false, + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1759523803, + "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", "type": "github" }, "original": { @@ -73,6 +93,27 @@ "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": { "inputs": { "flake-utils": [ @@ -103,16 +144,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", - "owner": "nixos", + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -134,11 +175,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760725957, - "narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=", + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "81b927b14b7b3988334d5282ef9cba802e193fe1", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "type": "github" }, "original": { @@ -150,11 +191,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759632233, - "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", + "lastModified": 1759036355, + "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", "repo": "nixpkgs", - "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", + "rev": "e57b3b16ad8758fd681511a078f35c416a8cc939", "type": "github" }, "original": { @@ -167,16 +224,16 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch", "systems": "systems_2" }, "locked": { - "lastModified": 1760906375, - "narHash": "sha256-inbXtSqhaDOxvosjvt8hP/Az/wWwRCxjipH4x5DSD6A=", + "lastModified": 1759217440, + "narHash": "sha256-qP3wDVcwOMKSIhPKH0m+DmpFXIx9dZNNgw9wyRMz+Dw=", "owner": "nix-community", "repo": "nixvim", - "rev": "5c1be58f6d938ff93516d00cc3d2c0def4d80198", + "rev": "9faa339d9e930be3eb7d751af35ecfed7c493d14", "type": "github" }, "original": { @@ -212,7 +269,7 @@ "inputs": { "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim", "systems": "systems_3" diff --git a/plugins/common/illuminate.nix b/plugins/common/illuminate.nix index ff57ffb..7bfedb7 100644 --- a/plugins/common/illuminate.nix +++ b/plugins/common/illuminate.nix @@ -1,16 +1,13 @@ { plugins.illuminate = { enable = true; - - settings = { - under_cursor = false; - filetypes_denylist = [ - "Outline" - "TelescopePrompt" - "alpha" - "harpoon" - "reason" - ]; - }; + underCursor = false; + filetypesDenylist = [ + "Outline" + "TelescopePrompt" + "alpha" + "harpoon" + "reason" + ]; }; } diff --git a/plugins/lang/md.nix b/plugins/lang/md.nix index 20526ca..b0c24be 100644 --- a/plugins/lang/md.nix +++ b/plugins/lang/md.nix @@ -15,29 +15,25 @@ in mkdnflow = { enable = true; - - settings = { - to_do.symbols = [ - " " - "⧖" - "x" - ]; - - mappings = { - MkdnEnter = { - key = ""; - modes = [ - "n" - "i" - ]; - }; - MkdnToggleToDo = { - key = ""; - modes = [ - "n" - "i" - ]; - }; + toDo.symbols = [ + " " + "⧖" + "x" + ]; + mappings = { + MkdnEnter = { + key = ""; + modes = [ + "n" + "i" + ]; + }; + MkdnToggleToDo = { + key = ""; + modes = [ + "n" + "i" + ]; }; }; }; @@ -49,6 +45,16 @@ in cmd = "Glow"; }; }; + + conform-nvim.settings = { + formatters_by_ft = { + markdown = { + __unkeyed-1 = "prettierd"; + __unkeyed-2 = "prettier"; + stop_after_first = true; + }; + }; + }; }; autoCmd = [ diff --git a/plugins/neotree.nix b/plugins/neotree.nix index 40f7ae6..947e9dc 100644 --- a/plugins/neotree.nix +++ b/plugins/neotree.nix @@ -7,43 +7,40 @@ in plugins.neo-tree = { enable = true; - settings = { - sources = [ - "filesystem" - "buffers" - "git_status" - "document_symbols" - ]; + sources = [ + "filesystem" + "buffers" + "git_status" + "document_symbols" + ]; + addBlankLineAtTop = false; - add_blank_line_at_top = false; + filesystem = { + bindToCwd = false; + followCurrentFile = { + enabled = true; + }; + }; - filesystem = { - bind_to_cwd = false; - follow_current_file = { - enabled = true; - }; + defaultComponentConfigs = { + indent = { + withExpanders = true; + expanderCollapsed = "󰅂"; + expanderExpanded = "󰅀"; + expanderHighlight = "NeoTreeExpander"; }; - default_component_configs = { - indent = { - with_expanders = true; - expander_collapsed = "󰅂"; - expander_expanded = "󰅀"; - expander_highlight = "NeoTreeExpander"; - }; - - git_status = with icons.git; { - symbols = { - added = "${Added}"; - conflict = "${Conflict}"; - deleted = "${Deleted}"; - ignored = "${Ignored}"; - modified = "${Modified}"; - renamed = "${Renamed}"; - staged = "${Staged}"; - unstaged = "${Unstaged}"; - untracked = "${Untracked}"; - }; + gitStatus = with icons.git; { + symbols = { + added = "${Added}"; + conflict = "${Conflict}"; + deleted = "${Deleted}"; + ignored = "${Ignored}"; + modified = "${Modified}"; + renamed = "${Renamed}"; + staged = "${Staged}"; + unstaged = "${Unstaged}"; + untracked = "${Untracked}"; }; }; };