diff --git a/.dotter/global.toml b/.dotter/global.toml index 7770d4f..0920439 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -14,6 +14,7 @@ nerd_font = "JetBrainsMono" [cli.files] "config/bat" = "~/.config/bat" +"config/kitty" = {target = "~/.config/kitty", type = "symbolic" } "config/sesh" = "~/.config/sesh" "config/tmux" = "~/.config/tmux" "config/yazi" = "~/.config/yazi" diff --git a/.dotter/machines/fedora.toml b/.dotter/machines/fedora.toml index 63e5773..368f1da 100644 --- a/.dotter/machines/fedora.toml +++ b/.dotter/machines/fedora.toml @@ -21,10 +21,11 @@ cli = [ "duf", "eza", "fd-find", - "firefox-dev", + # "firefox-dev", "flatpak", "fzf", "git", + "kitty", "lazygit", "neovim", "remove-retired-packages", @@ -47,6 +48,11 @@ dev = [ "tree-sitter-cli", ] +[zsh.variables.packages] +zssh = [ + "zsh" +] + [rust.variables] cargo.packages = [ "yazi-fm", diff --git a/.dotter/pre_deploy.sh b/.dotter/pre_deploy.sh index 9b30d7a..0778ecf 100644 --- a/.dotter/pre_deploy.sh +++ b/.dotter/pre_deploy.sh @@ -2,6 +2,7 @@ # shellcheck disable=all # This is a handlerbars template, so ignore issues +set -euo pipefail checksum_file=".dotter/cache/pre_deploy.checksum" @@ -16,12 +17,23 @@ fi {{ header "Running pre deploy script for distro" (to_title_case distro) }} -{{ #if (and dotter.packages.cli (is_executable "sudo")) }} +{{ #if (is_executable "sudo") }} {{ header "Configuring sudo" }} -echo "Defaults pwfeedback" | sudo -B tee /etc/sudoers.d/01-user -echo "Defaults timestamp_timeout=10" | sudo -B tee -a /etc/sudoers.d/01-user -echo "Defaults timestamp_type=global" | sudo -B tee -a /etc/sudoers.d/01-user +SUDOERS_FILE="/etc/sudoers.d/01-user" + +if [[ -e "${SUDOERS_FILE}" ]]; then + echo "Sudo configuration already exists, to override it remove the file: ${SUDOERS_FILE}" + exit 0 +else + sudo -B tee "${SUDOERS_FILE}" <