From c284fe3dabfdae31cb387ca704e052df1d0aa840 Mon Sep 17 00:00:00 2001 From: Alan Maciel Date: Fri, 5 Jul 2024 14:40:51 -0600 Subject: [PATCH 1/6] Add doom emacs --- bin/omakub-sub/install.sh | 1 + install/desktop/optional/app-doom-emacs.sh | 5 +++++ uninstall/app-doom-emacs.sh | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 install/desktop/optional/app-doom-emacs.sh create mode 100644 uninstall/app-doom-emacs.sh diff --git a/bin/omakub-sub/install.sh b/bin/omakub-sub/install.sh index f7413f3..29dd309 100644 --- a/bin/omakub-sub/install.sh +++ b/bin/omakub-sub/install.sh @@ -3,6 +3,7 @@ CHOICES=( "Dev Database Install development database in Docker" "1password Manage your passwords securely across devices" "Brave Chrome-based browser with built-in ad blocking" + "Doom Emacs Emacs framework with curated list of packages" "Dropbox Sync files across computers with ease" "OBS Studio Record screencasts with inputs from both display + webcam" "Audacity Record and edit audio" diff --git a/install/desktop/optional/app-doom-emacs.sh b/install/desktop/optional/app-doom-emacs.sh new file mode 100644 index 0000000..e18f5a5 --- /dev/null +++ b/install/desktop/optional/app-doom-emacs.sh @@ -0,0 +1,5 @@ +sudo apt update -y +sudo apt upgrade -y +sudo apt install -y emacs cmake libtool-bin +git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.config/emacs +~/.config/emacs/bin/doom install diff --git a/uninstall/app-doom-emacs.sh b/uninstall/app-doom-emacs.sh new file mode 100644 index 0000000..abf4f30 --- /dev/null +++ b/uninstall/app-doom-emacs.sh @@ -0,0 +1,3 @@ +sudo apt remove --purge -y emacs cmake libtool-bin +sudo rm -rf ~/.config/emacs +sudo rm -rf ~/.config/doom From f75254c039f3414529b33128233ec8531c1d0a54 Mon Sep 17 00:00:00 2001 From: Alan Maciel Date: Sat, 6 Jul 2024 14:29:24 -0600 Subject: [PATCH 2/6] Remove some libs --- install/desktop/optional/app-doom-emacs.sh | 4 +--- uninstall/app-doom-emacs.sh | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/install/desktop/optional/app-doom-emacs.sh b/install/desktop/optional/app-doom-emacs.sh index e18f5a5..7d5ada8 100644 --- a/install/desktop/optional/app-doom-emacs.sh +++ b/install/desktop/optional/app-doom-emacs.sh @@ -1,5 +1,3 @@ -sudo apt update -y -sudo apt upgrade -y -sudo apt install -y emacs cmake libtool-bin +sudo apt install -y emacs git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.config/emacs ~/.config/emacs/bin/doom install diff --git a/uninstall/app-doom-emacs.sh b/uninstall/app-doom-emacs.sh index abf4f30..0b98d5b 100644 --- a/uninstall/app-doom-emacs.sh +++ b/uninstall/app-doom-emacs.sh @@ -1,3 +1,4 @@ -sudo apt remove --purge -y emacs cmake libtool-bin +sudo apt remove --purge -y emacs emacs-gtk sudo rm -rf ~/.config/emacs +sudo rm -rf ~/.emacs.d sudo rm -rf ~/.config/doom From 66182b859df26fca06338d604bcbcd10728c11da Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 12 Jul 2024 12:15:06 +0200 Subject: [PATCH 3/6] Add Zed as an optional editor choice --- bin/omakub-sub/install.sh | 3 ++- install/desktop/optional/app-zed.sh | 1 + uninstall/app-zed.sh | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 install/desktop/optional/app-zed.sh create mode 100644 uninstall/app-zed.sh diff --git a/bin/omakub-sub/install.sh b/bin/omakub-sub/install.sh index f7413f3..dfc6209 100644 --- a/bin/omakub-sub/install.sh +++ b/bin/omakub-sub/install.sh @@ -8,6 +8,7 @@ CHOICES=( "Audacity Record and edit audio" "Ollama Run LLMs, like Meta's Llama3, locally" "RubyMine IntelliJ's commercial Ruby editor" + "Zed Fast all-purpose editor" "Spotify Stream music from the world's most popular service" "Steam Play games from Valve's store" "Zoom Attend and host video chat meetings" @@ -16,7 +17,7 @@ CHOICES=( "<< Back " ) -CHOICE=$(gum choose "${CHOICES[@]}" --height 17 --header "Install application") +CHOICE=$(gum choose "${CHOICES[@]}" --height 18 --header "Install application") if [[ "$CHOICE" == "<< Back"* ]] || [[ -z "$CHOICE" ]]; then # Don't install anything diff --git a/install/desktop/optional/app-zed.sh b/install/desktop/optional/app-zed.sh new file mode 100644 index 0000000..63380c7 --- /dev/null +++ b/install/desktop/optional/app-zed.sh @@ -0,0 +1 @@ +curl https://zed.dev/install.sh | sh diff --git a/uninstall/app-zed.sh b/uninstall/app-zed.sh new file mode 100644 index 0000000..a8f566f --- /dev/null +++ b/uninstall/app-zed.sh @@ -0,0 +1,4 @@ +rm -rf ~/.local/zed.app +rm -rf ~/.local/bin/zed +rm .rf ~/.local/share/applications/dev.zed.Zed.desktop +rm -rf ~/.config/zed From b13a0041f2537fb47d185d698b0f6c9719410f68 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 12 Jul 2024 12:21:50 +0200 Subject: [PATCH 4/6] Switch nord scheme for Neovim to fix visibilty bug Closes #111, #109 --- themes/nord/neovim.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/nord/neovim.lua b/themes/nord/neovim.lua index fc2254e..27a68b1 100644 --- a/themes/nord/neovim.lua +++ b/themes/nord/neovim.lua @@ -1,9 +1,9 @@ return { - { "shaunsingh/nord.nvim" }, + { "EdenEast/nightfox.nvim" }, { "LazyVim/LazyVim", opts = { - colorscheme = "nord", + colorscheme = "nordfox", }, }, } From 36464839c95e0278eef32bcd299e1b5c68cce9f7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 12 Jul 2024 12:25:13 +0200 Subject: [PATCH 5/6] Alpha sort list and make room for the new addition --- bin/omakub-sub/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/omakub-sub/install.sh b/bin/omakub-sub/install.sh index 33cff0d..3e35081 100644 --- a/bin/omakub-sub/install.sh +++ b/bin/omakub-sub/install.sh @@ -2,23 +2,23 @@ CHOICES=( "Dev Language Install programming language environment" "Dev Database Install development database in Docker" "1password Manage your passwords securely across devices" + "Audacity Record and edit audio" "Brave Chrome-based browser with built-in ad blocking" "Doom Emacs Emacs framework with curated list of packages" "Dropbox Sync files across computers with ease" "OBS Studio Record screencasts with inputs from both display + webcam" - "Audacity Record and edit audio" "Ollama Run LLMs, like Meta's Llama3, locally" "RubyMine IntelliJ's commercial Ruby editor" - "Zed Fast all-purpose editor" "Spotify Stream music from the world's most popular service" "Steam Play games from Valve's store" - "Zoom Attend and host video chat meetings" "VirtualBox Virtual machines to run Windows/Linux" + "Zed Fast all-purpose editor" + "Zoom Attend and host video chat meetings" "> All Re-run any of the default installers" "<< Back " ) -CHOICE=$(gum choose "${CHOICES[@]}" --height 18 --header "Install application") +CHOICE=$(gum choose "${CHOICES[@]}" --height 19 --header "Install application") if [[ "$CHOICE" == "<< Back"* ]] || [[ -z "$CHOICE" ]]; then # Don't install anything From f288b63a277c0884ed5074788cb387d21b83a577 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 12 Jul 2024 14:08:42 +0200 Subject: [PATCH 6/6] Release v1.1.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 9084fa2..524cb55 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.0 +1.1.1