diff --git a/README.md b/README.md index 28bc1ea..9ad656e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ If you add a new configuration file, remember to add it to the To test your configuration simply run the following command -``` +```bash nix run . ``` @@ -51,8 +51,17 @@ For more information look at: [NixOS docs](https://nixos.wiki/wiki/flakes) | n | fb | find buffers | | n | ft | treesitter | | n | fg | git commits | -| n | fh | file history | -| n | fh | file history | +| n | fB | git branches | +| n | fo | old files | +| n | fu | undo history | +| n | fd | diagnostics | +| n | fe | todos | + +### Auto-Session + +| Mode | Keybind | Action | +| ---- | ------- | ------------- | +| n | fs | View Sessions | ### LSP @@ -62,7 +71,7 @@ For more information look at: [NixOS docs](https://nixos.wiki/wiki/flakes) | n | gd | go to definition | | n | gD | go to declaration | | n | gi | go to implementation | -| n | go | go to tyoe definition | +| n | go | go to type definition | | n | gr | go to references | | n | gd | go to definition | | n | \ | rename | @@ -71,7 +80,7 @@ For more information look at: [NixOS docs](https://nixos.wiki/wiki/flakes) | Mode | Keybind | Action | | ---- | ------- | ----------------------------- | -| n | gl | Show diagnostics in telescope | +| n | gl | Show current line diagnostics | | n | [d | go to previous diagnostics | | n | ]d | go to next diagnostics | diff --git a/config/default.nix b/config/default.nix index 1da92bf..c2aaaef 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { imports = [ ./auto_cmd.nix @@ -8,6 +9,7 @@ colorschemes.gruvbox = { enable = true; + lazyLoad.enable = true; settings = { transparent_mode = true; terima_colors = true; @@ -38,4 +40,8 @@ clipboard.providers.wl-copy.enable = true; performance.combinePlugins.enable = true; + performance.combinePlugins.standalonePlugins = [ + pkgs.vimPlugins.snacks-nvim + pkgs.vimPlugins.markview-nvim + ]; } diff --git a/config/mappings.nix b/config/mappings.nix index 9a7a614..9b6155a 100644 --- a/config/mappings.nix +++ b/config/mappings.nix @@ -5,6 +5,9 @@ action = "NvimTreeToggle"; mode = "n"; key = "n"; + options = { + desc = "Toggle NvimTree"; + }; } # Commentary bindings @@ -12,47 +15,111 @@ action = "Commentary"; mode = "n"; key = "cl"; + options = { + desc = "Toggle comment line"; + }; } - # Telescope bindings - + # Snacks (Telescope) bindings { - action = "Telescope live_grep"; + action = "lua Snacks.picker.grep()"; mode = "n"; key = "fw"; + options = { + desc = "live grep"; + }; } { - action = "Telescope find_files"; + action = "lua Snacks.picker.smart()"; mode = "n"; key = "ff"; + options = { + desc = "Smart find files"; + }; } { - action = "Telescope buffers"; + action = "lua Snacks.picker.buffers()"; mode = "n"; key = "fb"; + options = { + desc = "List buffers"; + }; } - { - action = "Telescope treesitter"; + action = "lua Snacks.picker.git_log()"; mode = "n"; - key = "ft"; + key = "fg"; + options = { + desc = "List git commits"; + }; } { - action = "Telescope git_commits"; mode = "n"; - key = "fg"; + key = "fB"; + action = ''lua Snacks.picker.git_branches()''; + options = { + desc = "Find git branches"; + }; + } + { + mode = "n"; + key = "fD"; + action = ''lua Snacks.picker.git_diff()''; + options = { + desc = "Git Diff (Hunks)"; + }; + } + { + action = "lua Snacks.picker.recent()"; + mode = "n"; + key = "fo"; + options = { + desc = "View old files"; + }; + } + { + action = "lua Snacks.picker.undo()"; + mode = "n"; + key = "fu"; + options = { + desc = "List undo history"; + }; + } + { + action = "lua Snacks.picker.diagnostics()"; + mode = "n"; + key = "fd"; + options = { + desc = "View diagnostics"; + }; } { - action = "Telescope oldfiles"; + action = "lua Snacks.picker.todo_comments()"; mode = "n"; - key = "fh"; + key = "fe"; + options = { + desc = "View ToDos"; + }; } - # Floatterm toggle + # Auto-Session bindings + { + action = "SessionSearch"; + mode = "n"; + key = "fs"; + options = { + desc = "View Sessions"; + }; + } + + # Floatterm bindings { action = "FloatermToggle"; mode = "n"; key = "t"; + options = { + desc = "Toggle FloatTerm"; + }; } { action = "FloatermToggle"; @@ -60,63 +127,80 @@ key = ""; } - # Hover information + # LSP bindings { mode = "n"; key = "K"; action = "lua vim.lsp.buf.hover()"; + options = { + desc = "View lsp hover information"; + }; } - - # Jump to the definition { mode = "n"; key = "gd"; action = "lua vim.lsp.buf.definition()"; + options = { + desc = "Jump to definition"; + }; } - - # Jump to declaration { mode = "n"; key = "gD"; action = "lua vim.lsp.buf.declaration()"; + options = { + desc = "Jump to declaration"; + }; } - - # Lists all the implementations for the symbol under the cursor { mode = "n"; key = "gi"; action = "lua vim.lsp.buf.implementation()"; + options = { + desc = "Jump to implementation"; + }; } - - # Jumps to the definition of the type symbol { mode = "n"; key = "go"; action = "lua vim.lsp.buf.type_definition()"; + options = { + desc = "Jump to type definition"; + }; } - - # Lists all the references { mode = "n"; key = "gr"; action = "lua vim.lsp.buf.references()"; + options = { + desc = "List all references"; + }; } - # Displays a function's signature information { mode = "n"; - key = "gs"; - action = "lua vim.lsp.buf.signature_help()"; + key = "gl"; + action = "lua vim.diagnostic.open_float()"; + options = { + desc = "Show diagnostics of current line"; + }; } - - # Renames all references to the symbol under the cursor { mode = "n"; - key = ""; - action = "lua vim.lsp.buf.rename()"; + key = "[d"; + action = "lua vim.diagnostic.goto_prev()"; + options = { + desc = "Move to previous diagnostic"; + }; + } + { + mode = "n"; + key = "]d"; + action = "lua vim.diagnostic.goto_next()"; + options = { + desc = "Move to next diagnostic"; + }; } - - # Selects a code action available at the current cursor position { mode = "n"; key = ""; @@ -127,30 +211,24 @@ key = ""; action = "lua vim.lsp.buf.range_code_action()"; } - - # Show diagnostics in a floating window { mode = "n"; - key = "gl"; - action = "lua vim.diagnostic.open_float()"; - } - - # Move to the previous diagnostic - { - mode = "n"; - key = "[d"; - action = "lua vim.diagnostic.goto_prev()"; + key = ""; + action = "lua vim.lsp.buf.rename()"; + options = { + desc = "Rename"; + }; } - - # Move to the next diagnostic { mode = "n"; - key = "]d"; - action = "lua vim.diagnostic.goto_next()"; + key = "gs"; + action = "lua vim.lsp.buf.signature_help()"; + options = { + desc = "Show signature information"; + }; } # Notify bindings - { mode = "n"; key = "dn"; diff --git a/config/options.nix b/config/options.nix index 3e5f611..83a844d 100644 --- a/config/options.nix +++ b/config/options.nix @@ -59,7 +59,7 @@ cmdheight = 0; # Place a column line - colorcolumn = "80"; + colorcolumn = "90"; # Decrease updatetime updatetime = 50; # faster completion (4000ms default) diff --git a/config/plugins.nix b/config/plugins.nix index a39aded..bfb036b 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -11,19 +11,25 @@ in (prefix + /lint.nix) (prefix + /lsp.nix) (prefix + /luasnip.nix) - (prefix + /markdown-preview.nix) (prefix + /none-ls.nix) (prefix + /notify.nix) (prefix + /nvim-tree.nix) (prefix + /startup.nix) (prefix + /telescope.nix) (prefix + /todo-comments.nix) + (prefix + /vim-tex.nix) + (prefix + /snacks.nix) + (prefix + /rustaceanvim.nix) ]; # Plugins used within a single line plugins = { - commentary.enable = true; - crates-nvim.enable = true; + auto-session.enable = true; + commentary = { + enable = true; + autoLoad = true; + }; + crates.enable = true; diffview.enable = true; flash.enable = true; floaterm.enable = true; @@ -31,17 +37,30 @@ in fugitive.enable = true; git-conflict.enable = true; lualine.enable = true; - neogen.enable = true; + lz-n.enable = true; + neogen = { + enable = true; + settings.languages = { + c.template = { + annotation_convention = "doxygen"; + }; + cpp.template.annotation_convention = "doxygen"; + }; + }; neotest.enable = true; nix.enable = true; nvim-autopairs.enable = true; - persistence.enable = true; - rustaceanvim.enable = true; + persistence = { + enable = true; + autoLoad = true; + }; treesitter.enable = true; trouble.enable = true; ts-autotag.enable = true; undotree.enable = true; + web-devicons.enable = true; which-key.enable = true; + markview.enable = true; }; # Plugins not contained within nixvim diff --git a/config/plugins/dap.nix b/config/plugins/dap.nix index afb0c9e..cb327b3 100644 --- a/config/plugins/dap.nix +++ b/config/plugins/dap.nix @@ -2,6 +2,9 @@ plugins = { dap = { enable = true; + lazyLoad.settings = { + event = "BufEnter"; + }; signs = { dapBreakpoint = { text = "●"; @@ -16,20 +19,6 @@ texthl = "DapLogPoint"; }; }; - extensions = { - dap-python = { - enable = true; - }; - dap-ui = { - enable = true; - floating.mappings = { - close = [ "" "q" ]; - }; - }; - dap-virtual-text = { - enable = true; - }; - }; configurations = { java = [ { @@ -42,5 +31,34 @@ ]; }; }; + dap-python.enable = true; + dap-virtual-text.enable = true; + dap-ui = { + enable = true; + lazyLoad.settings = { + before.__raw = '' + function() + require('lz.n').trigger_load('nvim-dap') + end + ''; + keys = [ + { + __unkeyed-1 = "du"; + __unkeyed-2.__raw = '' + function() + require('dap.ext.vscode').load_launchjs(nil, {}) + require("dapui").toggle() + end + ''; + desc = "Toggle Debugger UI"; + } + ]; + }; + settings = { + floating.mappings = { + close = [ "" "q" ]; + }; + }; + }; }; } diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index 1499d2b..42c8892 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -9,22 +9,24 @@ servers = { bashls.enable = true; # Bash clangd.enable = true; # C/C++ - csharp-ls.enable = true; # C# + csharp_ls.enable = true; # C# cssls.enable = true; # CSS dockerls.enable = true; # Docker gopls.enable = true; # Go html.enable = true; # HTML marksman.enable = true; # Markdown - nil-ls.enable = true; # Nix + nil_ls.enable = true; # Nix pyright.enable = true; # Python tailwindcss.enable = true; # TailwindCSS - tsserver.enable = true; # TS/JS + ts_ls.enable = true; # TS/JS + texlab.enable = true; # LaTex + verible.enable = true; # Verilog }; }; # Extra configuration for lsp servers lsp.servers = { - lua-ls = { + lua_ls = { enable = true; settings.telemetry.enable = false; }; diff --git a/config/plugins/markdown-preview.nix b/config/plugins/markdown-preview.nix deleted file mode 100644 index f6416ec..0000000 --- a/config/plugins/markdown-preview.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - plugins = { - markdown-preview = { - enable = true; - settings.theme = "dark"; - }; - }; -} diff --git a/config/plugins/none-ls.nix b/config/plugins/none-ls.nix index 7ed21b1..c578525 100644 --- a/config/plugins/none-ls.nix +++ b/config/plugins/none-ls.nix @@ -19,6 +19,7 @@ }; formatting = { alejandra.enable = true; + stylua.enable = true; shfmt.enable = true; nixpkgs_fmt.enable = true; @@ -27,13 +28,15 @@ enable = true; disableTsServerFormatter = true; }; - black = { + clang_format = { enable = true; - settings = '' - { - extra_args = { "--fast" }, - } - ''; + }; + black = { + settings = { + extra_args = [ + "--fast" + ]; + }; }; }; completion = { diff --git a/config/plugins/notify.nix b/config/plugins/notify.nix index 7b4cb6f..30d0972 100644 --- a/config/plugins/notify.nix +++ b/config/plugins/notify.nix @@ -2,11 +2,13 @@ plugins = { notify = { enable = true; - backgroundColour = "#1e1e2e"; - fps = 60; - render = "default"; - timeout = 500; - topDown = false; + settings = { + backgroundColour = "#1e1e2e"; + fps = 60; + render = "default"; + timeout = 500; + topDown = false; + }; }; }; } diff --git a/config/plugins/nvim-tree.nix b/config/plugins/nvim-tree.nix index 503147a..00f5f9d 100644 --- a/config/plugins/nvim-tree.nix +++ b/config/plugins/nvim-tree.nix @@ -2,10 +2,10 @@ plugins = { nvim-tree = { enable = true; - openOnSetup = true; - openOnSetupFile = true; - autoReloadOnWrite = true; - diagnostics.enable = true; + settings = { + autoReloadOnWrite = true; + diagnostics.enable = true; + }; }; }; } diff --git a/config/plugins/rustaceanvim.nix b/config/plugins/rustaceanvim.nix new file mode 100644 index 0000000..81080f2 --- /dev/null +++ b/config/plugins/rustaceanvim.nix @@ -0,0 +1,72 @@ +{ lib +, pkgs +, ... +}: { + # Needed for RustPlay + extraPlugins = with pkgs.vimPlugins; [ webapi-vim ]; + + plugins = { + rustaceanvim = { + enable = true; + settings = { + dap = { + adapter = { + command = lib.getExe' pkgs.lldb "lldb-dap"; + type = "executable"; + }; + autoloadConfigurations = true; + }; + + server = { + default_settings = { + rust-analyzer = { + cargo = { + buildScripts.enable = true; + features = "all"; + }; + + diagnostics = { + enable = true; + styleLints.enable = true; + }; + + checkOnSave = true; + check = { + command = "clippy"; + features = "all"; + }; + + files = { + excludeDirs = [ + ".cargo" + ".direnv" + ".git" + "node_modules" + "target" + ]; + }; + + inlayHints = { + bindingModeHints.enable = true; + closureStyle = "rust_analyzer"; + closureReturnTypeHints.enable = "always"; + discriminantHints.enable = "always"; + expressionAdjustmentHints.enable = "always"; + implicitDrops.enable = true; + lifetimeElisionHints.enable = "always"; + rangeExclusiveHints.enable = true; + }; + + procMacro = { + enable = true; + }; + + rustc.source = "discover"; + }; + }; + }; + tools.enable_clippy = true; + }; + }; + }; +} diff --git a/config/plugins/snacks.nix b/config/plugins/snacks.nix new file mode 100644 index 0000000..7a3e5a1 --- /dev/null +++ b/config/plugins/snacks.nix @@ -0,0 +1,20 @@ +{ + plugins = { + snacks = { + enable = true; + settings = { + animate.enabled = false; + scroll.enabled = false; + + bigfile.enabled = true; + image.enabled = true; + indent.enabled = true; + statuscolumn.enabled = true; + input.enabled = true; + scope.enabled = true; + quickfile.enabled = true; + words.enabled = true; + }; + }; + }; +} diff --git a/config/plugins/startup.nix b/config/plugins/startup.nix index c7cf245..c79b155 100644 --- a/config/plugins/startup.nix +++ b/config/plugins/startup.nix @@ -1,65 +1,67 @@ { plugins = { startup = { - enable = true; - parts = [ - "header" - "body" - ]; - sections = { - header = { - align = "center"; - content = [ - " _ _ ____ __ _ __ _ _ _ _ __ _ _ " - " ( \\/ )( __) ( ( \\( )( \\/ )/ )( \\( )( \\/ ) " - " ) / ) _) / / )( ) ( \\ \\/ / )( / \\/ \\ " - " (__/ (__) \\_)__)(__)(_/\\_) \\__/ (__)\\_)(_/ " - "" - ]; - defaultColor = ""; - foldSection = false; - highlight = "Statement"; - margin = 5; - oldfilesAmount = 0; - title = "Header"; - type = "text"; - }; - body = { - align = "center"; - content = [ - [ - " Find File" - "Telescope find_files" - "ff" - ] - [ - "󰍉 Find Word" - "Telescope live_grep" - "fw" - ] - [ - " File History" - "Telescope oldfiles" - "fh" - ] - [ - " File Browser" - "NvimTreeToggle" - "n" - ] - [ - " New File" - "lua require'startup'.new_file()" - "nf" - ] - ]; - defaultColor = ""; - foldSection = false; - highlight = "String"; - margin = 5; - oldfilesAmount = 0; - title = "Basic Commands"; - type = "mapping"; + enable = false; + settings = { + parts = [ + "header" + "body" + ]; + sections = { + header = { + align = "center"; + content = [ + " _ _ ____ __ _ __ _ _ _ _ __ _ _ " + " ( \\/ )( __) ( ( \\( )( \\/ )/ )( \\( )( \\/ ) " + " ) / ) _) / / )( ) ( \\ \\/ / )( / \\/ \\ " + " (__/ (__) \\_)__)(__)(_/\\_) \\__/ (__)\\_)(_/ " + "" + ]; + defaultColor = ""; + foldSection = false; + highlight = "Statement"; + margin = 5; + oldfilesAmount = 0; + title = "Header"; + type = "text"; + }; + body = { + align = "center"; + content = [ + [ + " Find File" + "Telescope find_files" + "ff" + ] + [ + "󰍉 Find Word" + "Telescope live_grep" + "fw" + ] + [ + " File History" + "Telescope oldfiles" + "fh" + ] + [ + " File Browser" + "NvimTreeToggle" + "n" + ] + [ + " New File" + "lua require'startup'.new_file()" + "nf" + ] + ]; + defaultColor = ""; + foldSection = false; + highlight = "String"; + margin = 5; + oldfilesAmount = 0; + title = "Basic Commands"; + type = "mapping"; + }; }; }; }; diff --git a/config/plugins/telescope.nix b/config/plugins/telescope.nix index 43a8e17..98aba3c 100644 --- a/config/plugins/telescope.nix +++ b/config/plugins/telescope.nix @@ -5,6 +5,16 @@ extensions = { file-browser.enable = true; fzf-native.enable = true; + undo = { + enable = true; + settings = { + side_by_side = true; + layout_strategy = "vertical"; + layout_config = { + preview_height = 0.8; + }; + }; + }; }; settings = { defaults = { @@ -18,6 +28,12 @@ "^build/" "%.ipynb" ]; + set_env.COLORTERM = "truecolor"; + }; + pickers = { + colorscheme = { + enable_preview = true; + }; }; }; }; diff --git a/config/plugins/vim-tex.nix b/config/plugins/vim-tex.nix new file mode 100644 index 0000000..89b0686 --- /dev/null +++ b/config/plugins/vim-tex.nix @@ -0,0 +1,8 @@ +{ + plugins = { + vimtex = { + enable = true; + # lazyLoad.settings.ft = "tex"; + }; + }; +} diff --git a/flake.lock b/flake.lock index a2d38c4..8d6558c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,50 +1,15 @@ { "nodes": { - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", - "owner": "numtide", - "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1762810396, + "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", "type": "github" }, "original": { @@ -61,11 +26,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1762810396, + "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", "type": "github" }, "original": { @@ -79,11 +44,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -92,107 +57,41 @@ "type": "github" } }, - "git-hooks": { + "ixx": { "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ + "flake-utils": [ "nixvim", - "nixpkgs" + "nuschtosSearch", + "flake-utils" ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "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" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { "nixpkgs": [ "nixvim", + "nuschtosSearch", "nixpkgs" ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { - "owner": "lnl7", - "repo": "nix-darwin", + "owner": "NuschtOS", + "ref": "v0.1.1", + "repo": "ixx", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -204,50 +103,48 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1762482733, + "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "home-manager": "home-manager", - "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "systems": "systems_2" }, "locked": { - "lastModified": 1726133505, - "narHash": "sha256-5Q7Io0J98z7UOswrruOuO/jJNduSB3PKFw/sDz0NX1A=", + "lastModified": 1762865386, + "narHash": "sha256-2hkqfvY2wH+78M85X/ZApyZURnFc926b2mAHiyHcGDE=", "owner": "nix-community", "repo": "nixvim", - "rev": "4697b96a0124944929ecefa09d488c7997419e43", + "rev": "9e556e752505263eef8c0d0f982e2ab9029cc512", "type": "github" }, "original": { @@ -259,17 +156,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "owner": "NuschtOS", "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "type": "github" }, "original": { @@ -300,24 +198,18 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, + "systems_2": { "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "nix-systems", + "repo": "default", "type": "github" } }