minor updates
This commit is contained in:
parent
a4e06120d2
commit
9d3fa8e910
6 changed files with 46 additions and 13 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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}" <<EOF
|
||||
Defaults pwfeedback
|
||||
Defaults timestamp_timeout=10
|
||||
Defaults timestamp_type=global
|
||||
EOF
|
||||
|
||||
sudo chmod 0440 "${SUDOERS_FILE}"
|
||||
fi
|
||||
|
||||
{{ /if }}
|
||||
|
||||
|
|
@ -44,6 +56,12 @@ sudo -B dnf install -y {{~# each (flatten_table packages) }} '{{ this }}' {{~ /e
|
|||
|
||||
{{~ /if }}
|
||||
|
||||
{{ #if dotter.packages.zsh }}
|
||||
|
||||
[ "$SHELL" != "$(which zsh)" ] && chsh -s "$(which zsh)"
|
||||
|
||||
{{ /if }}
|
||||
|
||||
{{#if (and dotter.packages.rust (not (is_executable "cargo"))) }}
|
||||
|
||||
{{ header "Installing rust" }}
|
||||
|
|
@ -69,6 +87,12 @@ tmp_dir=$(mktemp -d)
|
|||
curl -L https://github.com/ryanoasis/nerd-fonts/releases/latest/download/{{ nerd_font }}.zip -o "$tmp_dir/{{ nerd_font}}.zip"
|
||||
unzip -o "$tmp_dir/{{nerd_font}}.zip" -d ${FONT_DIR}/{{ nerd_font }}
|
||||
|
||||
curl -L https://github.com/joshmedeski/sesh/releases/latest/download/sesh_Linux_x86_64.tar.gz -o "$tmp_dir/sesh.tar.gz"
|
||||
|
||||
mkdir -p "$HOME/.local/bin"
|
||||
|
||||
tar xvf "$tmp_dir/sesh.tar.gz" --directory="$HOME/.local/bin" sesh
|
||||
|
||||
rm -rf "$tmp_dir"
|
||||
|
||||
{{ /if }}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
includes = []
|
||||
packages = ["default", "cli", "dev"]
|
||||
includes = [".dotter/machines/fedora.toml"]
|
||||
packages = ["cli", "dev"]
|
||||
|
||||
[files]
|
||||
|
||||
[variables]
|
||||
packages = ["neovim", "fzf"]
|
||||
nvim-core = true
|
||||
nvim-base = true
|
||||
nvim-ide = true
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
"copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" },
|
||||
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" },
|
||||
"grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
|
||||
"lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
|
||||
|
|
@ -59,8 +59,8 @@
|
|||
"ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" },
|
||||
"typescript-tools.nvim": { "branch": "master", "commit": "5da4d695d66f676eb6ea766b946e86f93baaafe7" },
|
||||
"undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
|
||||
"vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" },
|
||||
"vim-dadbod-completion": { "branch": "master", "commit": "da0e75c09c27a82aad078d993bb1b2f4afd43427" },
|
||||
"vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
|
||||
"vim-dadbod-completion": { "branch": "master", "commit": "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d" },
|
||||
"vim-dadbod-ui": { "branch": "master", "commit": "f74a31e8c6c5a9dccc63450a09d5cd64a9294330" },
|
||||
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
|
||||
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ startup_command = "ls"
|
|||
|
||||
[[session]]
|
||||
name = "Dotfiles"
|
||||
path = "~/.local/share/chezmoi/"
|
||||
path = "~/Repos/Private/dots"
|
||||
startup_command = "nvim -c ':Telescope find_files'"
|
||||
|
||||
[[session]]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue