diff --git a/modules/misc/news.nix b/modules/misc/news.nix index ed6d1546bb13..7baeebc67254 100644 --- a/modules/misc/news.nix +++ b/modules/misc/news.nix @@ -1383,6 +1383,13 @@ in { A new module is available: 'xdg.portal'. ''; } + + { + time = "2024-01-16T15:43:51+00:00"; + message = '' + 'programs.rtx' was renamed to 'programs.mise' + ''; + } ]; }; } diff --git a/modules/modules.nix b/modules/modules.nix index 314dfdb8d824..d557dc1b3ce2 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -147,6 +147,7 @@ let ./programs/mcfly.nix ./programs/mercurial.nix ./programs/micro.nix + ./programs/mise.nix ./programs/mpv.nix ./programs/mr.nix ./programs/msmtp.nix @@ -194,7 +195,6 @@ let ./programs/rofi-pass.nix ./programs/rofi.nix ./programs/rtorrent.nix - ./programs/rtx.nix ./programs/ruff.nix ./programs/sagemath.nix ./programs/sapling.nix diff --git a/modules/programs/rtx.nix b/modules/programs/mise.nix similarity index 69% rename from modules/programs/rtx.nix rename to modules/programs/mise.nix index 5fa9b5631b90..545b113ff421 100644 --- a/modules/programs/rtx.nix +++ b/modules/programs/mise.nix @@ -3,16 +3,16 @@ with lib; let - cfg = config.programs.rtx; + cfg = config.programs.mise; tomlFormat = pkgs.formats.toml { }; in { meta.maintainers = [ hm.maintainers.pedorich-n ]; options = { - programs.rtx = { - enable = mkEnableOption "RTX. Runtime Executor (asdf Rust clone)"; + programs.mise = { + enable = mkEnableOption "mise. Runtime Executor (asdf Rust clone)"; - package = mkPackageOption pkgs "rtx" { }; + package = mkPackageOption pkgs "mise" { }; enableBashIntegration = mkEnableOption "Bash Integration" // { default = true; @@ -41,14 +41,14 @@ in { }; ''; description = '' - Settings written to {file}`$XDG_CONFIG_HOME/rtx/config.toml`. + Settings written to {file}`$XDG_CONFIG_HOME/mise/config.toml`. - See + See for details on supported values. ::: {.warning} - Modifying the `tools` section doesn't make RTX install them. - You have to manually run `rtx install` to install the tools. + Modifying the `tools` section doesn't make mise install them. + You have to manually run `mise install` to install the tools. ::: ''; }; @@ -58,8 +58,8 @@ in { config = mkIf cfg.enable { home.packages = [ cfg.package ]; - xdg.configFile."rtx/config.toml" = mkIf (cfg.settings != { }) { - source = tomlFormat.generate "rtx-settings" cfg.settings; + xdg.configFile."mise/config.toml" = mkIf (cfg.settings != { }) { + source = tomlFormat.generate "mise-settings" cfg.settings; }; programs = { diff --git a/tests/default.nix b/tests/default.nix index 8b5bdfde1de9..24a287fa97fd 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -96,6 +96,7 @@ in import pkgs.nix-lib-nmt { ./modules/programs/man ./modules/programs/mbsync ./modules/programs/micro + ./modules/programs/mise ./modules/programs/mpv ./modules/programs/mu ./modules/programs/mujmap @@ -123,7 +124,6 @@ in import pkgs.nix-lib-nmt { ./modules/programs/readline ./modules/programs/rio ./modules/programs/ripgrep - ./modules/programs/rtx ./modules/programs/ruff ./modules/programs/sagemath ./modules/programs/sapling diff --git a/tests/modules/programs/mise/bash-integration.nix b/tests/modules/programs/mise/bash-integration.nix new file mode 100644 index 000000000000..552db2ffad1d --- /dev/null +++ b/tests/modules/programs/mise/bash-integration.nix @@ -0,0 +1,16 @@ +{ config, ... }: { + programs = { + mise = { + package = config.lib.test.mkStubPackage { name = "mise"; }; + enable = true; + enableBashIntegration = true; + }; + + bash.enable = true; + }; + + nmt.script = '' + assertFileRegex home-files/.bashrc 'eval "$(/nix/store/.*mise.*/bin/mise activate bash)"' + ''; +} + diff --git a/tests/modules/programs/rtx/custom-settings.nix b/tests/modules/programs/mise/custom-settings.nix similarity index 66% rename from tests/modules/programs/rtx/custom-settings.nix rename to tests/modules/programs/mise/custom-settings.nix index 74c52f94390c..e29ed9aa0394 100644 --- a/tests/modules/programs/rtx/custom-settings.nix +++ b/tests/modules/programs/mise/custom-settings.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { programs = { - rtx = { - package = config.lib.test.mkStubPackage { name = "rtx"; }; + mise = { + package = config.lib.test.mkStubPackage { name = "mise"; }; enable = true; settings = { tools = { @@ -18,10 +18,10 @@ }; nmt.script = '' - assertFileExists home-files/.config/rtx/config.toml + assertFileExists home-files/.config/mise/config.toml - assertFileContent home-files/.config/rtx/config.toml ${ - pkgs.writeText "rtx.expected" '' + assertFileContent home-files/.config/mise/config.toml ${ + pkgs.writeText "mise.expected" '' [settings] experimental = false verbose = false diff --git a/tests/modules/programs/mise/default-settings.nix b/tests/modules/programs/mise/default-settings.nix new file mode 100644 index 000000000000..96d480bee62f --- /dev/null +++ b/tests/modules/programs/mise/default-settings.nix @@ -0,0 +1,12 @@ +{ config, ... }: { + config = { + programs.mise = { + package = config.lib.test.mkStubPackage { name = "mise"; }; + enable = true; + }; + + nmt.script = '' + assertPathNotExists home-files/.config/mise/config.toml + ''; + }; +} diff --git a/tests/modules/programs/mise/default.nix b/tests/modules/programs/mise/default.nix new file mode 100644 index 000000000000..511082a12830 --- /dev/null +++ b/tests/modules/programs/mise/default.nix @@ -0,0 +1,7 @@ +{ + mise-default-settings = ./default-settings.nix; + mise-custom-settings = ./custom-settings.nix; + mise-bash-integration = ./bash-integration.nix; + mise-zsh-integration = ./zsh-integration.nix; + mise-fish-integration = ./fish-integration.nix; +} diff --git a/tests/modules/programs/rtx/fish-integration.nix b/tests/modules/programs/mise/fish-integration.nix similarity index 63% rename from tests/modules/programs/rtx/fish-integration.nix rename to tests/modules/programs/mise/fish-integration.nix index edc752bd25ca..cb589193116a 100644 --- a/tests/modules/programs/rtx/fish-integration.nix +++ b/tests/modules/programs/mise/fish-integration.nix @@ -1,7 +1,7 @@ { config, ... }: { programs = { - rtx = { - package = config.lib.test.mkStubPackage { name = "rtx"; }; + mise = { + package = config.lib.test.mkStubPackage { name = "mise"; }; enable = true; enableFishIntegration = true; }; @@ -10,7 +10,7 @@ }; nmt.script = '' - assertFileRegex home-files/.config/fish/config.fish '/nix/store/.*rtx.*/bin/rtx activate fish | source' + assertFileRegex home-files/.config/fish/config.fish '/nix/store/.*mise.*/bin/mise activate fish | source' ''; } diff --git a/tests/modules/programs/mise/zsh-integration.nix b/tests/modules/programs/mise/zsh-integration.nix new file mode 100644 index 000000000000..d9b2cdd90305 --- /dev/null +++ b/tests/modules/programs/mise/zsh-integration.nix @@ -0,0 +1,16 @@ +{ config, ... }: { + programs = { + mise = { + package = config.lib.test.mkStubPackage { name = "mise"; }; + enable = true; + enableZshIntegration = true; + }; + + zsh.enable = true; + }; + + nmt.script = '' + assertFileRegex home-files/.zshrc 'eval "$(/nix/store/.*mise.*/bin/mise activate zsh)"' + ''; +} + diff --git a/tests/modules/programs/rtx/bash-integration.nix b/tests/modules/programs/rtx/bash-integration.nix deleted file mode 100644 index 3c05c25cb50a..000000000000 --- a/tests/modules/programs/rtx/bash-integration.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, ... }: { - programs = { - rtx = { - package = config.lib.test.mkStubPackage { name = "rtx"; }; - enable = true; - enableBashIntegration = true; - }; - - bash.enable = true; - }; - - nmt.script = '' - assertFileRegex home-files/.bashrc 'eval "$(/nix/store/.*rtx.*/bin/rtx activate bash)"' - ''; -} - diff --git a/tests/modules/programs/rtx/default-settings.nix b/tests/modules/programs/rtx/default-settings.nix deleted file mode 100644 index c1a0e7ae5e68..000000000000 --- a/tests/modules/programs/rtx/default-settings.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, ... }: { - config = { - programs.rtx = { - package = config.lib.test.mkStubPackage { name = "rtx"; }; - enable = true; - }; - - nmt.script = '' - assertPathNotExists home-files/.config/rtx/config.toml - ''; - }; -} diff --git a/tests/modules/programs/rtx/default.nix b/tests/modules/programs/rtx/default.nix deleted file mode 100644 index 250b5ec6fdf4..000000000000 --- a/tests/modules/programs/rtx/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - rtx-default-settings = ./default-settings.nix; - rtx-custom-settings = ./custom-settings.nix; - rtx-bash-integration = ./bash-integration.nix; - rtx-zsh-integration = ./zsh-integration.nix; - rtx-fish-integration = ./fish-integration.nix; -} diff --git a/tests/modules/programs/rtx/zsh-integration.nix b/tests/modules/programs/rtx/zsh-integration.nix deleted file mode 100644 index fcff308d0555..000000000000 --- a/tests/modules/programs/rtx/zsh-integration.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, ... }: { - programs = { - rtx = { - package = config.lib.test.mkStubPackage { name = "rtx"; }; - enable = true; - enableZshIntegration = true; - }; - - zsh.enable = true; - }; - - nmt.script = '' - assertFileRegex home-files/.zshrc 'eval "$(/nix/store/.*rtx.*/bin/rtx activate zsh)"' - ''; -} -