From 9175c0c88eafe14841e31dba12da90dc16a9d36d Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Fri, 5 Jul 2024 18:26:01 +0200 Subject: [PATCH] feat(nix): migrate ruby --- .dotbot.conf.yaml | 1 - Gemfile | 11 --- Gemfile.lock | 119 --------------------------------- nix/darwin/homebrew-common.nix | 2 +- nix/home/default.nix | 1 + nix/home/ruby/default.nix | 11 +++ {ruby => nix/home/ruby}/gemrc | 0 setup/ruby.sh | 2 - 8 files changed, 13 insertions(+), 134 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock create mode 100644 nix/home/ruby/default.nix rename {ruby => nix/home/ruby}/gemrc (100%) diff --git a/.dotbot.conf.yaml b/.dotbot.conf.yaml index fe6fec2..4243260 100644 --- a/.dotbot.conf.yaml +++ b/.dotbot.conf.yaml @@ -32,7 +32,6 @@ ~/.default-npm-packages: asdf/default-npm-packages ~/.default-python-packages: asdf/default-python-packages ~/.editorconfig: style/editorconfig - ~/.gemrc: ruby/gemrc ~/.gitconfig: git/gitconfig ~/.gitignore: git/gitignore ~/.gitmux.conf: tmux/gitmux.conf diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 2865030..0000000 --- a/Gemfile +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem "bundler" -gem "erb_lint" -gem "git-up" -gem "github-linguist" -gem "lunchy" -gem "neovim" -gem "tmuxinator" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 078e7d2..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,119 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionview (7.0.4) - activesupport (= 7.0.4) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - ast (2.4.2) - better_html (2.0.1) - actionview (>= 6.0) - activesupport (>= 6.0) - ast (~> 2.0) - erubi (~> 1.4) - parser (>= 2.4) - smart_properties - builder (3.2.4) - cgi (0.3.3) - charlock_holmes (0.7.7) - colored (1.2) - concurrent-ruby (1.1.10) - crass (1.0.6) - diff-lcs (1.5.0) - erb_lint (0.2.0) - activesupport - better_html (>= 2.0.1) - parser (>= 2.7.1.4) - rainbow - rubocop - smart_properties - erubi (1.11.0) - erubis (2.7.0) - git-up (0.5.12) - colored (>= 1.2) - grit - github-linguist (7.23.0) - cgi - charlock_holmes (~> 0.7.7) - mini_mime (~> 1.0) - rugged (~> 1.0) - grit (2.5.0) - diff-lcs (~> 1.1) - mime-types (~> 1.15) - posix-spawn (~> 0.3.6) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - json (2.6.2) - loofah (2.19.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - lunchy (0.10.4) - mime-types (1.25.1) - mini_mime (1.1.2) - minitest (5.16.3) - msgpack (1.6.0) - multi_json (1.15.0) - neovim (0.9.0) - msgpack (~> 1.1) - multi_json (~> 1.0) - nokogiri (1.13.9-x86_64-darwin) - racc (~> 1.4) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) - posix-spawn (0.3.15) - racc (1.6.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - rainbow (3.1.1) - regexp_parser (2.6.0) - rexml (3.2.5) - rubocop (1.37.1) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.1.2.1) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.23.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.23.0) - parser (>= 3.1.1.0) - ruby-progressbar (1.11.0) - rugged (1.5.0.1) - smart_properties (1.17.0) - thor (1.2.1) - tmuxinator (3.0.5) - erubis (~> 2.6) - thor (~> 1.2.1) - xdg (~> 2.2, >= 2.2.5) - tzinfo (2.0.5) - concurrent-ruby (~> 1.0) - unicode-display_width (2.3.0) - xdg (2.2.5) - -PLATFORMS - x86_64-darwin-21 - -DEPENDENCIES - bundler - erb_lint - git-up - github-linguist - lunchy - neovim - tmuxinator - -BUNDLED WITH - 2.3.24 diff --git a/nix/darwin/homebrew-common.nix b/nix/darwin/homebrew-common.nix index 4a73c0e..09626a0 100644 --- a/nix/darwin/homebrew-common.nix +++ b/nix/darwin/homebrew-common.nix @@ -3,7 +3,7 @@ # TODO: Activate after migration is complete # onActivation.cleanup = "uninstall"; taps = [ ]; - brews = [ ]; + brews = [ "lunchy" ]; casks = [ "raycast" ]; masApps = { }; } diff --git a/nix/home/default.nix b/nix/home/default.nix index cff7d05..0d4c6f6 100644 --- a/nix/home/default.nix +++ b/nix/home/default.nix @@ -13,6 +13,7 @@ in ./lazydocker ./lazygit ./ripgrep + ./ruby ./skhd ./yabai ]; diff --git a/nix/home/ruby/default.nix b/nix/home/ruby/default.nix new file mode 100644 index 0000000..66342e8 --- /dev/null +++ b/nix/home/ruby/default.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: + +{ + home.file.".gemrc" = { + source = ./gemrc; + }; + + home.packages = [ + pkgs.ruby + ]; +} diff --git a/ruby/gemrc b/nix/home/ruby/gemrc similarity index 100% rename from ruby/gemrc rename to nix/home/ruby/gemrc diff --git a/setup/ruby.sh b/setup/ruby.sh index 5e43ea2..3bccc59 100755 --- a/setup/ruby.sh +++ b/setup/ruby.sh @@ -3,5 +3,3 @@ asdf plugin add ruby asdf install ruby latest asdf global ruby latest - -bundle install --gemfile=~/.dotfiles/Gemfile