Skip to content

Commit

Permalink
rtx -> mise transition
Browse files Browse the repository at this point in the history
  • Loading branch information
zolrath committed Apr 1, 2024
1 parent 03ef630 commit 1e37b82
Show file tree
Hide file tree
Showing 26 changed files with 232 additions and 78 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion dot_bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export PATH="$HOME/tools/elixir-ls:$PATH"
export PATH="$HOME/bin:$PATH"
export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.local/scripts:$PATH"
export PATH="$HOME/.local/share/rtx/shims:$PATH"
export PATH="$HOME/.local/share/mise/shims:$PATH"

# Add Elixir IEx Configs
export ELIXIR_EDITOR="code --goto __FILE__:__LINE__"
Expand Down
3 changes: 3 additions & 0 deletions dot_config/mise/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[tools]
odin = "dev-2024-02"
node = "20.10.0"
22 changes: 22 additions & 0 deletions dot_config/nvim/lua/langs/godot.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
return {
{
"habamax/vim-godot",
keys = {
{
"<Leader>grc",
"<cmd>:GodotRunCurrent<CR>",
desc = "Godot Run Current Scene",
},
{
"<Leader>grl",
"<cmd>:GodotRunLast<CR>",
desc = "Godot Run Last Scene",
},
{
"<Leader>grr",
"<cmd>:GodotRunFZF<CR>",
desc = "Godot Run Search Scene",
},
},
},
}
13 changes: 13 additions & 0 deletions dot_config/nvim/lua/langs/mojo.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
return {
{ "czheo/mojo.vim" },
{
"neovim/nvim-lspconfig",
opts = {
servers = {
mojo = {
setup = {},
},
},
},
},
}
11 changes: 11 additions & 0 deletions dot_config/nvim/lua/langs/other.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ return {
"astro",
"terraform",
})
opts.highlight = {
enable = true,
disable = function(_, buf)
local max_filesize = 10 * 1024 * 1024 -- 10 MB
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
vim.notify("Large file, treesitter disabled")
return true
end
end,
}
end,
},
{
Expand Down
4 changes: 2 additions & 2 deletions dot_config/nvim/lua/langs/shell.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ return {
local diagnostics = null_ls.builtins.diagnostics

opts.sources = vim.list_extend(opts.sources or {}, {
formatting.beautysh,
diagnostics.shellcheck,
-- formatting.beautysh,
-- diagnostics.shellcheck,
diagnostics.zsh,
diagnostics.fish,
})
Expand Down
2 changes: 1 addition & 1 deletion dot_config/nvim/lua/plugins/minimove.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
return {
{ "echasnovski/mini.nvim", version = false },
{ "echasnovski/mini.move", version = "*" },
}
8 changes: 7 additions & 1 deletion dot_config/private_fish/conf.d/exports.fish.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set -x LANGUAGE en_US.UTF-8
set -x LOC "desktop"

# Set up Odin root folder so Odin Language Server knows where to index the core and vendor libraries
set -x ODIN_ROOT ~/.local/share/rtx/installs/odin/dev-2023-12/bin
set -x ODIN_ROOT ~/.local/share/mise/installs/odin/dev-2024-03/bin

# Use wslu fake browser to open links in Windows
export BROWSER=wslview
Expand Down Expand Up @@ -75,10 +75,16 @@ set -x ERL_AFLAGS "-kernel shell_history enabled"
set -x XLA_TARGET "cuda118"
set -x TORCH_CUDA_VERSION "cu117"

# Set up Modular/Mojo home path
set -x MODULAR_HOME "/home/furd/.modular"

# Build Erlang docs to make elixir-ls happy
set -x KERL_BUILD_DOCS yes

set -x GCM_CREDENTIAL_STORE plaintext

# Set up Encore path
set -x ENCORE_INSTALL "/home/furd/.encore"

# source secrets file, not exposed in dotfiles
source ~/.secrets
10 changes: 9 additions & 1 deletion dot_config/private_fish/conf.d/paths.fish.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ end

{{ else if eq .chezmoi.os "darwin" -}}


# Homebrew paths
set -gx HOMEBREW_PREFIX /opt/homebrew
set -gx HOMEBREW_CELLAR /opt/homebrew/Cellar
Expand All @@ -29,16 +30,23 @@ add_info_path /opt/homebrew/share/info
fish_add_path /usr/local/opt/llvm/bin
{{ end -}}

# Add Mojo to path
fish_add_path /home/furd/.modular/pkg/packages.modular.com_mojo/bin

# Add CUDA to path
fish_add_path /usr/local/cuda/bin

# Fly.io cli path
fish_add_path "$FLYCTL_INSTALL/bin"

# Encore path
fish_add_path "$ENCORE_INSTALL/bin"

# My paths
fish_add_path ~/.cargo/bin
fish_add_path ~/.local/scripts
fish_add_path ~/.local/bin
fish_add_path ~/bin
fish_add_path ~/local/share/rtx/installs/elixir/1.14.4-otp-25/.mix/escripts/
fish_add_path ~/local/share/mise/installs/elixir/1.16.2-otp-26/.mix/escripts/
fish_add_path ~/tools/odin
fish_add_path ~/.rye/shims
2 changes: 1 addition & 1 deletion dot_config/private_fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ atuin init fish | source
direnv hook fish | source

#eval (zellij setup --generate-auto-start fish | string collect)
~/.local/share/rtx/bin/rtx activate fish | source
~/.local/bin/mise activate fish | source

function storePathForWindowsTerminal --on-variable PWD
if test -n "$WT_SESSION"
Expand Down
2 changes: 1 addition & 1 deletion dot_config/private_fish/functions/dbdown.fish
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function dbdown
for id in (docker ps -q --format '{{.Names}}' --filter "expose=5432")
for id in (docker ps --format '{{.Names}}' --filter "expose=5432")
echo Stopping (docker stop $id)
end
end
3 changes: 3 additions & 0 deletions dot_config/rtx/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[tools]
odin = "dev-2024-01"
node = "20.10.0"
30 changes: 15 additions & 15 deletions install_scripts/run_once_01a-install-package-manager.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@ info 'πŸ“‚ Updating apt registry'
sudo apt update
sudo apt install -y curl git

if ! [ -x "$(command -v rtx)" ]; then
info 'πŸ’» Installing rtx'
curl https://rtx.pub/install.sh | sh
success 'rtx'
if ! [ -x "$(command -v mise)" ]; then
info 'πŸ’» Installing mise'
curl https://mise.run | sh
success 'mise'
else
skip 'rtx'
skip 'mise'
fi

{{ else if eq .chezmoi.os "darwin" -}}

# homebrew install
if ! [ -x "$(command -v brew)" ]; then
info 'β˜• Installing homebrew'
NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
success 'homebrew'
info 'β˜• Installing homebrew'
NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
success 'homebrew'
else
skip 'homebrew, updating it instead.'
brew update
skip 'homebrew, updating it instead.'
brew update
fi

# asdf install
brew install coreutils git

if ! [ -x "$(command -v rtx)" ]; then
info 'πŸ’» Installing rtx'
(export RTX_INSTALL_PATH=~/.local/bin/rtx && curl https://rtx.pub/install.sh | sh)
success 'rtx'
if ! [ -x "$(command -v mise)" ]; then
info 'πŸ’» Installing mise'
(export MISE_INSTALL_PATH=~/.local/bin/mise && curl https://mise.run | sh)
success 'mise'
else
skip 'rtx'
skip 'mise'
fi

{{ end -}}
Expand Down
52 changes: 26 additions & 26 deletions install_scripts/run_once_01b-install-packages.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ sudo apt install -y ripgrep fzf chafa jq direnv fd-find

if ! [ -x "$(command -v lazydocker)" ]; then

info 'πŸ“¦ Installing lazydocker'
curl https://raw.githubusercontent.com/jesseduffield/lazydocker/master/scripts/install_update_linux.sh | bash
success 'lazydocker'
info 'πŸ“¦ Installing lazydocker'
curl https://raw.githubusercontent.com/jesseduffield/lazydocker/master/scripts/install_update_linux.sh | bash
success 'lazydocker'
else
skip 'lazydocker'
skip 'lazydocker'
fi

if ! [ -x "$(command -v glow)" ]; then
info 'πŸ“¦ Installing glow'
sudo mkdir -p /etc/apt/keyrings
curl -fsSL https://repo.charm.sh/apt/gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/charm.gpg
echo "deb [signed-by=/etc/apt/keyrings/charm.gpg] https://repo.charm.sh/apt/ * *" | sudo tee /etc/apt/sources.list.d/charm.list
sudo apt update && sudo apt install glow
success 'glow'
info 'πŸ“¦ Installing glow'
sudo mkdir -p /etc/apt/keyrings
curl -fsSL https://repo.charm.sh/apt/gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/charm.gpg
echo "deb [signed-by=/etc/apt/keyrings/charm.gpg] https://repo.charm.sh/apt/ * *" | sudo tee /etc/apt/sources.list.d/charm.list
sudo apt update && sudo apt install glow
success 'glow'
else
skip 'glow'
skip 'glow'
fi

info 'πŸ“¦ Installing wslu'
Expand All @@ -43,30 +43,30 @@ brew install ripgrep fzf gnu-sed glow chafa lazydocker jq direnv fd
{{ end -}}

if ! [ -x "$(command -v lazygit)" ]; then
info 'πŸ“¦ Installing lazygit'
rtx plugin add lazygit
rtx global lazygit latest
success 'lazygit'
info 'πŸ“¦ Installing lazygit'
mise plugin add lazygit
mise use --global lazygit@latest
success 'lazygit'
else
skip 'lazygit'
skip 'lazygit'
fi

if ! [ -x "$(command -v zoxide)" ]; then
info 'πŸ“¦ Installing zoxide'
rtx plugin add zoxide https://github.com/nyrst/asdf-zoxide.git
rtx global zoxide latest
success 'zoxide'
info 'πŸ“¦ Installing zoxide'
mise plugin add zoxide https://github.com/nyrst/asdf-zoxide.git
mise use --global zoxide@latest
success 'zoxide'
else
skip 'zoxide'
skip 'zoxide'
fi

if ! [ -x "$(command -v delta)" ]; then
info 'πŸ“¦ Installing delta'
rtx plugin add delta https://github.com/andweeb/asdf-delta.git
rtx global delta latest
success 'delta'
info 'πŸ“¦ Installing delta'
mise plugin add delta https://github.com/andweeb/asdf-delta.git
mise use --global delta@latest
success 'delta'
else
skip 'delta'
skip 'delta'
fi

success 'packages'
Expand Down
8 changes: 4 additions & 4 deletions install_scripts/run_once_03-clojure.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ brew install rlwrap
success 'rlwrap'

info 'β˜• Installing Java'
rtx plugins install java
rtx use --global [email protected]+10
mise plugins install java
mise use --global [email protected]+10
success 'Java'

info '🟒 Installing clojure'
rtx plugins install clojure
rtx use --global clojure@1.11.1.1273
mise plugins install clojure
mise use --global clojure@latest
success 'clojure'

echo ''
8 changes: 4 additions & 4 deletions install_scripts/run_once_03-elixir.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ export KERL_CONFIGURE_OPTIONS="--without-javac --with-ssl=$(brew --prefix openss
{{ end -}}

info 'πŸ’§ Installing erlang asdf'
rtx plugin install erlang https://github.com/asdf-vm/asdf-erlang.git
mise plugin install erlang https://github.com/asdf-vm/asdf-erlang.git
success 'erlang asdf'

info 'πŸ’§ Installing erlang'
rtx use --global erlang 25.1.2
mise use --global erlang 26.2.3
success 'erlang'

info 'πŸ’§ Installing elixir asdf'
rtx plugin install elixir https://github.com/asdf-vm/asdf-elixir.git
mise plugin install elixir https://github.com/asdf-vm/asdf-elixir.git
success 'elixir asdf'

info 'πŸ’§ Installing elixir'
rtx use --global elixir 1.14.2-otp-25
mise use --global elixir 1.16.2-otp-26
success 'elixir'

echo ''
20 changes: 18 additions & 2 deletions install_scripts/run_once_03-go.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,36 @@
echo ''

info 'πŸ₯Ά Installing go'
rtx install go@latest
rtx use --global go@latest
mise install go@latest
mise use --global go@latest
success 'go'

info 'πŸ’¨ Installing air'
go install github.com/cosmtrek/air@latest
success 'air'

info 'πŸ“ˆ Installing gomon'
go install github.com/jdudmesh/gomon@latest
success 'gomon'

info 'πŸ–₯️ Installing templ'
go install github.com/a-h/templ/cmd/templ@latest
success 'templ'

info 'πŸ“„ Installing task'
go install github.com/go-task/task/v3/cmd/task@latest
success 'task'

info 'πŸ“„ Installing gofumpt'
go install mvdan.cc/gofumpt@latest
success 'gofumpt'

info 'πŸ‘ Installing encore'
curl -L https://encore.dev/install.sh | bash
success 'encore'

info 'πŸ“¦ Installing sqlc'
go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest
success 'sqlc'

echo ''
6 changes: 3 additions & 3 deletions install_scripts/run_once_03-install-nodejs.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
echo ''

info '🟩 Installing nodejs asdf'
rtx plugin install nodejs https://github.com/asdf-vm/asdf-nodejs.git
mise plugin install nodejs https://github.com/asdf-vm/asdf-nodejs.git
success 'nodejs asdf'

info '🟩 Installing nodejs 19.7.0'
rtx install nodejs 19.7.0
mise install nodejs 19.7.0
success 'nodejs 19.7.0'

info '🟩 Installing nodejs 18.16.0'
rtx use --global nodejs 18.16.0
mise use --global nodejs 18.16.0
success 'nodejs 18.16.0'

info '🟩 Installing yarn'
Expand Down
Loading

0 comments on commit 1e37b82

Please sign in to comment.