Skip to content

Commit 306045f

Browse files
committed
Add links to Lima & Colima
- Add links to Lima and add Colima - Wording tweaks throughout Signed-off-by: Joe Block <[email protected]>
1 parent 997bae5 commit 306045f

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ Perl has a long history of being the system administrator's friend, bringing the
253253

254254
#### Google Cloud
255255

256-
- [Introduction](https://cloud.google.com/docs/overview/) official introduction and an overview.
257-
- [GCP for AWS professionals](https://cloud.google.com/docs/compare/aws/) list equivalents for AWS products in GCP.
258-
- [GCP for Azure professionals](https://cloud.google.com/docs/compare/azure/) list equivalents for Azure products in GCP.
256+
- [Introduction](https://cloud.google.com/docs/overview/) is Google's official introduction and an overview.
257+
- [GCP for AWS professionals](https://cloud.google.com/docs/compare/aws/) lists equivalents for AWS products in GCP.
258+
- [GCP for Azure professionals](https://cloud.google.com/docs/compare/azure/) lists equivalents for Azure products in GCP.
259259

260260
#### OpenStack
261261

@@ -297,7 +297,7 @@ Follow the installation instructions for your preferred platform (Currently, onl
297297

298298
- [Getting started with containerd](https://containerd.io/docs/getting-started/)
299299

300-
On macOS, you can use Lima, which launches Linux virtual machines with automatic file sharing, port forwarding, and [containerd](https://containerd.io/) installed. You can use the [lima xbar plugin](https://github.com/unixorn/lima-xbar-plugin) for a simple menubar application to control your Lima VMs.
300+
On macOS, you can use [Lima](https://github.com/lima-vm/lima) or [Colima](https://github.com/abiosoft/colima) which both launch Linux virtual machines with automatic file sharing, port forwarding, and [containerd](https://containerd.io/) installed. You can use the [lima xbar plugin](https://github.com/unixorn/lima-xbar-plugin) for a simple menubar application to control your Lima or Colima VMs.
301301

302302
#### Docker
303303

@@ -332,7 +332,7 @@ Have you ever wondered exactly what happens when you type something like `kubect
332332

333333
#### Utilities
334334

335-
- [k3s](https://k3s.io/) - k3s is a kubernetes distribution optimized for IOT and edge computing. It is packaged as a single binary for ARM64, ARMv7 and X86 and is ideal for a learning environment - you can set up a k3s instance in less than five minutes, and if you break it, tear it down and re-install it quickly.
335+
- [k3s](https://k3s.io/) - k3s is a kubernetes distribution optimized for IOT and edge computing. It is packaged as single binaries for ARM64, ARMv7 and X86 and is ideal for a learning environment - you can set up a k3s instance in less than five minutes, and if you break it, tear it down and re-install it just as quickly.
336336
- [krew](https://github.com/kubernetes-sigs/krew/) - Makes it easy to use [kubectl plugins](https://kubernetes.io/docs/tasks/extend-kubectl/kubectl-plugins/). `krew` helps you discover plugins, install and manage them on your machine. It is similar to tools like `apt`, `dnf` or `brew`. Today, over 70 `kubectl` plugins are available on `krew`.
337337
- [kubectx](https://github.com/ahmetb/kubectx) - Provides the `kubectx` command, which makes it easy to switch between clusters specified in your `.kube/config`, and `kubens`, which helps you switch between Kubernetes namespaces smoothly.
338338

@@ -363,7 +363,7 @@ Enter regexes and the `grep` family of tools.
363363

364364
When you have a multi-gigabyte logfile, it's a lot less painful to look at just the entries generated by the service that you got alerted about. Even better to only look at the error messages from the service, and something as basic as `grep -i yourservice < log | grep -i errorcode` can convert a potentially multi-hour ordeal into a quick minute or two task.
365365

366-
- [autoregex](https://www.autoregex.xyz) - This site will let you paste a regex in and have it translate it to English, or make an English statement like "First character A, second character B, up to three B characters, then a C and end of line" and have that translated to `^A.{0,3}BC$`.
366+
- [autoregex](https://www.autoregex.xyz) - This site will let you paste a regex into it and have it translated to English, or make an English statement like "First character A, second character B, up to three B characters, then a C and end of line" and have that translated to `^A.{0,3}BC$`.
367367
- [debuggex.com](https://www.debuggex.com/) will visualize regular expressions graphically.
368368
- [Introducing Regular Expressions](http://shop.oreilly.com/product/0636920012337.do) - Michael Fitzgerald's O'Reilly Book is a good place to start.
369369
- [Regex for Noobs](https://www.janmeppe.com/blog/regex-for-noobs/) - An illustrated guide to regex that aims to provide a gentle introduction for people who never have fiddled with regex, want to, but are kind of intimidated by the whole thing.
@@ -399,9 +399,9 @@ Here are a few articles that while focused on `git` commit messages apply to any
399399

400400
#### Git
401401

402-
Whether or not your shop uses `git` internally, you're going to end up needing to use it for the many useful things on GitHub and GitLab.
402+
Whether or not your shop uses `git` internally, you're going to end up needing to use it for the many useful tools and references hosted on GitHub and GitLab.
403403

404-
- [19 Git Tips for Everyday Use](http://www.alexkras.com/19-git-tips-for-everyday-use/) - a good set of starter tips for using git.
404+
- [19 Git Tips for Everyday Use](http://www.alexkras.com/19-git-tips-for-everyday-use/) - a good set of starter tips for using `git`.
405405
- [git-extra-commands](https://github.com/unixorn/git-extra-commands) - a misleadingly named collection of extra `git` helper scripts, blog posts, tutorials and videos.
406406
- [git-flight-rules](https://github.com/k88hudson/git-flight-rules) is Kate Hudson's guide to using `git` in specific situations.
407407
- [git-tips/tips](https://github.com/git-tips/tips) is a collection of `git` tips
@@ -431,7 +431,7 @@ However, you should care about your tools. You should be able to use them effic
431431

432432
#### Vim
433433

434-
`vim` is a reality of life for SysAdmins. It is the one editor you can be sure is installed in even the most minimal *NIX or linux install. You must be able to do at least basic edits with it. You don't need to love it, but you _will_ have to use it.
434+
`vim` is a reality of life for SysAdmins. It is the one editor you can be sure is installed in even the most minimal *NIX or linux install. You must be able to do at least basic edits with it. You don't need to love it, but eventually you _will_ have to use it.
435435

436436
- [Damian Conway, "More Instantly Better Vim" - OSCON 2013](https://www.youtube.com/watch?v=aHm36-na4-4)
437437
- [vi and Vim Editors Pocket Reference, 2nd Edition](http://shop.oreilly.com/product/0636920010913.do)
@@ -446,17 +446,17 @@ If you want to get a taste of what `emacs` can do, you can defer to Magnars and
446446

447447
One of the biggest problems with `emacs` is that the defaults present a fairly different experience to what people are used to in other editors. Your first stop should be learning the basics using the built-in tutorial, followed by the mini-manual from tuhdo:
448448

449-
-Type `ctrl-h`, followed closely by `t` from within `emacs` to see the tutorial [http://tuhdo.github.io/index.html](http://tuhdo.github.io/index.html)
449+
- Type `ctrl-h`, followed closely by `t` from within `emacs` to see the tutorial [http://tuhdo.github.io/index.html](http://tuhdo.github.io/index.html).
450450

451451
Emacs can be can be made to look and act relatively modern if that's your desire:
452452

453453
- [http://emacs.sexy/](http://emacs.sexy/)
454454

455-
If you're looking for `emacs` packages, the following online package index is the most popular, and tracks many:
455+
If you're looking for `emacs` packages, the following online package index is the most popular, and tracks many of them:
456456

457457
- [http://melpa.org/](http://melpa.org/)
458458

459-
There are several excellent starter kits out there, with varying delineations of wizz-bang. Here are some starter kits, with spacemacs being the most popular:
459+
There are several excellent starter kits out there, with varying delineations of whiz-bang. Here are some starter kits, with spacemacs being the most popular:
460460

461461
- [bbatsov/prelude](https://github.com/bbatsov/prelude)
462462
- [hlissner/doom-emacs](https://github.com/hlissner/doom-emacs)
@@ -471,7 +471,7 @@ Here are some `emacs` configurations for inspiration:
471471

472472
#### Visual Editors and IDEs
473473

474-
Use tools with which you are productive. If you want to use a GUI Text Editor or IDE, don't let anyone give you a hard time about that.
474+
Use tools which help you be productive. If you want to use a GUI Text Editor or IDE, don't let anyone give you a hard time about that.
475475

476476
There are GUI versions of `vim` and `emacs` that have ardent followers.
477477

@@ -554,7 +554,7 @@ Packetlife has some great cheat sheets and posters [here](https://packetlife.net
554554

555555
Writing good documentation and design docs is as important as writing code. The more senior you are, the more writing you're going to have to do - communication skills are a must.
556556

557-
- Email - Like it or not, you're going to write a _lot_ of email in the course of your work. Lazarus Lazaridis wrote a good article on [Composing Better Emails](https://iridakos.com/how-to/2019/06/26/composing-better-emails.html)
557+
- Email - Like it or not, you're going to write a _lot_ of email in the course of your work. Make them good. Lazarus Lazaridis wrote a good article on [Composing Better Emails](https://iridakos.com/how-to/2019/06/26/composing-better-emails.html)
558558
- Gergely Orosz wrote an excellent blog post about [Undervalued Software Engineering Skills: Writing Well](https://blog.pragmaticengineer.com/on-writing-well/).
559559

560560
### Finance/Salary

0 commit comments

Comments
 (0)