diff --git a/configuration.nix b/configuration.nix index 916f2bb..5c0095b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -15,10 +15,6 @@ inputs: let configuration.imports = modules; }; - tidalConfig = { - config.vim.languages.tidal.enable = true; - }; - mainConfig = isMaximal: { config.vim = { viAlias = true; @@ -254,5 +250,5 @@ inputs: let }; }; in { - inherit neovimConfiguration mainConfig tidalConfig; + inherit neovimConfiguration mainConfig; } diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index ab6f9da..b5047a4 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -6,14 +6,21 @@ Release notes for release 0.7 [ItsSorae](https://github.com/ItsSorae): -- Added support for [typst](https://typst.app/) under `vim.languages.typst`. - This will enable the `typst-lsp` language server, and the `typstfmt` formatter. +- Added support for [typst](https://typst.app/) under `vim.languages.typst` + This will enable the `typst-lsp` language server, and the `typstfmt` formatter [frothymarrow](https://github.com/frothymarrow): - Modified type for [](#opt-vim.visuals.fidget-nvim.setupOpts.progress.display.overrides) - from `anything` to a `submodule` for better type checking. + from `anything` to a `submodule` for better type checking [horriblename](https://github.com/horriblename) - Fix broken treesitter-context keybinds in visual mode + +[NotAShelf](https://github.com/notashelf) + +- Add `deno fmt` as the default Markdown formatter. This will be enabled + automatically if you have autoformatting enabled, but can be disabled manually + if you choose to. +- Remove vim-tidal and friends diff --git a/flake.lock b/flake.lock index f590525..e706001 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "dirt-samples-src": { - "flake": false, - "locked": { - "lastModified": 1667426233, - "narHash": "sha256-Zl2bi9QofcrhU63eMtg+R6lhV9ExQS/0XNTJ+oq65Uo=", - "owner": "tidalcycles", - "repo": "dirt-samples", - "rev": "92f2145e661b397e62ca0ff3965819e7c7db0dad", - "type": "github" - }, - "original": { - "owner": "tidalcycles", - "ref": "master", - "repo": "dirt-samples", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -180,22 +163,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1702350026, "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", @@ -1906,7 +1873,6 @@ "plugin-which-key": "plugin-which-key", "rnix-lsp": "rnix-lsp", "systems": "systems_2", - "tidalcycles": "tidalcycles", "zig": "zig" } }, @@ -1935,23 +1901,6 @@ "type": "github" } }, - "superdirt-src": { - "flake": false, - "locked": { - "lastModified": 1611740180, - "narHash": "sha256-GtnqZeMFqFkVhgx2Exu0wY687cHa7mNnVCgjQd6fiIA=", - "owner": "musikinformatik", - "repo": "superdirt", - "rev": "7abb62e89649daa1232b9cbd6427241868abd30e", - "type": "github" - }, - "original": { - "owner": "musikinformatik", - "ref": "master", - "repo": "superdirt", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1982,62 +1931,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tidal-src": { - "flake": false, - "locked": { - "lastModified": 1654350756, - "narHash": "sha256-tONM5SYYBca0orTLH1EUOilSC1FCluWrFt8AetUx+YQ=", - "owner": "tidalcycles", - "repo": "tidal", - "rev": "fda9c1ecb3722698935245e5409ef8ccdfca16c8", - "type": "github" - }, - "original": { - "owner": "tidalcycles", - "ref": "main", - "repo": "tidal", - "type": "github" - } - }, - "tidalcycles": { - "inputs": { - "dirt-samples-src": "dirt-samples-src", - "nixpkgs": "nixpkgs_3", - "superdirt-src": "superdirt-src", - "tidal-src": "tidal-src", - "utils": "utils_2", - "vim-tidal-src": "vim-tidal-src", - "vowel-src": "vowel-src" - }, - "locked": { - "lastModified": 1694087816, - "narHash": "sha256-GMV5ONQhLwa6xRYhZkmwc2W2jbjAfHfB/OR9vR0+PFA=", - "owner": "mitchmindtree", - "repo": "tidalcycles.nix", - "rev": "1b1c4df5303e07930d23e8361ab8253ebec0c7bb", - "type": "github" - }, - "original": { - "owner": "mitchmindtree", - "repo": "tidalcycles.nix", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1656928814, @@ -2053,62 +1946,11 @@ "type": "github" } }, - "utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "vim-tidal-src": { - "flake": false, - "locked": { - "lastModified": 1685703852, - "narHash": "sha256-8gyk17YLeKpLpz3LRtxiwbpsIbZka9bb63nK5/9IUoA=", - "owner": "tidalcycles", - "repo": "vim-tidal", - "rev": "e440fe5bdfe07f805e21e6872099685d38e8b761", - "type": "github" - }, - "original": { - "owner": "tidalcycles", - "repo": "vim-tidal", - "type": "github" - } - }, - "vowel-src": { - "flake": false, - "locked": { - "lastModified": 1641306144, - "narHash": "sha256-zfF6cvAGDNYWYsE8dOIo38b+dIymd17Pexg0HiPFbxM=", - "owner": "supercollider-quarks", - "repo": "vowel", - "rev": "ab59caa870201ecf2604b3efdd2196e21a8b5446", - "type": "github" - }, - "original": { - "owner": "supercollider-quarks", - "ref": "master", - "repo": "vowel", - "type": "github" - } - }, "zig": { "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1713960597, diff --git a/flake.nix b/flake.nix index e63f7ca..3425add 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,7 @@ # Flake inputs inputs = { + ## Basic Inputs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; flake-utils.url = "github:numtide/flake-utils"; @@ -98,13 +99,7 @@ inputs.flake-utils.follows = "flake-utils"; }; - ### Plugins - # Tidal cycles - tidalcycles = { - url = "github:mitchmindtree/tidalcycles.nix"; - inputs.vim-tidal-src.url = "github:tidalcycles/vim-tidal"; - }; - + ## Plugins # LSP plugins plugin-nvim-lspconfig = { url = "github:neovim/nvim-lspconfig"; diff --git a/flake/apps.nix b/flake/apps.nix index 6b53adf..583e297 100644 --- a/flake/apps.nix +++ b/flake/apps.nix @@ -1,21 +1,11 @@ -{lib, ...}: { - perSystem = { - system, - config, - ... - }: { - apps = - { - nix.program = lib.getExe config.packages.nix; - maximal.program = lib.getExe config.packages.maximal; - default = config.apps.nix; - } - // ( - if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"]) - then { - tidal.program = lib.getExe config.packages.tidal; - } - else {} - ); +{lib, ...}: let + inherit (lib.meta) getExe; +in { + perSystem = {config, ...}: { + apps = { + nix.program = getExe config.packages.nix; + maximal.program = getExe config.packages.maximal; + default = config.apps.nix; + }; }; } diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix index d6fb73c..389ca0c 100644 --- a/flake/legacyPackages.nix +++ b/flake/legacyPackages.nix @@ -7,7 +7,6 @@ legacyPackages = import inputs.nixpkgs { inherit system; overlays = [ - inputs.tidalcycles.overlays.default inputs.self.overlays.default (_: _: { rnix-lsp = inputs'.rnix-lsp.defaultPackage; diff --git a/flake/overlays.nix b/flake/overlays.nix index c73f2c0..3c5434d 100644 --- a/flake/overlays.nix +++ b/flake/overlays.nix @@ -9,13 +9,11 @@ nixConfig = mainConfig false; maximalConfig = mainConfig true; - tidalConfig = {config.vim.tidal.enable = true;}; in { flake.overlays.default = _final: prev: { inherit neovimConfiguration; neovim-nix = buildPkg prev [nixConfig]; neovim-maximal = buildPkg prev [maximalConfig]; - neovim-tidal = buildPkg prev [tidalConfig]; devPkg = buildPkg pkgs [nixConfig {config.vim.languages.html.enable = pkgs.lib.mkForce true;}]; }; } diff --git a/flake/packages.nix b/flake/packages.nix index eb6c946..3724905 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -7,56 +7,50 @@ }: let docs = import ../docs {inherit pkgs inputs;}; in { - packages = - { - # Documentation - docs = docs.manual.html; - docs-html = docs.manual.html; - docs-manpages = docs.manPages; - docs-json = docs.options.json; + packages = { + # Documentation + docs = docs.manual.html; + docs-html = docs.manual.html; + docs-manpages = docs.manPages; + docs-json = docs.options.json; - # Build and open the built manual in your system browser - docs-html-wrapped = pkgs.writeScriptBin "docs-html-wrapped" '' - #!${pkgs.stdenv.shell} - # use xdg-open to open the docs in the browser - ${pkgs.xdg_utils}/bin/xdg-open ${docs.manual.html} - ''; + # Build and open the built manual in your system browser + docs-html-wrapped = pkgs.writeScriptBin "docs-html-wrapped" '' + #!${pkgs.stdenv.shell} + # use xdg-open to open the docs in the browser + ${pkgs.xdg_utils}/bin/xdg-open ${docs.manual.html} + ''; - # Exposed neovim configurations - nix = config.legacyPackages.neovim-nix; - maximal = config.legacyPackages.neovim-maximal; - default = config.legacyPackages.neovim-nix; + # Exposed neovim configurations + nix = config.legacyPackages.neovim-nix; + maximal = config.legacyPackages.neovim-maximal; + default = config.legacyPackages.neovim-nix; - # Published docker images - docker-nix = let - inherit (pkgs) bash gitFull buildEnv dockerTools; - inherit (config.legacyPackages) neovim-nix; - in - dockerTools.buildImage { - name = "nvf"; - tag = "latest"; + # Published docker images + docker-nix = let + inherit (pkgs) bash gitFull buildEnv dockerTools; + inherit (config.legacyPackages) neovim-nix; + in + dockerTools.buildImage { + name = "nvf"; + tag = "latest"; - copyToRoot = buildEnv { - name = "neovim-root"; - pathsToLink = ["/bin"]; - paths = [ - neovim-nix - gitFull - bash - ]; - }; - - config = { - Cmd = ["${neovim-nix}/bin/nvim"]; - WorkingDir = "/home/neovim/demo"; - Volumes = {"/home/neovim/demo" = {};}; - }; + copyToRoot = buildEnv { + name = "neovim-root"; + pathsToLink = ["/bin"]; + paths = [ + neovim-nix + gitFull + bash + ]; }; - } - // ( - if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"]) - then {tidal = config.legacyPackages.neovim-tidal;} - else {} - ); + + config = { + Cmd = ["${neovim-nix}/bin/nvim"]; + WorkingDir = "/home/neovim/demo"; + Volumes = {"/home/neovim/demo" = {};}; + }; + }; + }; }; } diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 3a33ad0..eb5125a 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -5,7 +5,6 @@ in { ./bash ./dart ./elixir - ./tidal ./clang.nix ./css.nix diff --git a/modules/plugins/languages/tidal/config.nix b/modules/plugins/languages/tidal/config.nix deleted file mode 100644 index 344c1a7..0000000 --- a/modules/plugins/languages/tidal/config.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - - cfg = config.vim.tidal; -in { - config = mkIf (cfg.enable) { - vim.startPlugins = [ - # From tidalcycles flake - pkgs.vimPlugins.vim-tidal - ]; - - vim.globals = { - "tidal_target" = "terminal"; - "tidal_flash_duration" = 150; - "tidal_sc_enable" = cfg.openSC; - }; - }; -} diff --git a/modules/plugins/languages/tidal/default.nix b/modules/plugins/languages/tidal/default.nix deleted file mode 100644 index da6dd5a..0000000 --- a/modules/plugins/languages/tidal/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - imports = [ - ./tidal.nix - ./config.nix - ]; -} diff --git a/modules/plugins/languages/tidal/tidal.nix b/modules/plugins/languages/tidal/tidal.nix deleted file mode 100644 index ebfe4a0..0000000 --- a/modules/plugins/languages/tidal/tidal.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) int bool; -in { - options.vim.tidal = { - enable = mkEnableOption "tidalcycles tools and plugins"; - - flash = mkOption { - description = ''When sending a paragraph or a single line, vim-tidal will "flash" the selection for some milliseconds''; - type = int; - default = 150; - }; - - openSC = mkOption { - description = "Automatically run the supercollider CLI, sclang, alongside the Tidal GHCI terminal."; - type = bool; - default = true; - }; - }; -}