From da42ba6cad0bf51087d9adb371a321216d0227e6 Mon Sep 17 00:00:00 2001 From: Mislav Pukljak Date: Wed, 12 Jun 2024 12:14:40 +0200 Subject: [PATCH 01/26] fixed transparent background in nvim --- configs/neovim/transparency.lua | 57 +++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/configs/neovim/transparency.lua b/configs/neovim/transparency.lua index a7717fc..d0090f0 100644 --- a/configs/neovim/transparency.lua +++ b/configs/neovim/transparency.lua @@ -1,22 +1,45 @@ -- transparent background -vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'FloatBorder', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'Pmenu', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'Terminal', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'EndOfBuffer', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'FoldColumn', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'Folded', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) +vim.api.nvim_set_hl(0, "FloatBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "Pmenu", { bg = "none" }) +vim.api.nvim_set_hl(0, "Terminal", { bg = "none" }) +vim.api.nvim_set_hl(0, "EndOfBuffer", { bg = "none" }) +vim.api.nvim_set_hl(0, "FoldColumn", { bg = "none" }) +vim.api.nvim_set_hl(0, "Folded", { bg = "none" }) +vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) +vim.api.nvim_set_hl(0, "NormalNC", { bg = "none" }) +vim.api.nvim_set_hl(0, "WhichKeyFloat", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopeBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopeNormal", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopePromptBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "TelescopePromptTitle", { bg = "none" }) -- transparent background for neotree -vim.api.nvim_set_hl(0, 'NeoTreeNormal', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NeoTreeNormalNC', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NeoTreeVertSplit', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NeoTreeWinSeparator', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NeoTreeEndOfBuffer', { bg = 'none' }) +vim.api.nvim_set_hl(0, "NeoTreeNormal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeNormalNC", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeVertSplit", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeWinSeparator", { bg = "none" }) +vim.api.nvim_set_hl(0, "NeoTreeEndOfBuffer", { bg = "none" }) -- transparent background for nvim-tree -vim.api.nvim_set_hl(0, 'NvimTreeNormal', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NvimTreeVertSplit', { bg = 'none' }) -vim.api.nvim_set_hl(0, 'NvimTreeEndOfBuffer', { bg = 'none' }) +vim.api.nvim_set_hl(0, "NvimTreeNormal", { bg = "none" }) +vim.api.nvim_set_hl(0, "NvimTreeVertSplit", { bg = "none" }) +vim.api.nvim_set_hl(0, "NvimTreeEndOfBuffer", { bg = "none" }) + +-- transparent notify background +vim.api.nvim_set_hl(0, "NotifyINFOBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyERRORBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyWARNBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyTRACEBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyDEBUGBody", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyINFOTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyERRORTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyWARNTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyTRACETitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyDEBUGTitle", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyINFOBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyERRORBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyWARNBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyTRACEBorder", { bg = "none" }) +vim.api.nvim_set_hl(0, "NotifyDEBUGBorder", { bg = "none" }) From d90a8d49ead627c6322383f25c5b7420aa90ed4d Mon Sep 17 00:00:00 2001 From: Frank Harris Date: Wed, 12 Jun 2024 09:45:59 -0400 Subject: [PATCH 02/26] Add support for flatpak Snap is great but doesn't have everything. Add support for flatpak packages. --- install/app-flatpak.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 install/app-flatpak.sh diff --git a/install/app-flatpak.sh b/install/app-flatpak.sh new file mode 100644 index 0000000..6cd557b --- /dev/null +++ b/install/app-flatpak.sh @@ -0,0 +1,3 @@ +sudo apt install -y flatpak +sudo apt install -y gnome-software-plugin-flatpak +flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo From a50215926707edca94f14631978025ca82acb9d9 Mon Sep 17 00:00:00 2001 From: Roeland <10061147+roelandmoors@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:17:57 +0200 Subject: [PATCH 03/26] eza: spacing after icon This makes eza with icons looks a bit better. --- defaults/bash/shell | 3 +++ 1 file changed, 3 insertions(+) diff --git a/defaults/bash/shell b/defaults/bash/shell index 350ab73..dcf2c77 100644 --- a/defaults/bash/shell +++ b/defaults/bash/shell @@ -12,3 +12,6 @@ export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omakub/bin:/usr/local/sbi set +h export OMAKUB_PATH="/home/$USER/.local/share/omakub" + +# Specifies the number of spaces to print between an icon and its file name. +export EZA_ICON_SPACING=2 From 6760d998cad6e46dc902cc5b7dfdc4653b017e31 Mon Sep 17 00:00:00 2001 From: Roeland <10061147+roelandmoors@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:37:09 +0200 Subject: [PATCH 04/26] Add fdfind The neovim healthcheck suggests fdfind. This is easy to install. --- install/apps-terminal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/apps-terminal.sh b/install/apps-terminal.sh index 1dabba2..9ca622f 100644 --- a/install/apps-terminal.sh +++ b/install/apps-terminal.sh @@ -1 +1 @@ -sudo apt install -y fzf ripgrep bat eza zoxide plocate btop apache2-utils +sudo apt install -y fzf ripgrep bat eza zoxide plocate btop apache2-utils fd-find From def167a25741e3e930d4c60555929892a02a38ec Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 11:05:51 +0200 Subject: [PATCH 05/26] Revert "eza: spacing after icon" --- defaults/bash/shell | 3 --- 1 file changed, 3 deletions(-) diff --git a/defaults/bash/shell b/defaults/bash/shell index dcf2c77..350ab73 100644 --- a/defaults/bash/shell +++ b/defaults/bash/shell @@ -12,6 +12,3 @@ export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omakub/bin:/usr/local/sbi set +h export OMAKUB_PATH="/home/$USER/.local/share/omakub" - -# Specifies the number of spaces to print between an icon and its file name. -export EZA_ICON_SPACING=2 From 310095b3edddb054fbd53fe9eca6195e65de98f5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 11:27:38 +0200 Subject: [PATCH 06/26] Alias fdfind as fd --- defaults/bash/aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults/bash/aliases b/defaults/bash/aliases index a29172e..ffce9d0 100644 --- a/defaults/bash/aliases +++ b/defaults/bash/aliases @@ -4,6 +4,7 @@ alias lsa='ls -a' alias lt='eza --tree --level=2 --long --icons --git' alias lta='lt -a' alias ff="fzf --preview 'batcat --style=numbers --color=always {}'" +alias fd="fdfind" # Directories alias ..='cd ..' From 5622bceed74f9c647d74ddff663e8b9c4f8dd8b7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 11:43:31 +0200 Subject: [PATCH 07/26] Make it Ruby on Rails --- install/select-dev-env.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/select-dev-env.sh b/install/select-dev-env.sh index 1049e77..db5c15d 100644 --- a/install/select-dev-env.sh +++ b/install/select-dev-env.sh @@ -1,10 +1,11 @@ # Install default programming languages -languages=$(gum choose "Ruby" "Node.js" "Go" "Python" "Java" --no-limit --selected "Ruby","Node.js" --height 7 --header "Select programming languages") +languages=$(gum choose "Ruby on Rails" "Node.js" "Go" "Python" "Java" --no-limit --selected "Ruby on Rails","Node.js" --height 7 --header "Select programming languages") for language in $languages; do case $language in Ruby) mise use --global ruby@3.3 + gem install rails --no-document ;; Node.js) mise use --global node@lts From 7ca3ec9ee57ef4384b7cefc5403edd94ef6e94bb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 11:44:10 +0200 Subject: [PATCH 08/26] Doesnt have to be commercial to be optional --- install/select-optional-apps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/select-optional-apps.sh b/install/select-optional-apps.sh index b18dc1d..4fa292c 100644 --- a/install/select-optional-apps.sh +++ b/install/select-optional-apps.sh @@ -1,5 +1,5 @@ # Install optional apps -apps=$(gum choose "1password" "Spotify" "Zoom" "Dropbox" "VirtualBox" --no-limit --selected "1password","Spotify","Zoom" --height 7 --header "Select commercial apps") +apps=$(gum choose "1password" "Spotify" "Zoom" "Dropbox" "VirtualBox" --no-limit --selected "1password","Spotify","Zoom" --height 7 --header "Select optional apps") for app in $apps; do source "$OMAKUB_PATH/install/optional/app-${app,,}.sh" From 2c14aece346f269b6774356e089b52ed3dbed7f8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 11:46:02 +0200 Subject: [PATCH 09/26] VirtualBox doesnt run well from within this for some reason --- install/select-optional-apps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/select-optional-apps.sh b/install/select-optional-apps.sh index 4fa292c..c781006 100644 --- a/install/select-optional-apps.sh +++ b/install/select-optional-apps.sh @@ -1,5 +1,5 @@ # Install optional apps -apps=$(gum choose "1password" "Spotify" "Zoom" "Dropbox" "VirtualBox" --no-limit --selected "1password","Spotify","Zoom" --height 7 --header "Select optional apps") +apps=$(gum choose "1password" "Spotify" "Zoom" "Dropbox" --no-limit --selected "1password","Spotify","Zoom" --height 6 --header "Select optional apps") for app in $apps; do source "$OMAKUB_PATH/install/optional/app-${app,,}.sh" From 5d49d30ae6fccf4cd4deac90c5600ca34cdba3f2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 11:46:43 +0200 Subject: [PATCH 10/26] Make Flatpak optional for now Dont like how it halts the installer for a visual authentication --- install/{ => optional}/app-flatpak.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename install/{ => optional}/app-flatpak.sh (100%) diff --git a/install/app-flatpak.sh b/install/optional/app-flatpak.sh similarity index 100% rename from install/app-flatpak.sh rename to install/optional/app-flatpak.sh From 38760ca4bdf91f86d6b71487707271e2194faa05 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:00:48 +0200 Subject: [PATCH 11/26] Separate menu for reuse, add explicit quit --- bin/omakub | 9 +-------- bin/omakub-menu | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 bin/omakub-menu diff --git a/bin/omakub b/bin/omakub index 581ca8c..ab2e8f7 100755 --- a/bin/omakub +++ b/bin/omakub @@ -1,11 +1,4 @@ #!/bin/bash source $OMAKUB_PATH/ascii.sh - -if [ $# -eq 0 ]; then - SUB=$(gum choose "Help" "Theme" "Font" "Install" "Uninstall" "Update" --height 9 --header "" | tr '[:upper:]' '[:lower:]') -else - SUB=$1 -fi - -[ -n "$SUB" ] && source $OMAKUB_PATH/bin/omakub-$SUB +source $OMAKUB_PATH/bin/omakub-menu diff --git a/bin/omakub-menu b/bin/omakub-menu new file mode 100644 index 0000000..d021b9f --- /dev/null +++ b/bin/omakub-menu @@ -0,0 +1,7 @@ +if [ $# -eq 0 ]; then + SUB=$(gum choose "Help" "Theme" "Font" "Install" "Uninstall" "Update" "Quit" --height 10 --header "" | tr '[:upper:]' '[:lower:]') +else + SUB=$1 +fi + +[ -n "$SUB" ] && [ "$SUB" != "quit" ] && source $OMAKUB_PATH/bin/omakub-$SUB From c79f2282b7a85dc21dc32bf41ad19829f40df92e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:01:04 +0200 Subject: [PATCH 12/26] Give time to see the update message --- bin/omakub-update | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/omakub-update b/bin/omakub-update index 6006134..4b4c0fb 100644 --- a/bin/omakub-update +++ b/bin/omakub-update @@ -1,3 +1,4 @@ cd $OMAKUB_PATH git pull cd - +gum spin --spinner globe --title "Update has completed!" -- sleep 3 From 5c62650f6853de378f54650197d45c8573b0c8c7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:05:08 +0200 Subject: [PATCH 13/26] Allow navigating back to omakub menu --- bin/omakub-font | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/omakub-font b/bin/omakub-font index 4269db8..9a19cdd 100644 --- a/bin/omakub-font +++ b/bin/omakub-font @@ -22,7 +22,7 @@ set_font() { if [ "$#" -gt 1 ]; then choice=${!#} else - choice=$(gum choose "Cascadia Mono" "Fira Mono" "JetBrains Mono" "Meslo" --height 6) + choice=$(gum choose "Cascadia Mono" "Fira Mono" "JetBrains Mono" "Meslo" "<< Back" --height 7) fi case $choice in @@ -38,7 +38,6 @@ case $choice in "Meslo") set_font "MesloLGS Nerd Font" "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Meslo.zip" "Meslo" "ttf" ;; - * ) - exit 0 - ;; esac + +source $OMAKUB_PATH/bin/omakub-menu From 99481d84082ec062b8fdbb6a48cc6d0be7263f41 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:18:02 +0200 Subject: [PATCH 14/26] Spacing between ascii and menu --- bin/omakub | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/omakub b/bin/omakub index ab2e8f7..a12e85e 100755 --- a/bin/omakub +++ b/bin/omakub @@ -1,4 +1,5 @@ #!/bin/bash source $OMAKUB_PATH/ascii.sh +echo "" # Add spacing source $OMAKUB_PATH/bin/omakub-menu From d13950ad2552a8ed664a9cbadaba4af179528eac Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:18:13 +0200 Subject: [PATCH 15/26] Allow navigating back from theme selection --- bin/omakub-theme | 79 +++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/bin/omakub-theme b/bin/omakub-theme index 165a0ba..a7f99f5 100644 --- a/bin/omakub-theme +++ b/bin/omakub-theme @@ -1,45 +1,48 @@ # Pick a preconfigured theme THEME_NAMES=("Tokyo Night" "Catppuccin" "Nord" "Everforest" "Gruvbox" "Kanagawa" "Rose Pine") -THEME=$(gum choose "${THEME_NAMES[@]}" --header "Choose your theme" --height 9 | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g') +THEME=$(gum choose "${THEME_NAMES[@]}" "<< Back" --header "Choose your theme" --height 10 | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g') -[ ! -n "$THEME" ] && exit 0 +if [ -n "$THEME" ] && [ "$THEME" != "<<-back" ]; then + # Install theme in Gnome, Terminal, and both default editors + source $OMAKUB_PATH/themes/gnome/$THEME.sh + cp $OMAKUB_PATH/themes/alacritty/$THEME.toml ~/.config/alacritty/theme.toml -# Install theme in Gnome, Terminal, and both default editors -source $OMAKUB_PATH/themes/gnome/$THEME.sh -cp $OMAKUB_PATH/themes/alacritty/$THEME.toml ~/.config/alacritty/theme.toml + if [ ! -f ~/.config/nvim/plugin/after/transparency.lua ]; then + mkdir -p ~/.config/nvim/plugin/after + cp $OMAKUB_PATH/configs/neovim/transparency.lua ~/.config/nvim/plugin/after/transparency.lua + fi -if [ ! -f ~/.config/nvim/plugin/after/transparency.lua ]; then - mkdir -p ~/.config/nvim/plugin/after - cp $OMAKUB_PATH/configs/neovim/transparency.lua ~/.config/nvim/plugin/after/transparency.lua + cp $OMAKUB_PATH/themes/neovim/$THEME.lua ~/.config/nvim/lua/plugins/theme.lua + sed -i "s/theme \".*\"/theme \"$THEME\"/g" ~/.config/zellij/config.kdl + + # Translate to specific VSC theme name + if [ "$THEME" == "gruvbox" ]; then + VSC_THEME="Gruvbox Dark Medium" + VSC_EXTENSION="jdinhlife.gruvbox" + elif [ "$THEME" == "catppuccin" ]; then + VSC_THEME="Catppuccin Macchiato" + VSC_EXTENSION="Catppuccin.catppuccin-vsc" + elif [ "$THEME" == "tokyo-night" ]; then + VSC_THEME="Tokyo Night" + VSC_EXTENSION="enkia.tokyo-night" + elif [ "$THEME" == "everforest" ]; then + VSC_THEME="Everforest Dark" + VSC_EXTENSION="sainnhe.everforest" + elif [ "$THEME" == "rose-pine" ]; then + VSC_THEME="Rosé Pine Dawn" + VSC_EXTENSION="mvllow.rose-pine" + elif [ "$THEME" == "nord" ]; then + VSC_THEME="Nord" + VSC_EXTENSION="arcticicestudio.nord-visual-studio-code" + elif [ "$THEME" == "kanagawa" ]; then + VSC_THEME="Kanagawa" + VSC_EXTENSION="qufiwefefwoyn.kanagawa" + fi + + code --install-extension $VSC_EXTENSION > /dev/null + sed -i "s/\"workbench.colorTheme\": \".*\"/\"workbench.colorTheme\": \"$VSC_THEME\"/g" ~/.config/Code/User/settings.json + + gum spin --spinner globe --title "Restart terminal for full theme change (Super + W, then Alt + 2)" -- sleep 3 fi -cp $OMAKUB_PATH/themes/neovim/$THEME.lua ~/.config/nvim/lua/plugins/theme.lua -sed -i "s/theme \".*\"/theme \"$THEME\"/g" ~/.config/zellij/config.kdl - -# Translate to specific VSC theme name -if [ "$THEME" == "gruvbox" ]; then - VSC_THEME="Gruvbox Dark Medium" - VSC_EXTENSION="jdinhlife.gruvbox" -elif [ "$THEME" == "catppuccin" ]; then - VSC_THEME="Catppuccin Macchiato" - VSC_EXTENSION="Catppuccin.catppuccin-vsc" -elif [ "$THEME" == "tokyo-night" ]; then - VSC_THEME="Tokyo Night" - VSC_EXTENSION="enkia.tokyo-night" -elif [ "$THEME" == "everforest" ]; then - VSC_THEME="Everforest Dark" - VSC_EXTENSION="sainnhe.everforest" -elif [ "$THEME" == "rose-pine" ]; then - VSC_THEME="Rosé Pine Dawn" - VSC_EXTENSION="mvllow.rose-pine" -elif [ "$THEME" == "nord" ]; then - VSC_THEME="Nord" - VSC_EXTENSION="arcticicestudio.nord-visual-studio-code" -elif [ "$THEME" == "kanagawa" ]; then - VSC_THEME="Kanagawa" - VSC_EXTENSION="qufiwefefwoyn.kanagawa" -fi -code --install-extension $VSC_EXTENSION > /dev/null -sed -i "s/\"workbench.colorTheme\": \".*\"/\"workbench.colorTheme\": \"$VSC_THEME\"/g" ~/.config/Code/User/settings.json - -echo "Restart your terminal for a full theme change (Super + W, then start again with Alt + 2)" +source $OMAKUB_PATH/bin/omakub-menu From 6ddbac018b8f48d83065589a254bcd81b6e42988 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:24:13 +0200 Subject: [PATCH 16/26] Always accept update --- install/app-fastfetch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/app-fastfetch.sh b/install/app-fastfetch.sh index 2bf9d6a..d747d5b 100644 --- a/install/app-fastfetch.sh +++ b/install/app-fastfetch.sh @@ -1,3 +1,3 @@ sudo add-apt-repository ppa:zhangsongcui3371/fastfetch -sudo apt update +sudo apt update -y sudo apt install -y fastfetch From 056c03d77435b923fbb9c69e76a19622b3a16134 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:26:05 +0200 Subject: [PATCH 17/26] Confirm adding apt repository too --- install/app-fastfetch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/app-fastfetch.sh b/install/app-fastfetch.sh index d747d5b..6658288 100644 --- a/install/app-fastfetch.sh +++ b/install/app-fastfetch.sh @@ -1,3 +1,3 @@ -sudo add-apt-repository ppa:zhangsongcui3371/fastfetch +sudo add-apt-repository -y ppa:zhangsongcui3371/fastfetch sudo apt update -y sudo apt install -y fastfetch From e10f1cdfb3e97585759f20644c8f686ac45eb1c0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:26:19 +0200 Subject: [PATCH 18/26] Return to menu after completion --- bin/omakub-help | 1 + bin/omakub-install | 2 ++ bin/omakub-uninstall | 2 ++ 3 files changed, 5 insertions(+) diff --git a/bin/omakub-help b/bin/omakub-help index 22820bf..af72209 100644 --- a/bin/omakub-help +++ b/bin/omakub-help @@ -1,2 +1,3 @@ HELP=$(gum choose "Hotkeys" "Commands" "Tactile" --header "What do you need help with?" --height 5 | tr '[:upper:]' '[:lower:]') [ -n "$HELP" ] && gum pager --soft-wrap <$OMAKUB_PATH/help/$HELP.md +source $OMAKUB_PATH/bin/omakub-menu diff --git a/bin/omakub-install b/bin/omakub-install index 40f5d65..1503f37 100644 --- a/bin/omakub-install +++ b/bin/omakub-install @@ -1,2 +1,4 @@ INSTALLER=$(gum file $OMAKUB_PATH/install) [ -n "$INSTALLER" ] && gum confirm "Run installer?" && source $INSTALLER +clear +source $OMAKUB_PATH/bin/omakub diff --git a/bin/omakub-uninstall b/bin/omakub-uninstall index f30c503..c1d1dc3 100644 --- a/bin/omakub-uninstall +++ b/bin/omakub-uninstall @@ -1,2 +1,4 @@ UNINSTALLER=$(gum file $OMAKUB_PATH/uninstall) [ -n "$UNINSTALLER" ] && gum confirm "Run uninstaller?" && source $UNINSTALLER +clear +source $OMAKUB_PATH/bin/omakub From 3e20d8bbca4bc2ec839725e2a7e7d7e7db5806a0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:27:30 +0200 Subject: [PATCH 19/26] Return to menu --- bin/omakub-update | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/omakub-update b/bin/omakub-update index 4b4c0fb..75e369a 100644 --- a/bin/omakub-update +++ b/bin/omakub-update @@ -2,3 +2,5 @@ cd $OMAKUB_PATH git pull cd - gum spin --spinner globe --title "Update has completed!" -- sleep 3 +clear +source $OMAKUB_PATH/bin/omakub From 2c9322ddc95a1219ec38ac159c14fa753f250593 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:30:05 +0200 Subject: [PATCH 20/26] Use a header --- bin/omakub-font | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omakub-font b/bin/omakub-font index 9a19cdd..da8c939 100644 --- a/bin/omakub-font +++ b/bin/omakub-font @@ -22,7 +22,7 @@ set_font() { if [ "$#" -gt 1 ]; then choice=${!#} else - choice=$(gum choose "Cascadia Mono" "Fira Mono" "JetBrains Mono" "Meslo" "<< Back" --height 7) + choice=$(gum choose "Cascadia Mono" "Fira Mono" "JetBrains Mono" "Meslo" "<< Back" --height 7 --header "Choose your programming font") fi case $choice in From 1210e653f8ce7643d0a23d59a744b80272fce943 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:33:57 +0200 Subject: [PATCH 21/26] Since we will be going through a separate app mostly, this is not needed --- bin/omakub-theme | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/omakub-theme b/bin/omakub-theme index a7f99f5..97ad6a8 100644 --- a/bin/omakub-theme +++ b/bin/omakub-theme @@ -41,8 +41,6 @@ if [ -n "$THEME" ] && [ "$THEME" != "<<-back" ]; then code --install-extension $VSC_EXTENSION > /dev/null sed -i "s/\"workbench.colorTheme\": \".*\"/\"workbench.colorTheme\": \"$VSC_THEME\"/g" ~/.config/Code/User/settings.json - - gum spin --spinner globe --title "Restart terminal for full theme change (Super + W, then Alt + 2)" -- sleep 3 fi source $OMAKUB_PATH/bin/omakub-menu From 5913457998bd03f87da27da2b5095be559aad21d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 12:43:35 +0200 Subject: [PATCH 22/26] Move help further down Actions first --- bin/omakub-menu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omakub-menu b/bin/omakub-menu index d021b9f..8d0d624 100644 --- a/bin/omakub-menu +++ b/bin/omakub-menu @@ -1,5 +1,5 @@ if [ $# -eq 0 ]; then - SUB=$(gum choose "Help" "Theme" "Font" "Install" "Uninstall" "Update" "Quit" --height 10 --header "" | tr '[:upper:]' '[:lower:]') + SUB=$(gum choose "Theme" "Font" "Install" "Uninstall" "Help" "Update" "Quit" --height 10 --header "" | tr '[:upper:]' '[:lower:]') else SUB=$1 fi From 5973c6428b0f7a8b70d76197a629ad4b14ea868b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 13 Jun 2024 13:17:01 +0200 Subject: [PATCH 23/26] Convert webm to mp4 Otherwise the screenshoot videos are harder to share --- defaults/bash/aliases | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/defaults/bash/aliases b/defaults/bash/aliases index ffce9d0..5e1e35f 100644 --- a/defaults/bash/aliases +++ b/defaults/bash/aliases @@ -28,3 +28,10 @@ alias gcad='git commit -a --amend' # Compression compress() { tar -czf "${1%/}.tar.gz" "${1%/}"; } alias decompress="tar -xzf" + +# Convert webm files generated by the Gnome screenshot video recorder to mp4s that are more compatible +webm2mp4() { + input_file="$1" + output_file="${input_file%.webm}.mp4" + ffmpeg -i "$input_file" -c:v libx264 -preset slow -crf 22 -c:a aac -b:a 192k "$output_file" +} From c0560d38c10808f4760604edbeafd7a4edd86e3b Mon Sep 17 00:00:00 2001 From: Frank Harris Date: Thu, 13 Jun 2024 07:52:08 -0400 Subject: [PATCH 24/26] Update app-flatpak.sh Added `sudo` to sidestep auth prompt per comment: https://github.com/basecamp/omakub/pull/102#issuecomment-2165132621 --- install/optional/app-flatpak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/optional/app-flatpak.sh b/install/optional/app-flatpak.sh index 6cd557b..c49b421 100644 --- a/install/optional/app-flatpak.sh +++ b/install/optional/app-flatpak.sh @@ -1,3 +1,3 @@ sudo apt install -y flatpak sudo apt install -y gnome-software-plugin-flatpak -flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo +sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo From a9e4340633ab39ecff0e9877b0681467aa6d4fba Mon Sep 17 00:00:00 2001 From: Mats Estensen Date: Thu, 13 Jun 2024 14:18:35 +0200 Subject: [PATCH 25/26] fix: disable lazyvim plugin update notify Closes #115 --- install/app-neovim.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/app-neovim.sh b/install/app-neovim.sh index 1548e63..987c7af 100644 --- a/install/app-neovim.sh +++ b/install/app-neovim.sh @@ -2,6 +2,8 @@ sudo apt install -y neovim if [ ! -d "$HOME/.config/nvim" ]; then git clone https://github.com/LazyVim/starter ~/.config/nvim + # Disable update notification popup in starter config + sed -i 's/checker = { enabled = true }/checker = { enabled = true, notify = false }/g' ~/.config/nvim/lua/config/lazy.lua mkdir -p ~/.config/nvim/plugin/after cp ~/.local/share/omakub/configs/neovim/transparency.lua ~/.config/nvim/plugin/after/ cp ~/.local/share/omakub/themes/neovim/tokyo-night.lua ~/.config/nvim/lua/plugins/theme.lua From c3a7a4f142087416d2bbaf186fa26ea5443d3d2a Mon Sep 17 00:00:00 2001 From: Edgar Latorre Date: Thu, 13 Jun 2024 15:53:12 +0200 Subject: [PATCH 26/26] Add elixir as a development option --- install/select-dev-env.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/select-dev-env.sh b/install/select-dev-env.sh index db5c15d..27f49b3 100644 --- a/install/select-dev-env.sh +++ b/install/select-dev-env.sh @@ -1,5 +1,5 @@ # Install default programming languages -languages=$(gum choose "Ruby on Rails" "Node.js" "Go" "Python" "Java" --no-limit --selected "Ruby on Rails","Node.js" --height 7 --header "Select programming languages") +languages=$(gum choose "Ruby on Rails" "Node.js" "Go" "Python" "Java" "Elixir" --no-limit --selected "Ruby on Rails","Node.js" --height 8 --header "Select programming languages") for language in $languages; do case $language in @@ -19,6 +19,10 @@ for language in $languages; do Python) mise use --global python@latest ;; + Elixir) + mise use --global erlang@latest + mise use --global elixir@latest + ;; esac done