From c76ee4bf07298c436af3b7eeaf121dd911256214 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 7 Mar 2024 10:59:38 -0600 Subject: [PATCH] flake.lock: update --- flake.lock | 114 +++++++++--------- modules/home/cli-apps/neovim/completion.nix | 83 ++++++------- .../neovim/plugins/markdown-preview.nix | 7 +- modules/nixos/suites/development/default.nix | 3 +- modules/nixos/suites/emulation/default.nix | 3 +- 5 files changed, 105 insertions(+), 105 deletions(-) diff --git a/flake.lock b/flake.lock index caebd7857..96823e663 100644 --- a/flake.lock +++ b/flake.lock @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1709554374, - "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=", + "lastModified": 1709771483, + "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7", + "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", "type": "github" }, "original": { @@ -473,11 +473,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -821,11 +821,11 @@ ] }, "locked": { - "lastModified": 1709677162, - "narHash": "sha256-nIXa0KM3FOVjD3XDDigW12qktQvLG+uKuPg00rjIX/8=", + "lastModified": 1709764752, + "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "bdea159ffab9865f808b8d92fd2bef33521867b2", + "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", "type": "github" }, "original": { @@ -842,11 +842,11 @@ ] }, "locked": { - "lastModified": 1708988456, - "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", + "lastModified": 1709578243, + "narHash": "sha256-hF96D+c2PBmAFhymMw3z8hou++lqKtZ7IzpFbYeL1/Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", + "rev": "23ff9821bcaec12981e32049e8687f25f11e5ef3", "type": "github" }, "original": { @@ -889,11 +889,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1709679094, - "narHash": "sha256-/qdgqScMB76plT/yDSL09ktBgBDZKw5l+RQjwfbIkZI=", + "lastModified": 1709818078, + "narHash": "sha256-U/o8d5E+0GlTUFNkAzt56wHlUHfoIg3sZPer+GywDFQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b1e2ca04a016b1ea24344d3cfb2eb3370863eb5e", + "rev": "6c4e2489a0a153ac2a92744ecb2985280c97fc89", "type": "github" }, "original": { @@ -980,11 +980,11 @@ ] }, "locked": { - "lastModified": 1708787654, - "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", + "lastModified": 1709775675, + "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0fce791ba2334aca183f2ed42399518947550d0d", + "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", "type": "github" }, "original": { @@ -1023,11 +1023,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1709681608, - "narHash": "sha256-rJq/mTY/c1jMWsgoU6YjDw8Pf97GFqVSBK8LuGyqZdU=", + "lastModified": 1709817731, + "narHash": "sha256-Iorwl/axs9ZL+Unq+tBDhW5BO1y1EZYLwcoAKSl/bLI=", "owner": "hyprwm", "repo": "Hyprlock", - "rev": "7d5cb1dbb3ec1345f0e53f4254d38e18a7f8819f", + "rev": "90e94dee86349ff966a1fe34d30e859537af69d2", "type": "github" }, "original": { @@ -1163,11 +1163,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1709589789, - "narHash": "sha256-95UAiSHHzjyt7e5mjtjgv3Lq4p8vhu9cpPa8dQPE/Gc=", + "lastModified": 1709764988, + "narHash": "sha256-qNpTZNbWdZo1QyjOC5AgR7Cidu7Hs6JeeVxmKAjjcV0=", "owner": "neovim", "repo": "neovim", - "rev": "971602029311c33353c88175f761557431330528", + "rev": "6525832a8c4d44a8ebabba02a5ea1ce09b389a4f", "type": "github" }, "original": { @@ -1188,11 +1188,11 @@ ] }, "locked": { - "lastModified": 1709597017, - "narHash": "sha256-i6Vi0sqn9J8DjfFkGipxH1q2EFa8k1mgSgXsXMXbkBw=", + "lastModified": 1709769948, + "narHash": "sha256-fOKqYDzj6GK2eDB7QFs/6tsP5CgRyG4YN/xUfeRZGaQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "a40f72d64c0336532546ee3760040c1f0a6607cf", + "rev": "f0fc63c0db1bb97939919abfb93f63a80504933a", "type": "github" }, "original": { @@ -1209,11 +1209,11 @@ ] }, "locked": { - "lastModified": 1709001452, - "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=", + "lastModified": 1709554374, + "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6c06334f0843c7300d1678726bb607ce526f6b36", + "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7", "type": "github" }, "original": { @@ -1310,11 +1310,11 @@ ] }, "locked": { - "lastModified": 1709557527, - "narHash": "sha256-PV8oYqhTHX6FGZMQ1m5dhRuS914AhofPwgnAMhUZtwE=", + "lastModified": 1709821158, + "narHash": "sha256-76L6tymnmFY3zDPBi0Mi5G6HcISHKw7xHuYYmzKrTK4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d048d6fc4bada612ff08d4b9d5edc48d45389431", + "rev": "10e801a76fa611f8ce7937e2c9b7677888a54fa0", "type": "github" }, "original": { @@ -1362,11 +1362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -1433,11 +1433,11 @@ ] }, "locked": { - "lastModified": 1709651762, - "narHash": "sha256-bqzSRKYivOsXFkiVwWfoqtBISmBrwT5ShEhXgxKrkxk=", + "lastModified": 1709799354, + "narHash": "sha256-zhRTMVcsISxt9DRX0OrrP+2ggHzuGtXDNIdaXxp8cLg=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "d59914397b85d7b208b1ccc39906ef7bfcf0f26c", + "rev": "c9bc4cb7fdab72cb422a271329f8ba6d2395a32f", "type": "github" }, "original": { @@ -1491,11 +1491,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709549216, - "narHash": "sha256-9KX2QB7qo9mISo936dDyiwDTES30y4OvDtM9zpAJLHI=", + "lastModified": 1709819603, + "narHash": "sha256-joUMMXG8dym/KCJMWYT5wDy086FWvLHuhja0u2zYJk4=", "owner": "nix-community", "repo": "nixvim", - "rev": "680889ac01df8c2bfcb7a6ac7c850153d13d7b8f", + "rev": "e9564ac336bc5151a0f0671a460e64af9342e8aa", "type": "github" }, "original": { @@ -1526,11 +1526,11 @@ }, "nur": { "locked": { - "lastModified": 1709679415, - "narHash": "sha256-TDFiGZROX5/HYBmkYkXHTvXFNfIo2g4veozIDC53GG8=", + "lastModified": 1709821974, + "narHash": "sha256-u0QmqQg90nbV1UinZZYBwJWgEvPByc+q1stxAMazjeA=", "owner": "nix-community", "repo": "NUR", - "rev": "94cc427bb87caa8d954e3e80c72e39e078c93dca", + "rev": "e0a81dd9f1bac574b4c760ee087995c03c00e351", "type": "github" }, "original": { @@ -1699,11 +1699,11 @@ ] }, "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "lastModified": 1709777204, + "narHash": "sha256-ORUtu+GmrQwNc51mCIjxa/8DdOS901npphBL7k5aXX0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "rev": "7fdb7a7a846dc1f407cd6b24af04a0b8d018c3de", "type": "github" }, "original": { @@ -1828,11 +1828,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1709591996, - "narHash": "sha256-0sQcalXSgqlO6mnxBTXkSQChBHy2GQsokB1XY8r+LpQ=", + "lastModified": 1709711091, + "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "291aad29b59ceda517a06e59809f35cb0bb17c6b", + "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", "type": "github" }, "original": { @@ -1849,11 +1849,11 @@ ] }, "locked": { - "lastModified": 1709611865, - "narHash": "sha256-oTfe4qY+dV5vYYTLKKt7+o1YCRZRMCxE3jIfO+TB7Y4=", + "lastModified": 1709784621, + "narHash": "sha256-wcEN0HcMNTOeDJOX8rP0WbUn/pdmP/DWrwC3qt8ieQg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "15aa1288278bb4903b66b7738b2893672e3ea857", + "rev": "542ef89b09568ed8c324281e9afeafa05619a5e9", "type": "github" }, "original": { @@ -2185,11 +2185,11 @@ ] }, "locked": { - "lastModified": 1708696469, - "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { diff --git a/modules/home/cli-apps/neovim/completion.nix b/modules/home/cli-apps/neovim/completion.nix index cb3f17176..b37a4d95a 100644 --- a/modules/home/cli-apps/neovim/completion.nix +++ b/modules/home/cli-apps/neovim/completion.nix @@ -3,6 +3,46 @@ _: { options.completeopt = [ "menu" "menuone" "noselect" ]; plugins = { + cmp = { + enable = true; + autoEnableSources = true; + + settings = { + mapping = { + "" = "cmp.mapping.scroll_docs(-4)"; + "" = "cmp.mapping.scroll_docs(4)"; + "" = "cmp.mapping.complete()"; + "" = "cmp.mapping.close()"; + "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; + "" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; + "" = "cmp.mapping.confirm({ select = true })"; + }; + + snippet.expand = "luasnip"; + + sources = [ + { + name = "buffer"; + # Words from other open buffers can also be suggested. + option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; + } + { name = "calc"; } + { name = "cmdline"; } + { name = "codeium"; } + { name = "emoji"; } + { name = "fish"; } + { name = "git"; } + { name = "luasnip"; } + { name = "neorg"; } + { name = "npm"; } + { name = "nvim_lsp"; } + { name = "path"; } + { name = "tmux"; } + { name = "zsh"; } + ]; + }; + }; + luasnip.enable = true; lspkind = { @@ -24,49 +64,6 @@ _: { }; }; }; - - nvim-cmp = { - enable = true; - - snippet.expand = "luasnip"; - - mapping = { - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.scroll_docs(4)"; - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.close()"; - "" = { - modes = [ "i" "s" ]; - action = "cmp.mapping.select_next_item()"; - }; - "" = { - modes = [ "i" "s" ]; - action = "cmp.mapping.select_prev_item()"; - }; - "" = "cmp.mapping.confirm({ select = true })"; - }; - - sources = [ - { - name = "buffer"; - # Words from other open buffers can also be suggested. - option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; - } - { name = "calc"; } - { name = "cmdline"; } - { name = "codeium"; } - { name = "emoji"; } - { name = "fish"; } - { name = "git"; } - { name = "luasnip"; } - { name = "neorg"; } - { name = "npm"; } - { name = "nvim_lsp"; } - { name = "path"; } - { name = "tmux"; } - { name = "zsh"; } - ]; - }; }; }; } diff --git a/modules/home/cli-apps/neovim/plugins/markdown-preview.nix b/modules/home/cli-apps/neovim/plugins/markdown-preview.nix index b50ff3a71..e2764c507 100644 --- a/modules/home/cli-apps/neovim/plugins/markdown-preview.nix +++ b/modules/home/cli-apps/neovim/plugins/markdown-preview.nix @@ -3,9 +3,10 @@ _: { plugins.markdown-preview = { enable = true; - autoClose = false; - - theme = "dark"; + settings = { + auto_close = false; + theme = "dark"; + }; }; keymaps = [ diff --git a/modules/nixos/suites/development/default.nix b/modules/nixos/suites/development/default.nix index 80d5e3b67..174033f55 100644 --- a/modules/nixos/suites/development/default.nix +++ b/modules/nixos/suites/development/default.nix @@ -73,7 +73,8 @@ in rust-bin.stable.latest.default ] ++ lib.optionals cfg.sqlEnable [ dbeaver - mysql-workbench + # FIX: package broken on nixpkgs + # mysql-workbench ]; khanelinix = { diff --git a/modules/nixos/suites/emulation/default.nix b/modules/nixos/suites/emulation/default.nix index 3edb7913a..fcc84c0c8 100644 --- a/modules/nixos/suites/emulation/default.nix +++ b/modules/nixos/suites/emulation/default.nix @@ -34,7 +34,8 @@ in rpcs3 snes9x xemu - yuzu-early-access + # NOTE: yuzu removed upstream, using alternative + ryujinx ] ++ lib.optionals cfg.retroarchFull [ retroarchFull ]; khanelinix = {