From 01225fd44da44bc392696c9d7e5b95d621aa6b7c Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Sun, 27 Aug 2023 11:43:02 +0200 Subject: [PATCH] chore: rework directory structure Signed-off-by: Matej Focko --- playbooks/bootstrap.yml | 71 +++++-- playbooks/fedora_repository.yml | 10 - playbooks/fedora_upgrade.yml | 9 - playbooks/roles/fedora/meta/main.yml | 4 - .../roles/fedora/packages/tasks/main.yml | 14 -- .../roles/fedora/packages/tasks/shell.yml | 10 - .../roles/fedora/repositories/tasks/main.yml | 38 ---- .../templates/local/fedora-modular.repo.j2 | 35 ---- .../local/fedora-updates-modular.repo.j2 | 38 ---- .../fedora-updates-testing-modular.repo.j2 | 36 ---- .../local/fedora-updates-testing.repo.j2 | 35 ---- .../templates/local/fedora-updates.repo.j2 | 35 ---- .../templates/local/fedora.repo.j2 | 35 ---- .../rpmfusion-free-updates-testing.repo.j2 | 31 ---- .../local/rpmfusion-free-updates.repo.j2 | 31 ---- .../templates/local/rpmfusion-free.repo.j2 | 33 ---- .../rpmfusion-nonfree-updates-testing.repo.j2 | 31 ---- .../local/rpmfusion-nonfree-updates.repo.j2 | 31 ---- .../templates/local/rpmfusion-nonfree.repo.j2 | 34 ---- .../templates/remote/fedora-modular.repo.j2 | 36 ---- .../remote/fedora-updates-modular.repo.j2 | 36 ---- .../fedora-updates-testing-modular.repo.j2 | 36 ---- .../remote/fedora-updates-testing.repo.j2 | 36 ---- .../templates/remote/fedora-updates.repo.j2 | 36 ---- .../templates/remote/fedora.repo.j2 | 36 ---- .../rpmfusion-free-updates-testing.repo.j2 | 30 --- .../remote/rpmfusion-free-updates.repo.j2 | 30 --- .../templates/remote/rpmfusion-free.repo.j2 | 32 ---- .../rpmfusion-nonfree-updates-testing.repo.j2 | 30 --- .../remote/rpmfusion-nonfree-updates.repo.j2 | 30 --- .../remote/rpmfusion-nonfree.repo.j2 | 33 ---- playbooks/roles/fedora/upgrade/tasks/main.yml | 24 --- playbooks/roles/flatpaks/tasks/main.yml | 17 -- playbooks/roles/git/tasks/main.yml | 5 - playbooks/roles/git/templates/gitconfig.j2 | 36 ---- playbooks/roles/haskell/tasks/main.yml | 10 - playbooks/roles/shell/tasks/alacritty.yml | 5 - playbooks/roles/shell/tasks/emacs.yml | 8 - playbooks/roles/shell/tasks/main.yml | 16 -- playbooks/roles/shell/tasks/nvim.yml | 12 -- playbooks/roles/shell/tasks/zsh.yml | 56 ------ .../shell/templates/alacritty/alacritty.yml | 75 -------- .../alacritty/colors/solarized_dark.yml | 33 ---- playbooks/roles/shell/templates/init.vim.j2 | 158 ---------------- .../roles/shell/templates/scripts/srht.py | 39 ---- .../roles/shell/templates/starship.toml.j2 | 44 ----- playbooks/roles/shell/templates/zshrc.j2 | 42 ----- playbooks/roles/ssh/tasks/main.yml | 24 --- playbooks/roles/ssh/templates/ssh_config.j2 | 38 ---- playbooks/roles/vscode/tasks/main.yml | 32 ---- .../vscode/templates/keybindings.json.j2 | 34 ---- .../roles/vscode/templates/settings.json.j2 | 56 ------ roles/system/base/tasks/main.yml | 12 ++ roles/system/base/tasks/upgrade.yml | 19 ++ .../system/fedora/files/google-chrome.repo | 0 roles/system/fedora/tasks/main.yml | 3 + roles/system/fedora/tasks/repositories.yml | 18 ++ roles/system/flatpak/defaults/main.yml | 3 + roles/system/flatpak/tasks/main.yml | 15 ++ roles/user/base/files/srht.py | 86 +++++++++ .../user/base/files}/toolbox_name.sh | 2 +- roles/user/base/tasks/desktop-utilities.yml | 8 + roles/user/base/tasks/main.yml | 9 + roles/user/base/tasks/scripts.yml | 12 ++ roles/user/base/tasks/structure.yml | 20 ++ roles/user/editors/emacs/tasks/install.yml | 6 + roles/user/editors/emacs/tasks/main.yml | 11 ++ roles/user/editors/neovim/tasks/install.yml | 6 + roles/user/editors/neovim/tasks/main.yml | 10 + .../vscode/files/code-url-handler.desktop | 0 .../user/editors/vscode/files/code.desktop | 0 .../editors/vscode/files/keybindings.json | 78 ++++++++ roles/user/editors/vscode/files/settings.json | 65 +++++++ .../user/editors/vscode/files/update.sh | 0 roles/user/editors/vscode/tasks/main.yml | 40 ++++ roles/user/git/tasks/main.yml | 6 + roles/user/git/templates/gitconfig | 42 +++++ .../user/lang/haskell/files/ghci.conf | 0 roles/user/lang/haskell/tasks/install.yml | 6 + roles/user/lang/haskell/tasks/main.yml | 16 ++ roles/user/secrets/bw/tasks/main.yml | 38 ++++ .../user/shell/tmux/files/tmux.conf | 2 +- .../user/shell/tmux/files/tmux_status.conf | 0 roles/user/shell/tmux/tasks/install.yml | 6 + .../user/shell/tmux/tasks/main.yml | 19 +- roles/user/shell/zsh/files/starship.toml | 65 +++++++ roles/user/shell/zsh/files/zshrc | 173 ++++++++++++++++++ roles/user/shell/zsh/tasks/install.yml | 23 +++ roles/user/shell/zsh/tasks/main.yml | 18 ++ roles/user/shell/zsh/tasks/oh-my-zsh.yml | 35 ++++ roles/user/shell/zsh/tasks/starship.yml | 17 ++ roles/user/ssh/files/ssh_config | 58 ++++++ roles/user/ssh/tasks/main.yml | 14 ++ .../terminals/alacritty/files/alacritty.yml | 118 ++++++++++++ .../alacritty/files}/colors/ayu_dark.yml | 0 .../alacritty/files}/colors/ayu_mirage.yml | 0 .../alacritty/files}/colors/breeze.yml | 0 .../alacritty/files}/colors/campbell.yml | 0 .../alacritty/files/colors/codedark.yml | 28 +++ .../alacritty/files/colors/codelight.yml | 28 +++ .../alacritty/files}/colors/default.yml | 0 .../alacritty/files/colors/dracula.yml | 61 ++++++ .../alacritty/files}/colors/gruvbox_dark.yml | 0 .../alacritty/files}/colors/gruvbox_light.yml | 0 .../alacritty/files/colors/kanagawa.yml | 33 ++++ .../files}/colors/monokai/classic.yml | 0 .../alacritty/files}/colors/monokai/pro.yml | 0 .../colors/monokai/pro_filter_machine.yml | 0 .../colors/monokai/pro_filter_octagon.yml | 0 .../colors/monokai/pro_filter_ristretto.yml | 0 .../colors/monokai/pro_filter_spectrum.yml | 0 .../alacritty/files}/colors/night_owl.yml | 0 .../alacritty/files}/colors/nord.yml | 0 .../alacritty/files}/colors/ocean.yml | 0 .../alacritty/files}/colors/one_dark.yml | 0 .../alacritty/files}/colors/one_dark_pro.yml | 0 .../alacritty/files}/colors/one_light.yml | 0 .../alacritty/files/colors/onehalf_dark.yml | 27 +++ .../alacritty/files/colors/onehalf_light.yml | 25 +++ .../files}/colors/outrun_electric.yml | 0 .../alacritty/files}/colors/rainier.yml | 0 .../alacritty/files}/colors/rainier_retro.yml | 0 .../files}/colors/rose-pine-dawn.yml | 0 .../files}/colors/rose-pine-moon.yml | 0 .../alacritty/files}/colors/rose-pine.yml | 0 .../alacritty/files/colors/solarized_dark.yml | 28 +++ .../files}/colors/solarized_light.yml | 0 .../alacritty/files}/colors/tokyo_night.yml | 0 .../files}/colors/tokyo_night_storm.yml | 0 .../alacritty/files}/colors/tomorrow_day.yml | 0 .../files}/colors/tomorrow_night.yml | 0 .../files}/colors/tomorrow_night_bright.yml | 0 .../terminals/alacritty/tasks/install.yml | 13 ++ roles/user/terminals/alacritty/tasks/main.yml | 10 + .../kitty/files}/colors/ayu_dark.conf | 0 .../kitty/files}/colors/ayu_mirage.conf | 0 .../terminals/kitty/files}/colors/convert.py | 0 .../kitty/files}/colors/default.conf | 0 .../kitty/files}/colors/dracula.conf | 0 .../kitty/files}/colors/kanagawa.conf | 1 - .../kitty/files}/colors/monokai/classic.yml | 0 .../kitty/files}/colors/monokai/pro.yml | 0 .../colors/monokai/pro_filter_machine.yml | 0 .../colors/monokai/pro_filter_octagon.yml | 0 .../colors/monokai/pro_filter_ristretto.yml | 0 .../colors/monokai/pro_filter_spectrum.yml | 0 .../kitty/files}/colors/night_owl.conf | 0 .../terminals/kitty/files}/colors/nord.conf | 0 .../terminals/kitty/files}/colors/ocean.conf | 0 .../kitty/files}/colors/one_dark.conf | 0 .../kitty/files}/colors/one_dark_pro.conf | 0 .../kitty/files}/colors/one_light.conf | 0 .../kitty/files}/colors/onehalf_dark.conf | 0 .../kitty/files}/colors/onehalf_light.conf | 0 .../kitty/files}/colors/outrun_electric.conf | 0 .../kitty/files}/colors/rainier.conf | 0 .../kitty/files}/colors/rainier_retro.conf | 0 .../kitty/files}/colors/solarized_dark.conf | 0 .../kitty/files}/colors/solarized_light.conf | 0 .../kitty/files}/colors/tokyo_night.conf | 0 .../files}/colors/tokyo_night_storm.conf | 0 .../kitty/files}/colors/tomorrow_day.conf | 0 .../kitty/files}/colors/tomorrow_night.conf | 0 .../files}/colors/tomorrow_night_blue.conf | 0 .../files}/colors/tomorrow_night_bright.conf | 0 .../colors/tomorrow_night_eighties.conf | 0 .../user/terminals/kitty/files}/kitty.conf | 25 ++- roles/user/terminals/kitty/tasks/install.yml | 6 + roles/user/terminals/kitty/tasks/main.yml | 10 + 169 files changed, 1410 insertions(+), 1690 deletions(-) delete mode 100644 playbooks/fedora_repository.yml delete mode 100644 playbooks/fedora_upgrade.yml delete mode 100644 playbooks/roles/fedora/meta/main.yml delete mode 100644 playbooks/roles/fedora/packages/tasks/main.yml delete mode 100644 playbooks/roles/fedora/packages/tasks/shell.yml delete mode 100644 playbooks/roles/fedora/repositories/tasks/main.yml delete mode 100644 playbooks/roles/fedora/repositories/templates/local/fedora-modular.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/fedora-updates-modular.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing-modular.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/fedora-updates.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/fedora.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates-testing.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/rpmfusion-free.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates-testing.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/fedora-modular.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/fedora-updates-modular.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing-modular.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/fedora-updates.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/fedora.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates-testing.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates-testing.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates.repo.j2 delete mode 100644 playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree.repo.j2 delete mode 100644 playbooks/roles/fedora/upgrade/tasks/main.yml delete mode 100644 playbooks/roles/flatpaks/tasks/main.yml delete mode 100644 playbooks/roles/git/tasks/main.yml delete mode 100644 playbooks/roles/git/templates/gitconfig.j2 delete mode 100644 playbooks/roles/haskell/tasks/main.yml delete mode 100644 playbooks/roles/shell/tasks/alacritty.yml delete mode 100644 playbooks/roles/shell/tasks/emacs.yml delete mode 100644 playbooks/roles/shell/tasks/main.yml delete mode 100644 playbooks/roles/shell/tasks/nvim.yml delete mode 100644 playbooks/roles/shell/tasks/zsh.yml delete mode 100755 playbooks/roles/shell/templates/alacritty/alacritty.yml delete mode 100644 playbooks/roles/shell/templates/alacritty/colors/solarized_dark.yml delete mode 100644 playbooks/roles/shell/templates/init.vim.j2 delete mode 100755 playbooks/roles/shell/templates/scripts/srht.py delete mode 100644 playbooks/roles/shell/templates/starship.toml.j2 delete mode 100644 playbooks/roles/shell/templates/zshrc.j2 delete mode 100644 playbooks/roles/ssh/tasks/main.yml delete mode 100644 playbooks/roles/ssh/templates/ssh_config.j2 delete mode 100644 playbooks/roles/vscode/tasks/main.yml delete mode 100644 playbooks/roles/vscode/templates/keybindings.json.j2 delete mode 100644 playbooks/roles/vscode/templates/settings.json.j2 create mode 100644 roles/system/base/tasks/main.yml create mode 100644 roles/system/base/tasks/upgrade.yml rename playbooks/roles/fedora/repositories/templates/google-chrome.repo.j2 => roles/system/fedora/files/google-chrome.repo (100%) create mode 100644 roles/system/fedora/tasks/main.yml create mode 100644 roles/system/fedora/tasks/repositories.yml create mode 100644 roles/system/flatpak/defaults/main.yml create mode 100644 roles/system/flatpak/tasks/main.yml create mode 100755 roles/user/base/files/srht.py rename {playbooks/roles/shell/templates/scripts => roles/user/base/files}/toolbox_name.sh (86%) create mode 100644 roles/user/base/tasks/desktop-utilities.yml create mode 100644 roles/user/base/tasks/main.yml create mode 100644 roles/user/base/tasks/scripts.yml create mode 100644 roles/user/base/tasks/structure.yml create mode 100644 roles/user/editors/emacs/tasks/install.yml create mode 100644 roles/user/editors/emacs/tasks/main.yml create mode 100644 roles/user/editors/neovim/tasks/install.yml create mode 100644 roles/user/editors/neovim/tasks/main.yml rename playbooks/roles/vscode/templates/code-url.desktop.j2 => roles/user/editors/vscode/files/code-url-handler.desktop (100%) rename playbooks/roles/vscode/templates/code.desktop.j2 => roles/user/editors/vscode/files/code.desktop (100%) create mode 100644 roles/user/editors/vscode/files/keybindings.json create mode 100644 roles/user/editors/vscode/files/settings.json rename playbooks/roles/vscode/templates/update.sh.j2 => roles/user/editors/vscode/files/update.sh (100%) create mode 100644 roles/user/editors/vscode/tasks/main.yml create mode 100644 roles/user/git/tasks/main.yml create mode 100644 roles/user/git/templates/gitconfig rename playbooks/roles/haskell/templates/ghci.conf.j2 => roles/user/lang/haskell/files/ghci.conf (100%) create mode 100644 roles/user/lang/haskell/tasks/install.yml create mode 100644 roles/user/lang/haskell/tasks/main.yml create mode 100644 roles/user/secrets/bw/tasks/main.yml rename playbooks/roles/shell/templates/tmux.conf.j2 => roles/user/shell/tmux/files/tmux.conf (97%) rename playbooks/roles/shell/templates/tmux_status.conf.j2 => roles/user/shell/tmux/files/tmux_status.conf (100%) create mode 100644 roles/user/shell/tmux/tasks/install.yml rename playbooks/roles/shell/tasks/tmux.yml => roles/user/shell/tmux/tasks/main.yml (50%) create mode 100644 roles/user/shell/zsh/files/starship.toml create mode 100644 roles/user/shell/zsh/files/zshrc create mode 100644 roles/user/shell/zsh/tasks/install.yml create mode 100644 roles/user/shell/zsh/tasks/main.yml create mode 100644 roles/user/shell/zsh/tasks/oh-my-zsh.yml create mode 100644 roles/user/shell/zsh/tasks/starship.yml create mode 100644 roles/user/ssh/files/ssh_config create mode 100644 roles/user/ssh/tasks/main.yml create mode 100755 roles/user/terminals/alacritty/files/alacritty.yml rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/ayu_dark.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/ayu_mirage.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/breeze.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/campbell.yml (100%) create mode 100644 roles/user/terminals/alacritty/files/colors/codedark.yml create mode 100644 roles/user/terminals/alacritty/files/colors/codelight.yml rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/default.yml (100%) create mode 100644 roles/user/terminals/alacritty/files/colors/dracula.yml rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/gruvbox_dark.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/gruvbox_light.yml (100%) create mode 100644 roles/user/terminals/alacritty/files/colors/kanagawa.yml rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/monokai/classic.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/monokai/pro.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/monokai/pro_filter_machine.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/monokai/pro_filter_octagon.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/monokai/pro_filter_ristretto.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/monokai/pro_filter_spectrum.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/night_owl.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/nord.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/ocean.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/one_dark.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/one_dark_pro.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/one_light.yml (100%) create mode 100644 roles/user/terminals/alacritty/files/colors/onehalf_dark.yml create mode 100644 roles/user/terminals/alacritty/files/colors/onehalf_light.yml rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/outrun_electric.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/rainier.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/rainier_retro.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/rose-pine-dawn.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/rose-pine-moon.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/rose-pine.yml (100%) create mode 100644 roles/user/terminals/alacritty/files/colors/solarized_dark.yml rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/solarized_light.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/tokyo_night.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/tokyo_night_storm.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/tomorrow_day.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/tomorrow_night.yml (100%) rename {playbooks/roles/shell/templates/alacritty => roles/user/terminals/alacritty/files}/colors/tomorrow_night_bright.yml (100%) create mode 100644 roles/user/terminals/alacritty/tasks/install.yml create mode 100644 roles/user/terminals/alacritty/tasks/main.yml rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/ayu_dark.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/ayu_mirage.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/convert.py (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/default.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/dracula.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/kanagawa.conf (99%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/monokai/classic.yml (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/monokai/pro.yml (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/monokai/pro_filter_machine.yml (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/monokai/pro_filter_octagon.yml (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/monokai/pro_filter_ristretto.yml (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/monokai/pro_filter_spectrum.yml (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/night_owl.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/nord.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/ocean.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/one_dark.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/one_dark_pro.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/one_light.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/onehalf_dark.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/onehalf_light.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/outrun_electric.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/rainier.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/rainier_retro.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/solarized_dark.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/solarized_light.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/tokyo_night.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/tokyo_night_storm.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/tomorrow_day.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/tomorrow_night.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/tomorrow_night_blue.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/tomorrow_night_bright.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/colors/tomorrow_night_eighties.conf (100%) rename {playbooks/roles/shell/templates/kitty => roles/user/terminals/kitty/files}/kitty.conf (98%) create mode 100644 roles/user/terminals/kitty/tasks/install.yml create mode 100644 roles/user/terminals/kitty/tasks/main.yml diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml index 8d66340..3671208 100644 --- a/playbooks/bootstrap.yml +++ b/playbooks/bootstrap.yml @@ -1,20 +1,59 @@ --- -- name: Bootstrap installation +- name: Bootstrap fresh installation hosts: all - gather_facts: yes + gather_facts: true roles: - - role: fedora - become: yes - become_method: sudo - vars: - # set to "local" or "remote" - source: "local" + # Handle distribution-specific changes before the generic ones + - role: system/fedora + become: true when: ansible_distribution == "Fedora" - - flatpaks - - ssh - - shell - - role: git - vars: - git_email: - gpg_signingkey: - - vscode + + # Upgrade all packages and install the basic-bitch ones + - role: system/base + become: true + + # Enable Flathub repository and install configured flatpaks + - system/flatpak + + # Install Podman and configure UIDs/GIDs for rootless usage + - role: system/podman + become: true + + # Install and configure SSH server + - role: system/sshd + become: true + + # Handle basic user configuration + - user/base + + # Shell utilities + - user/shell/zsh + - user/shell/tmux + - user/editors/neovim + + # Configure git + - user/git + + # Configure ssh + - user/ssh + + # Configure Alacritty terminal + - role: user/terminals/alacritty + tags: alacritty + + # Configure Kitty terminal + - role: user/terminals/kitty + tags: kitty + + # Install Bitwarden CLI + - user/secrets/bw + + # TODO: Install HashiCorp Vault + # - user/secrets/hcv + + # Install and configure Emacs + - role: user/editors/emacs + tags: emacs + + # Install and configure VSCode + - user/editors/vscode diff --git a/playbooks/fedora_repository.yml b/playbooks/fedora_repository.yml deleted file mode 100644 index 2c0e0f0..0000000 --- a/playbooks/fedora_repository.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Fedora repository setup - hosts: all - roles: - - role: fedora/repositories - become: yes - become_method: sudo - vars: - # set to "local" or "remote" - source: "local" diff --git a/playbooks/fedora_upgrade.yml b/playbooks/fedora_upgrade.yml deleted file mode 100644 index ba7a4d6..0000000 --- a/playbooks/fedora_upgrade.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Fedora upgrade - hosts: all - roles: - - role: fedora/upgrade - become: yes - become_method: sudo - vars: - releasever: 33 diff --git a/playbooks/roles/fedora/meta/main.yml b/playbooks/roles/fedora/meta/main.yml deleted file mode 100644 index 4965490..0000000 --- a/playbooks/roles/fedora/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - fedora/repositories - - fedora/packages diff --git a/playbooks/roles/fedora/packages/tasks/main.yml b/playbooks/roles/fedora/packages/tasks/main.yml deleted file mode 100644 index 86be97c..0000000 --- a/playbooks/roles/fedora/packages/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Upgrade all packages - dnf: - name: "*" - state: latest - -- name: Install playerctl and flameshot - dnf: - name: - - playerctl - - flameshot - state: present - -- include: shell.yml diff --git a/playbooks/roles/fedora/packages/tasks/shell.yml b/playbooks/roles/fedora/packages/tasks/shell.yml deleted file mode 100644 index b14b3ff..0000000 --- a/playbooks/roles/fedora/packages/tasks/shell.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Install all packages for shell - dnf: - name: - - zsh - - tmux - - neovim - - emacs - - alacritty - state: present diff --git a/playbooks/roles/fedora/repositories/tasks/main.yml b/playbooks/roles/fedora/repositories/tasks/main.yml deleted file mode 100644 index 2263009..0000000 --- a/playbooks/roles/fedora/repositories/tasks/main.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- name: Get version of Fedora - shell: rpm -E %fedora - register: fedora_version - tags: install_new_repos - -- name: Install RPMFusion RPMs with GPG keys - dnf: - name: - - "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ fedora_version.stdout }}.noarch.rpm" - - "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ fedora_version.stdout }}.noarch.rpm" - disable_gpg_check: yes - state: present - tags: install_new_repos - -- name: Install Google Chrome repository - template: - src: templates/google-chrome.repo.j2 - dest: /etc/yum.repos.d/google-chrome.repo - tags: install_new_repos - -- name: Install repositories - template: - src: templates/{{ source }}/{{ item }}.repo.j2 - dest: /etc/yum.repos.d/{{ item }}.repo - loop: - - fedora-modular - - fedora-updates-modular - - fedora-updates-testing-modular - - fedora-updates-testing - - fedora-updates - - fedora - - rpmfusion-free-updates-testing - - rpmfusion-free-updates - - rpmfusion-free - - rpmfusion-nonfree-updates-testing - - rpmfusion-nonfree-updates - - rpmfusion-nonfree diff --git a/playbooks/roles/fedora/repositories/templates/local/fedora-modular.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/fedora-modular.repo.j2 deleted file mode 100644 index b5ad3e3..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/fedora-modular.repo.j2 +++ /dev/null @@ -1,35 +0,0 @@ -[fedora-modular] -name=Fedora Modular $releasever - $basearch -baseurl=https://mirror.gauss.mfocko.xyz/fedora/releases/$releasever/Modular/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=1 -#metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/local/fedora-updates-modular.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/fedora-updates-modular.repo.j2 deleted file mode 100644 index 8828074..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/fedora-updates-modular.repo.j2 +++ /dev/null @@ -1,38 +0,0 @@ -[updates-modular] -name=Fedora Modular $releasever - $basearch - Updates -failovermethod=priority -baseurl=https://mirror.gauss.mfocko.xyz/fedora/updates/$releasever/Modular/$basearch/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch -enabled=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Updates - Debug -failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-modular-source] -name=Fedora Modular $releasever - Updates Source -failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing-modular.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing-modular.repo.j2 deleted file mode 100644 index 9835c68..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing-modular.repo.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[updates-testing-modular] -name=Fedora Modular $releasever - $basearch - Test Updates -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/ -baseurl=https://mirror.gauss.mfocko.xyz/fedora/updates/testing/$releasever/Modular/$basearch/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch -enabled=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Test Updates Debug -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-modular-source] -name=Fedora Modular $releasever - Test Updates Source -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing.repo.j2 deleted file mode 100644 index 8a45f6d..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/fedora-updates-testing.repo.j2 +++ /dev/null @@ -1,35 +0,0 @@ -[updates-testing] -name=Fedora $releasever - $basearch - Test Updates -baseurl=https://mirror.gauss.mfocko.xyz/fedora/updates/testing/$releasever/Everything/$basearch/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=Fedora $releasever - $basearch - Test Updates Debug -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-source] -name=Fedora $releasever - Test Updates Source -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/local/fedora-updates.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/fedora-updates.repo.j2 deleted file mode 100644 index 77e7df1..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/fedora-updates.repo.j2 +++ /dev/null @@ -1,35 +0,0 @@ -[updates] -name=Fedora $releasever - $basearch - Updates -baseurl=https://mirror.gauss.mfocko.xyz/fedora/updates/$releasever/Everything/$basearch/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-debuginfo] -name=Fedora $releasever - $basearch - Updates - Debug -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-source] -name=Fedora $releasever - Updates Source -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/local/fedora.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/fedora.repo.j2 deleted file mode 100644 index 037a518..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/fedora.repo.j2 +++ /dev/null @@ -1,35 +0,0 @@ -[fedora] -name=Fedora $releasever - $basearch -baseurl=https://mirror.gauss.mfocko.xyz/fedora/releases/$releasever/Everything/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -enabled=1 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-debuginfo] -name=Fedora $releasever - $basearch - Debug -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-source] -name=Fedora $releasever - Source -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates-testing.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates-testing.repo.j2 deleted file mode 100644 index c6418ec..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates-testing.repo.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[rpmfusion-free-updates-testing] -name=RPM Fusion for Fedora $releasever - Free - Test Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/ -baseurl=https://mirror.gauss.mfocko.xyz/rpmfusion/free/fedora/updates/testing/$releasever/$basearch/ -#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-$releasever&arch=$basearch -enabled=1 -enabled_metadata=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-testing-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Test Updates Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-testing-source] -name=RPM Fusion for Fedora $releasever - Free - Test Updates Source -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates.repo.j2 deleted file mode 100644 index ac3f67d..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates.repo.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[rpmfusion-free-updates] -name=RPM Fusion for Fedora $releasever - Free - Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ -baseurl=https://mirror.gauss.mfocko.xyz/rpmfusion/free/fedora/updates/$releasever/$basearch/ -#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Updates Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-source] -name=RPM Fusion for Fedora $releasever - Free - Updates Source -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free.repo.j2 deleted file mode 100644 index 7284d60..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free.repo.j2 +++ /dev/null @@ -1,33 +0,0 @@ -[rpmfusion-free] -name=RPM Fusion for Fedora $releasever - Free -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ -baseurl=https://mirror.gauss.mfocko.xyz/rpmfusion/free/fedora/releases/$releasever/Everything/$basearch/os/ -#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch -enabled=1 -metadata_expire=14d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-source] -name=RPM Fusion for Fedora $releasever - Free - Source -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates-testing.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates-testing.repo.j2 deleted file mode 100644 index b00cbd1..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates-testing.repo.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[rpmfusion-nonfree-updates-testing] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/ -baseurl=https://mirror.gauss.mfocko.xyz/rpmfusion/nonfree/fedora/updates/testing/$releasever/$basearch/ -#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-$releasever&arch=$basearch -enabled=1 -enabled_metadata=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-testing-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-testing-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates.repo.j2 deleted file mode 100644 index 7f69190..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates.repo.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[rpmfusion-nonfree-updates] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ -baseurl=https://mirror.gauss.mfocko.xyz/rpmfusion/nonfree/fedora/updates/$releasever/$basearch/ -#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree.repo.j2 b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree.repo.j2 deleted file mode 100644 index 710381b..0000000 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree.repo.j2 +++ /dev/null @@ -1,34 +0,0 @@ -[rpmfusion-nonfree] -name=RPM Fusion for Fedora $releasever - Nonfree -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ -baseurl=https://mirror.gauss.mfocko.xyz/rpmfusion/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ -#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -metadata_expire=14d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/remote/fedora-modular.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/fedora-modular.repo.j2 deleted file mode 100644 index 1ecdf6f..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/fedora-modular.repo.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[fedora-modular] -name=Fedora Modular $releasever - $basearch -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=1 -countme=1 -#metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Debug -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-modular-source] -name=Fedora Modular $releasever - Source -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-modular.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-modular.repo.j2 deleted file mode 100644 index bcfc886..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-modular.repo.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[updates-modular] -name=Fedora Modular $releasever - $basearch - Updates -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch -enabled=1 -countme=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Updates - Debug -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-modular-source] -name=Fedora Modular $releasever - Updates Source -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing-modular.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing-modular.repo.j2 deleted file mode 100644 index 5cd78af..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing-modular.repo.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[updates-testing-modular] -name=Fedora Modular $releasever - $basearch - Test Updates -#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch -enabled=0 -countme=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-modular-debuginfo] -name=Fedora Modular $releasever - $basearch - Test Updates Debug -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-modular-source] -name=Fedora Modular $releasever - Test Updates Source -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing.repo.j2 deleted file mode 100644 index 9306abb..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates-testing.repo.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[updates-testing] -name=Fedora $releasever - $basearch - Test Updates -#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 -countme=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-debuginfo] -name=Fedora $releasever - $basearch - Test Updates Debug -#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-testing-source] -name=Fedora $releasever - Test Updates Source -#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/fedora-updates.repo.j2 deleted file mode 100644 index 9d9f2fd..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/fedora-updates.repo.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[updates] -name=Fedora $releasever - $basearch - Updates -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=1 -countme=1 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-debuginfo] -name=Fedora $releasever - $basearch - Updates - Debug -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[updates-source] -name=Fedora $releasever - Updates Source -#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -metadata_expire=6h -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/remote/fedora.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/fedora.repo.j2 deleted file mode 100644 index f9bfbb1..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/fedora.repo.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[fedora] -name=Fedora $releasever - $basearch -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -enabled=1 -countme=1 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-debuginfo] -name=Fedora $releasever - $basearch - Debug -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[fedora-source] -name=Fedora $releasever - Source -#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False diff --git a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates-testing.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates-testing.repo.j2 deleted file mode 100644 index 662defc..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates-testing.repo.j2 +++ /dev/null @@ -1,30 +0,0 @@ -[rpmfusion-free-updates-testing] -name=RPM Fusion for Fedora $releasever - Free - Test Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-$releasever&arch=$basearch -enabled=1 -enabled_metadata=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-testing-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Test Updates Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-testing-source] -name=RPM Fusion for Fedora $releasever - Free - Test Updates Source -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-testing-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates.repo.j2 deleted file mode 100644 index d520472..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates.repo.j2 +++ /dev/null @@ -1,30 +0,0 @@ -[rpmfusion-free-updates] -name=RPM Fusion for Fedora $releasever - Free - Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Updates Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-updates-source] -name=RPM Fusion for Fedora $releasever - Free - Updates Source -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free.repo.j2 deleted file mode 100644 index 4a66f92..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free.repo.j2 +++ /dev/null @@ -1,32 +0,0 @@ -[rpmfusion-free] -name=RPM Fusion for Fedora $releasever - Free -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch -enabled=1 -metadata_expire=14d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-debuginfo] -name=RPM Fusion for Fedora $releasever - Free - Debug -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-free-source] -name=RPM Fusion for Fedora $releasever - Free - Source -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates-testing.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates-testing.repo.j2 deleted file mode 100644 index 6aebcf4..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates-testing.repo.j2 +++ /dev/null @@ -1,30 +0,0 @@ -[rpmfusion-nonfree-updates-testing] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-$releasever&arch=$basearch -enabled=1 -enabled_metadata=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-testing-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-testing-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates.repo.j2 deleted file mode 100644 index a456130..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates.repo.j2 +++ /dev/null @@ -1,30 +0,0 @@ -[rpmfusion-nonfree-updates] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-updates-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch -enabled=0 -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever diff --git a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree.repo.j2 deleted file mode 100644 index 100cb93..0000000 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree.repo.j2 +++ /dev/null @@ -1,33 +0,0 @@ -[rpmfusion-nonfree] -name=RPM Fusion for Fedora $releasever - Nonfree -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -metadata_expire=14d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - -[rpmfusion-nonfree-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch -enabled=0 -metadata_expire=7d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever diff --git a/playbooks/roles/fedora/upgrade/tasks/main.yml b/playbooks/roles/fedora/upgrade/tasks/main.yml deleted file mode 100644 index 01520ae..0000000 --- a/playbooks/roles/fedora/upgrade/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Switch to remote repositories - include_role: - name: fedora/repositories - vars: - source: "remote" - -- name: Update all packages - dnf: - name: "*" - state: latest - -- name: Install system-upgrade plugin - dnf: - name: dnf-plugin-system-upgrade - -- name: Switch to local repositories - include_role: - name: fedora/repositories - vars: - source: "local" - -- name: Start the release update - shell: dnf system-upgrade download -y --releasever={{ releasever }} diff --git a/playbooks/roles/flatpaks/tasks/main.yml b/playbooks/roles/flatpaks/tasks/main.yml deleted file mode 100644 index 31721ee..0000000 --- a/playbooks/roles/flatpaks/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: Enable flathub - become: yes - become_method: sudo - community.general.flatpak_remote: - name: flathub - state: present - flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo - -- name: Install flatpak apps - community.general.flatpak: - name: "{{ item }}" - state: present - loop: - - com.spotify.Client - - com.discordapp.Discord - - org.telegram.desktop diff --git a/playbooks/roles/git/tasks/main.yml b/playbooks/roles/git/tasks/main.yml deleted file mode 100644 index b77e708..0000000 --- a/playbooks/roles/git/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Create git config - template: - src: templates/gitconfig.j2 - dest: ~/.gitconfig diff --git a/playbooks/roles/git/templates/gitconfig.j2 b/playbooks/roles/git/templates/gitconfig.j2 deleted file mode 100644 index f5c044b..0000000 --- a/playbooks/roles/git/templates/gitconfig.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[alias] - scommit = commit --signoff - graph = log --oneline --decorate --graph --all - -[commit] - gpgsign = true - -[core] - editor = code --wait - excludesfile = ~/.gitignore - -[diff] - tool = vscode-difftool - -[difftool "vscode-difftool"] - cmd = code --wait --diff $LOCAL $REMOTE - -[gpg] - program = gpg2 - -[init] - defaultBranch = main - -[pull] - rebase = true - -[rebase] - autoStash = true - -[tag] - gpgSign = true - -[user] - name = Matej Focko - email = {{ git_email }} - signingkey = {{ gpg_signingkey }} diff --git a/playbooks/roles/haskell/tasks/main.yml b/playbooks/roles/haskell/tasks/main.yml deleted file mode 100644 index e6aaff7..0000000 --- a/playbooks/roles/haskell/tasks/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Create directories for configuration - file: - path: ~/.ghc - state: directory - -- name: Install ghci.conf - template: - src: templates/ghci.conf.j2 - dest: ~/.ghc/ghci.conf diff --git a/playbooks/roles/shell/tasks/alacritty.yml b/playbooks/roles/shell/tasks/alacritty.yml deleted file mode 100644 index dffc2a9..0000000 --- a/playbooks/roles/shell/tasks/alacritty.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Install alacritty configuration - copy: - src: templates/alacritty - dest: ~/.config/ diff --git a/playbooks/roles/shell/tasks/emacs.yml b/playbooks/roles/shell/tasks/emacs.yml deleted file mode 100644 index b33fba5..0000000 --- a/playbooks/roles/shell/tasks/emacs.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Install Doom Emacs - block: - - git: - repo: https://github.com/hlissner/doom-emacs - dest: ~/.emacs.d - depth: 1 -# - shell: ~/.emacs.d/bin/doom install -y diff --git a/playbooks/roles/shell/tasks/main.yml b/playbooks/roles/shell/tasks/main.yml deleted file mode 100644 index 614db4a..0000000 --- a/playbooks/roles/shell/tasks/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Set default shell - become: yes - become_method: sudo - user: - name: mfocko - shell: /bin/zsh - -# - name: Install Nord theme for Konsole -# shell: wget -O ~/.local/share/konsole/nord.colorscheme https://raw.githubusercontent.com/arcticicestudio/nord-konsole/develop/src/nord.colorscheme - -- include: nvim.yml -- include: emacs.yml -- include: zsh.yml -- include: tmux.yml -- include: alacritty.yml diff --git a/playbooks/roles/shell/tasks/nvim.yml b/playbooks/roles/shell/tasks/nvim.yml deleted file mode 100644 index 6a75288..0000000 --- a/playbooks/roles/shell/tasks/nvim.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Create init.vim - block: - - file: - path: ~/.config/nvim - state: directory - - template: - src: templates/init.vim.j2 - dest: ~/.config/nvim/init.vim - -- name: Install vim-plug - shell: sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' diff --git a/playbooks/roles/shell/tasks/zsh.yml b/playbooks/roles/shell/tasks/zsh.yml deleted file mode 100644 index f0eca1e..0000000 --- a/playbooks/roles/shell/tasks/zsh.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- name: Create directories in `~/.local` - file: - path: "{{ item }}" - state: directory - loop: - - ~/.local/bin - - ~/.local/share - -- name: Check for oh-my-zsh - stat: - path: ~/.oh-my-zsh - register: ohmyzsh_directory - -- name: Install oh-my-zsh - shell: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended - when: not ohmyzsh_directory.stat.exists - -- name: Clone zsh-autosuggestions - git: - repo: https://github.com/zsh-users/zsh-autosuggestions - dest: ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions - -- name: Clone zsh-syntax-highlighting - git: - repo: https://github.com/zsh-users/zsh-syntax-highlighting.git - dest: ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting - -- name: Clone starship - shell: sh -c "$(curl -fsSL https://starship.rs/install.sh)" "" -f -b $HOME/.local/bin - -- name: Create zshrc - template: - src: templates/zshrc.j2 - dest: ~/.zshrc - -- name: Create starship configuration - template: - src: templates/starship.toml.j2 - dest: ~/.config/starship.toml - -- name: Install script for toolbox name retrieval - template: - src: templates/scripts/toolbox_name.sh - dest: ~/.local/bin/toolbox_name.sh - -- name: Install script for paste.sr.ht - template: - src: templates/scripts/srht.py - dest: ~/.local/bin/srht.py - -- name: Symlink paste.sr.ht - ansible.builtin.file: - src: ./srht.py - dest: ~/.local/bin/srht - state: link diff --git a/playbooks/roles/shell/templates/alacritty/alacritty.yml b/playbooks/roles/shell/templates/alacritty/alacritty.yml deleted file mode 100755 index 3f93fea..0000000 --- a/playbooks/roles/shell/templates/alacritty/alacritty.yml +++ /dev/null @@ -1,75 +0,0 @@ -import: - # - /home/mfocko/.config/alacritty/colors/ayu_dark.yml - # - /home/mfocko/.config/alacritty/colors/ayu_mirage.yml - # - /home/mfocko/.config/alacritty/colors/breeze.yml - # - /home/mfocko/.config/alacritty/colors/campbell.yml - # - /home/mfocko/.config/alacritty/colors/default.yml - # - /home/mfocko/.config/alacritty/colors/gruvbox_dark.yml - # - /home/mfocko/.config/alacritty/colors/gruvbox_light.yml - # - /home/mfocko/.config/alacritty/colors/monokai/classic.yml - # - /home/mfocko/.config/alacritty/colors/monokai/pro.yml - # - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_machine.yml - # - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_octagon.yml - # - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_ristretto.yml - # - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_spectrum.yml - # - /home/mfocko/.config/alacritty/colors/night_owl.yml - # - /home/mfocko/.config/alacritty/colors/nord.yml - # - /home/mfocko/.config/alacritty/colors/ocean.yml - # - /home/mfocko/.config/alacritty/colors/one_dark.yml - # - /home/mfocko/.config/alacritty/colors/one_dark_pro.yml - # - /home/mfocko/.config/alacritty/colors/one_light.yml - # - /home/mfocko/.config/alacritty/colors/outrun_electric.yml - # - /home/mfocko/.config/alacritty/colors/rainier.yml - # - /home/mfocko/.config/alacritty/colors/rainier_retro.yml - # - /home/mfocko/.config/alacritty/colors/rose-pine.yml - # - /home/mfocko/.config/alacritty/colors/rose-pine-dawn.yml - # - /home/mfocko/.config/alacritty/colors/rose-pine-moon.yml - # - /home/mfocko/.config/alacritty/colors/solarized_dark.yml - # - /home/mfocko/.config/alacritty/colors/solarized_light.yml - # - /home/mfocko/.config/alacritty/colors/tokyo_night.yml - # - /home/mfocko/.config/alacritty/colors/tokyo_night_storm.yml - - /home/mfocko/.config/alacritty/colors/tomorrow_day.yml - # - /home/mfocko/.config/alacritty/colors/tomorrow_night.yml - # - /home/mfocko/.config/alacritty/colors/tomorrow_night_bright.yml - -env: - TERM: alacritty - -window: - dynamic_padding: true - decorations: none - -font: - normal: - # family: BlexMono Nerd Font - # family: CascadiaMonoPL Nerd Font - # family: CozetteVector - # family: FiraCode Nerd Font - # family: Hack Nerd Font - # family: Inconsolata Nerd Font - # family: InputMonoNarrow Nerd Font - # family: Iosevka Term - # family: Iosevka Term Slab - family: JetBrainsMonoNL Nerd Font - # family: RecMonoLinear Nerd Font - # family: RobotoMono Nerd Font - # family: SauceCodePro Nerd Font - # family: SFMono Nerd Font - # family: VictorMono Nerd Font - size: 15.0 - -cursor: - # Block, Underline, Beam - style: Beam - thickness: 0.33 - blinking: On - -key_bindings: - - key: F11 - action: ToggleFullscreen - - key: N - mods: Control|Shift - action: SpawnNewInstance - - key: K - mods: Control|Shift - action: ClearHistory diff --git a/playbooks/roles/shell/templates/alacritty/colors/solarized_dark.yml b/playbooks/roles/shell/templates/alacritty/colors/solarized_dark.yml deleted file mode 100644 index 8735778..0000000 --- a/playbooks/roles/shell/templates/alacritty/colors/solarized_dark.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Colors (Solarized Dark) -colors: - # Default colors - primary: - background: "#002b36" # base03 - foreground: "#839496" # base0 - - # Cursor colors - cursor: - text: "#002b36" # base03 - cursor: "#839496" # base0 - - # Normal colors - normal: - black: "#073642" # base02 - red: "#dc322f" # red - green: "#859900" # green - yellow: "#b58900" # yellow - blue: "#268bd2" # blue - magenta: "#d33682" # magenta - cyan: "#2aa198" # cyan - white: "#eee8d5" # base2 - - # Bright colors - bright: - black: "#002b36" # base03 - red: "#cb4b16" # orange - green: "#586e75" # base01 - yellow: "#657b83" # base00 - blue: "#839496" # base0 - magenta: "#6c71c4" # violet - cyan: "#93a1a1" # base1 - white: "#fdf6e3" # base3 diff --git a/playbooks/roles/shell/templates/init.vim.j2 b/playbooks/roles/shell/templates/init.vim.j2 deleted file mode 100644 index 7b566c0..0000000 --- a/playbooks/roles/shell/templates/init.vim.j2 +++ /dev/null @@ -1,158 +0,0 @@ -" Sample config for pb071 students, available at fi.muni.cz/pb071 -" =============================================================== -" Requires VIM-8.0 to enable linting, on aisa run: -" $ module add vim-8.0 -" However, the linting will fail silently, if version is older. -" -" Comes with plugin manager Plug: we added 2 colorschemes -" and linting plugin ALE, which uses clang-tidy and gcc -" to highlight some syntax errors. -" -" Install Plug first in bash: -" $ curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -" Then run vim and install the plugins using command in normal mode: -" :PlugInstall -" -" Most of the settings come from vimconfig.com. -" We added few handy key mappings: -" -" Ctrl+Up/Down Move line or a block of selected lines -" Ctrl+j/k -" pp Toggle paste mode on and off -" Disable search highlight -" -" is carriage return, "Enter" -" is backspace, "\", complete the combination in 1 second - -set nocompatible -set encoding=utf-8 - -""""" -""""" Plugin manager Plug from https://github.com/junegunn/vim-plug -""""" -call plug#begin('~/.vim/plugged') - Plug 'vim-airline/vim-airline' " status bar mod - Plug 'vim-airline/vim-airline-themes' -" Plug 'tomasiser/vim-code-dark' " colorscheme codedark -" Plug 'romainl/Apprentice' " colorscheme apprentice - Plug 'w0rp/ale' - Plug 'romainl/vim-cool' -" Plug 'drewtempelmeyer/palenight.vim' -" Plug 'connorholyday/vim-snazzy' -" Plug 'altercation/vim-colors-solarized' - Plug 'scrooloose/nerdtree' - Plug 'arcticicestudio/nord-vim' -call plug#end() - -" Setup linting for c99 -let g:ale_completion_enabled = 1 -let g:ale_linters = {'c': ['gcc', 'clangtidy', 'clang-format']} -let g:ale_c_gcc_executable = 'gcc' -let g:ale_c_gcc_options = '-std=c99 -Wall -Wextra -pedantic' -let g:ale_c_clang_executable = 'gcc' -let g:ale_c_clang_options = '-std=c99 -Wall -Wextra -pedantic' -let g:ale_c_clangtidy_executable = 'clang-tidy' -let g:ale_c_clangtidy_options = '-std=c99 -Wall -Wextra -pedantic' - -""""" -""""" Colors -""""" -syntax on - -" hi Normal ctermbg=none -" hi NonText ctermbg=none - -" Color schemes belong to ~/.vim/colors -" Find yours at https://vimcolors.com -set background=dark -" colorscheme codedark -colorscheme nord -" colorscheme solarized -" colorscheme palenight -" let g:SnazzyTransparent = 1 -" colorscheme snazzy - -" If using plugin vim-airline -let g:airline_theme = 'nord' - -if &term =~ '256color' - " disable Background Color Erase (BCE) so that color schemes - " render properly when inside 256-color tmux and GNU screen. - " see also http://snk.tuxfamily.org/log/vim-256color-bce.html - set t_ut= -endif - -" If you happen to still have a problem on some terminal, uncomment: -" set t_Co=256 -" set t_ut= - -" Color 81. character in line to visualize long lines -highlight ColorColumn ctermbg=magenta -call matchadd('ColorColumn', '\%81v', 100) -""""" -""""" General -""""" -set relativenumber " Show line numbers -set linebreak " Break lines at word (requires Wrap lines) -set showbreak=+++ " Wrap-broken line prefix -set textwidth=80 " Line wrap (number of cols) -set showmatch " Highlight matching brace -set showcmd " Show last command on right -set cursorline " Highlight current line - -set hlsearch " Highlight all search results -set smartcase " Enable smart-case search -set ignorecase " Always case-insensitive -set incsearch " Searches for strings incrementally - -set autoindent " Auto-indent new lines -set cindent " Use 'C' style program indenting -set shiftwidth=4 " Number of auto-indent spaces -set smartindent " Enable smart-indent -set smarttab " Enable smart-tabs -set softtabstop=4 expandtab " Number of spaces per Tab -set wrap " Wrap lines - - -""""" -""""" Advanced -""""" -set ruler " Show row and column ruler information -set undolevels=1000 " Number of undo levels -set backspace=indent,eol,start " Backspace behaviour -set guicursor= - -""""" -""""" Key mapping -""""" -" Move lines using Ctrl+Up/Down in normal, insert and visual modes -nnoremap :m-2 -nnoremap :m+ -inoremap :m-2 -inoremap :m+ -vnoremap :m '<-2gv=gv -vnoremap :m '>+1gv=gv -" or Ctrl+j/k -nnoremap :m .+1== -nnoremap :m .-2== -inoremap :m .+1==gi -inoremap :m .-2==gi -vnoremap :m '>+1gv=gv -vnoremap :m '<-2gv=gv - -" Toggle paste mode on and off -" \ + pp -map pp :setlocal paste! - -" Disable search highlight when is pressed -map :noh - -" Tab support -nnoremap :tabnext -nnoremap :tabprevious -nnoremap :tabnew - -" NERDTree -nmap :NERDTreeToggle - -:set guicursor= diff --git a/playbooks/roles/shell/templates/scripts/srht.py b/playbooks/roles/shell/templates/scripts/srht.py deleted file mode 100755 index 125f2f1..0000000 --- a/playbooks/roles/shell/templates/scripts/srht.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python3 - -import os - -import click -import requests - - -@click.command() -@click.option("--public", "visibility", flag_value="public") -@click.option("--unlisted", "visibility", flag_value="unlisted", default=True) -@click.option("--private", "visibility", flag_value="private") -@click.argument("src", type=click.File("r"), nargs=-1) -def paste(visibility, src): - request = { - "visibility": visibility, - "files": [ - {"filename": s.name.split("/")[-1], "contents": s.read()} - for s in src - ], - } - - response = requests.post( - "https://paste.sr.ht/api/pastes", - json=request, - headers={"Authorization": f"token {os.getenv('SRHT_LEGACY')}"}, - ).json() - - if "sha" in response: - click.secho( - f"Pasted: https://paste.sr.ht/~mfocko/{response['sha']}", - fg="green", - ) - else: - click.secho(response, fg="red") - - -if __name__ == "__main__": - paste() diff --git a/playbooks/roles/shell/templates/starship.toml.j2 b/playbooks/roles/shell/templates/starship.toml.j2 deleted file mode 100644 index 054eafc..0000000 --- a/playbooks/roles/shell/templates/starship.toml.j2 +++ /dev/null @@ -1,44 +0,0 @@ -add_newline = false -format = """$username\ -$hostname\ -${custom.toolbox}\ -$git_branch\ -$git_commit\ -$git_state\ -$git_status\ -$nix_shell\ -$jobs\ -$time\ -$cmd_duration\ -$line_break\ -$directory\ -$character""" - -[username] -format = "[$user]($style)@" -show_always = true - -[hostname] -format = "[$hostname]($style) " -ssh_only = false - -[cmd_duration] -format = "\\(took [$duration]($style)\\) " - -[time] -disabled = false -format = "at [$time]($style) " - -[directory] -format = "[$path]($style)[$read_only]($read_only_style) " - -[custom.toolbox] -when = "ls /run/.containerenv" -symbol = " " -command = "bash ~/.local/bin/toolbox_name.sh" -format = "in [$symbol($output )]($style)" -style = "bold purple" - -[character] -success_symbol = "[λ](bold green)" -error_symbol = "[λ](bold red)" diff --git a/playbooks/roles/shell/templates/zshrc.j2 b/playbooks/roles/shell/templates/zshrc.j2 deleted file mode 100644 index 2ff0bad..0000000 --- a/playbooks/roles/shell/templates/zshrc.j2 +++ /dev/null @@ -1,42 +0,0 @@ -export ZSH=/home/mfocko/.oh-my-zsh - -CASE_SENSITIVE="true" -ENABLE_CORRECTION="true" -plugins=(git common-aliases history systemd sudo zsh-autosuggestions zsh-syntax-highlighting fzf) - -export PATH="$PATH:$HOME/.local/bin" -source $ZSH/oh-my-zsh.sh - -export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=10' - -export EDITOR=nvim - -export CC=gcc -export CFLAGS="-std=c11 -Wall -Werror" -export CXXFLAGS="-std=c++14 -Wall -Werror" -# export LDLIBS="-lm -lkarel -lcurses" -export LDLIBS="-lm" - -export LANG="en_US.UTF-8" - -### gpg ### -export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpgconf --launch gpg-agent - -alias q="exit" -alias k="exit" -alias vim="nvim" -alias ts="tmux new -As default" -alias Reset="reset && tmux clear-history" -alias gcs="git commit -v -s" - -function e() { - if [ $# -gt 0 ]; then - emacs $1 & - else - emacs . & - fi -} - -eval "$(starship init zsh)" diff --git a/playbooks/roles/ssh/tasks/main.yml b/playbooks/roles/ssh/tasks/main.yml deleted file mode 100644 index ca62b19..0000000 --- a/playbooks/roles/ssh/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: Check if SSH key exists - stat: - path: ~/.ssh/id_ed25519 - register: ssh_key - -- name: Generate SSH key - user: - name: mfocko - generate_ssh_key: yes - ssh_key_type: ed25519 - ssh_key_comment: "$HOSTNAME-{{ ansible_facts['distribution'] }}" - when: not ssh_key.stat.exists - -- name: Install SSH config - template: - src: templates/ssh_config.j2 - dest: ~/.ssh/config - mode: 0600 - -- name: Enable sshd - systemd: - name: sshd - enabled: yes diff --git a/playbooks/roles/ssh/templates/ssh_config.j2 b/playbooks/roles/ssh/templates/ssh_config.j2 deleted file mode 100644 index d8a34e9..0000000 --- a/playbooks/roles/ssh/templates/ssh_config.j2 +++ /dev/null @@ -1,38 +0,0 @@ -# Public -Host github.com - User git - Hostname github.com - -Host gitlab.com - User git - Hostname gitlab.com - -# FI -Host gitlab.fi.muni.cz - User git - Hostname gitlab.fi.muni.cz - -Host aisa anxur - User xfocko - Hostname %h.fi.muni.cz - -# Private -Host maxwell - User mfocko - Hostname maxwell.mfocko.xyz - Port 6969 - -Host poincare - User mfocko - Hostname mfocko.xyz - Port 10022 - -Host git.mfocko.xyz - User git - Hostname git.mfocko.xyz - Port 2222 - -Host git.maxwell.mfocko.xyz - User git - Hostname git.maxwell.mfocko.xyz - Port 6969 diff --git a/playbooks/roles/vscode/tasks/main.yml b/playbooks/roles/vscode/tasks/main.yml deleted file mode 100644 index 0d8636d..0000000 --- a/playbooks/roles/vscode/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- name: Create directories for VSCode - file: - path: "{{ item }}" - state: directory - loop: - - ~/.local/bin - - ~/.local/share - - "$HOME/.config/Code - Insiders/User" - -- name: Install VSCode script - template: - src: templates/update.sh.j2 - dest: ~/.local/bin/code-update.sh - -- name: Create app info for VSCode - template: - src: templates/code.desktop.j2 - dest: ~/.local/share/visual-studio-code-insiders.desktop - -- name: Create app info for VSCode URL handler - template: - src: templates/code-url.desktop.j2 - dest: ~/.local/share/visual-studio-code-insiders-url-handler.desktop - -- name: Install VSCode configuration - template: - src: templates/{{ item }}.json.j2 - dest: "~/.config/Code - Insiders/User/{{ item }}.json" - loop: - - settings - - keybindings diff --git a/playbooks/roles/vscode/templates/keybindings.json.j2 b/playbooks/roles/vscode/templates/keybindings.json.j2 deleted file mode 100644 index 8b31edb..0000000 --- a/playbooks/roles/vscode/templates/keybindings.json.j2 +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "key": "alt+f", - "command": "workbench.action.toggleMaximizedPanel" - }, - { - "key": "f7", - "command": "workbench.view.explorer" - }, - { - "key": "f7", - "command": "workbench.action.toggleSidebarVisibility", - "when": "explorerViewletVisible" - }, - { - "key": "ctrl+shift+e", - "command": "-workbench.view.explorer" - }, - { - "key": "ctrl+shift+k", - "command": "workbench.action.terminal.clear", - "when": "terminalFocus" - }, - { - "key": "ctrl+pagedown", - "command": "workbench.action.terminal.focusNext", - "when": "terminalFocus" - }, - { - "key": "ctrl+pageup", - "command": "workbench.action.terminal.focusPrevious", - "when": "terminalFocus" - } -] diff --git a/playbooks/roles/vscode/templates/settings.json.j2 b/playbooks/roles/vscode/templates/settings.json.j2 deleted file mode 100644 index 08e0b31..0000000 --- a/playbooks/roles/vscode/templates/settings.json.j2 +++ /dev/null @@ -1,56 +0,0 @@ -{ - "breadcrumbs.enabled": false, - - "editor.cursorBlinking": "phase", - "editor.cursorStyle": "underline", - - // "editor.fontFamily": "BlexMono Nerd Font", - "editor.fontFamily": "CaskaydiaCovePL Nerd Font", - // "editor.fontFamily": "FiraCode Nerd Font", - // "editor.fontFamily": "Hack Nerd Font", - // "editor.fontFamily": "Hasklug Nerd Font", - // "editor.fontFamily": "InputMono Nerd Font", - // "editor.fontFamily": "InputMonoNarrow Nerd Font", - // "editor.fontFamily": "InputMonoCondensed Nerd Font", - // "editor.fontFamily": "InputMonoCompressed Nerd Font", - // "editor.fontFamily": "'Iosevka Term', 'InputMonoCompressed Nerd Font'", - // "editor.fontFamily": "'Iosevka Term Extended', 'InputMonoCompressed Nerd Font'", - // "editor.fontFamily": "'Iosevka Term Slab', 'InputMonoCompressed Nerd Font'", - // "editor.fontFamily": "'Iosevka Term Slab Extended', 'InputMonoCompressed Nerd Font'", - // "editor.fontFamily": "JetBrainsMono Nerd Font", - // "editor.fontFamily": "MonoLisa Nerd Font", - // "editor.fontFamily": "RecMonoLinear Nerd Font", - // "editor.fontFamily": "RobotoMono Nerd Font", - // "editor.fontFamily": "SFMono Nerd Font", - // "editor.fontFamily": "VictorMono Nerd Font", - // "editor.fontWeight": 350, - "editor.fontSize": 16, - "editor.fontLigatures": true, - - "terminal.integrated.fontSize": 15, - - "editor.highlightActiveIndentGuide": true, - "editor.lineNumbers": "relative", - - "editor.minimap.enabled": false, - "editor.minimap.maxColumn": 80, - - "editor.renderIndentGuides": true, - "editor.renderWhitespace": "all", - "editor.rulers": [ - 80, - 100, - ], - - "git.autofetch": true, - - "window.menuBarVisibility": "toggle", - "window.titleBarStyle": "custom", - "window.zoomLevel": 0, - - "workbench.activityBar.visible": true, - "workbench.colorTheme": "Default Dark+", - - "workbench.settings.editor": "json", - "workbench.editor.showTabs": true, -} diff --git a/roles/system/base/tasks/main.yml b/roles/system/base/tasks/main.yml new file mode 100644 index 0000000..3495231 --- /dev/null +++ b/roles/system/base/tasks/main.yml @@ -0,0 +1,12 @@ +--- +- name: Upgrade all packages + ansible.builtin.include_tasks: upgrade.yml + +- name: Install basic packages + ansible.builtin.package: + name: + - ansible + - curl + - git + - make + - wget diff --git a/roles/system/base/tasks/upgrade.yml b/roles/system/base/tasks/upgrade.yml new file mode 100644 index 0000000..ed77bdb --- /dev/null +++ b/roles/system/base/tasks/upgrade.yml @@ -0,0 +1,19 @@ +--- +- name: Upgrade all packages with ‹apt› + ansible.builtin.apt: + name: "*" + state: latest + update_cache: true + when: ansible_distribution == "Ubuntu" + +- name: Upgrade all packages with ‹dnf› + ansible.builtin.dnf: + name: "*" + state: latest + when: ansible_distribution in [ "AlmaLinux", "CentOS", "Fedora" ] + +- name: Upgrade all packages with ‹zypper› + community.general.packaging.os.zypper: + name: "*" + state: latest + when: ansible_distribution == "openSUSE" diff --git a/playbooks/roles/fedora/repositories/templates/google-chrome.repo.j2 b/roles/system/fedora/files/google-chrome.repo similarity index 100% rename from playbooks/roles/fedora/repositories/templates/google-chrome.repo.j2 rename to roles/system/fedora/files/google-chrome.repo diff --git a/roles/system/fedora/tasks/main.yml b/roles/system/fedora/tasks/main.yml new file mode 100644 index 0000000..adc4501 --- /dev/null +++ b/roles/system/fedora/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: Enable Fedora repos + ansible.builtin.include_tasks: repositories.yml diff --git a/roles/system/fedora/tasks/repositories.yml b/roles/system/fedora/tasks/repositories.yml new file mode 100644 index 0000000..a9df269 --- /dev/null +++ b/roles/system/fedora/tasks/repositories.yml @@ -0,0 +1,18 @@ +--- +- name: Install RPMFusion RPMs with GPG keys + ansible.builtin.dnf: + name: + - "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_version }}.noarch.rpm" + - "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_version }}.noarch.rpm" + disable_gpg_check: true + state: present + tags: system-fedora-rpmfusion + +- name: Install Google Chrome repository + ansible.builtin.copy: + src: files/google-chrome.repo + dest: /etc/yum.repos.d/google-chrome.repo + mode: 0640 + owner: root + group: root + tags: system-fedora-chrome diff --git a/roles/system/flatpak/defaults/main.yml b/roles/system/flatpak/defaults/main.yml new file mode 100644 index 0000000..65a3fa2 --- /dev/null +++ b/roles/system/flatpak/defaults/main.yml @@ -0,0 +1,3 @@ +--- +flatpak: + apps: [] diff --git a/roles/system/flatpak/tasks/main.yml b/roles/system/flatpak/tasks/main.yml new file mode 100644 index 0000000..de97f44 --- /dev/null +++ b/roles/system/flatpak/tasks/main.yml @@ -0,0 +1,15 @@ +--- +- name: Enable Flathub + community.general.packaging.os.flatpak_remote: + name: flathub + state: present + flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + become: true + tags: system-flatpak-enable-flathub + +- name: Install flatpak apps + community.general.packaging.os.flatpak: + name: "{{ item }}" + state: present + loop: "{{ flatpak.apps }}" + when: flatpak.apps diff --git a/roles/user/base/files/srht.py b/roles/user/base/files/srht.py new file mode 100755 index 0000000..b5a463b --- /dev/null +++ b/roles/user/base/files/srht.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python3 + +import os + +import click +import requests + + +def get_username(): + response = requests.post( + "https://meta.sr.ht/query", + json={"query": "{ me { canonicalName } }"}, + headers={"Authorization": f"Bearer {os.getenv('SRHT')}"}, + ).json() + + return response["data"]["me"]["canonicalName"] + + +@click.group() +def cli(): + pass + + +@cli.command(help="Prints out canonical name of the authenticated user") +def whoami(): + click.echo(get_username()) + + +@cli.command(help="Provides paste to the paste.sr.ht") +@click.option( + "--public", + "visibility", + flag_value="public", + help="Public paste that is visible on the user's profile", +) +@click.option( + "--unlisted", + "visibility", + flag_value="unlisted", + default=True, + help="Unlisted paste that is accessible via a link", +) +@click.option( + "--private", + "visibility", + flag_value="private", + help="Private paste that is accessible only to the authenticated user", +) +@click.argument( + "src", + type=click.File("r"), + nargs=-1, +) +def paste(visibility, src): + request = { + "visibility": visibility, + "files": [ + {"filename": s.name.split("/")[-1], "contents": s.read()} + for s in src + ], + } + + response = requests.post( + "https://paste.sr.ht/api/pastes", + json=request, + headers={"Authorization": f"token {os.getenv('SRHT_LEGACY')}"}, + ).json() + + if "sha" in response: + click.secho("*** Paste link ***", fg="green") + click.secho( + f"https://paste.sr.ht/{response['user']['canonical_name']}/{response['sha']}" + ) + + click.secho("\n*** Files ***", fg="green") + for file in response["files"]: + filename = file["filename"] + blob_id = file["blob_id"] + + click.secho(f"https://paste.sr.ht/blob/{blob_id}\t{filename}") + else: + click.secho(response, fg="red") + + +if __name__ == "__main__": + cli() diff --git a/playbooks/roles/shell/templates/scripts/toolbox_name.sh b/roles/user/base/files/toolbox_name.sh similarity index 86% rename from playbooks/roles/shell/templates/scripts/toolbox_name.sh rename to roles/user/base/files/toolbox_name.sh index 67607bc..eabe996 100644 --- a/playbooks/roles/shell/templates/scripts/toolbox_name.sh +++ b/roles/user/base/files/toolbox_name.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh cat /run/.containerenv | grep -E '^name=' | sed -e 's/name=\"\(.*\)\"/\1/' diff --git a/roles/user/base/tasks/desktop-utilities.yml b/roles/user/base/tasks/desktop-utilities.yml new file mode 100644 index 0000000..4a09aad --- /dev/null +++ b/roles/user/base/tasks/desktop-utilities.yml @@ -0,0 +1,8 @@ +--- +- name: Install basic desktop utilities + ansible.builtin.package: + name: + - playerctl + - flameshot + state: present + become: true diff --git a/roles/user/base/tasks/main.yml b/roles/user/base/tasks/main.yml new file mode 100644 index 0000000..918ec69 --- /dev/null +++ b/roles/user/base/tasks/main.yml @@ -0,0 +1,9 @@ +--- +- name: Initialize directory structure + ansible.builtin.include_tasks: structure.yml + +- name: Scripts + ansible.builtin.include_tasks: scripts.yml + +- name: Desktop utilities + ansible.builtin.include_tasks: desktop-utilities.yml diff --git a/roles/user/base/tasks/scripts.yml b/roles/user/base/tasks/scripts.yml new file mode 100644 index 0000000..7f07dd0 --- /dev/null +++ b/roles/user/base/tasks/scripts.yml @@ -0,0 +1,12 @@ +--- +- name: Install script for toolbox name retrieval + ansible.builtin.copy: + src: files/toolbox_name.sh + dest: ~/.local/bin/toolbox_name + mode: 0700 + +- name: Install script for paste.sr.ht + ansible.builtin.copy: + src: files/srht.py + dest: ~/.local/bin/srht + mode: 0700 diff --git a/roles/user/base/tasks/structure.yml b/roles/user/base/tasks/structure.yml new file mode 100644 index 0000000..9585197 --- /dev/null +++ b/roles/user/base/tasks/structure.yml @@ -0,0 +1,20 @@ +--- +- name: Create directories in `~/.local` + ansible.builtin.file: + path: "{{ item }}" + state: directory + mode: 0700 + owner: "{{ target_user }}" + group: "{{ target_user }}" + loop: + - ~/.local/bin + - ~/.local/share + - ~/.ssh + +- name: Create empty file for tokens + ansible.builtin.file: + path: ~/.tokens + state: touch + mode: 0600 + owner: "{{ target_user }}" + group: "{{ target_user }}" diff --git a/roles/user/editors/emacs/tasks/install.yml b/roles/user/editors/emacs/tasks/install.yml new file mode 100644 index 0000000..aad3d41 --- /dev/null +++ b/roles/user/editors/emacs/tasks/install.yml @@ -0,0 +1,6 @@ +--- +- name: Install Emacs + ansible.builtin.package: + name: emacs + state: present + become: true diff --git a/roles/user/editors/emacs/tasks/main.yml b/roles/user/editors/emacs/tasks/main.yml new file mode 100644 index 0000000..7b7ced5 --- /dev/null +++ b/roles/user/editors/emacs/tasks/main.yml @@ -0,0 +1,11 @@ +--- +- name: Packages + ansible.builtin.include_tasks: install.yml + tags: install + +- name: Clone Doom Emacs from GitHub + ansible.builtin.git: + repo: https://github.com/hlissner/doom-emacs + dest: ~/.emacs.d + depth: 1 + tags: user-emacs-doom diff --git a/roles/user/editors/neovim/tasks/install.yml b/roles/user/editors/neovim/tasks/install.yml new file mode 100644 index 0000000..556f230 --- /dev/null +++ b/roles/user/editors/neovim/tasks/install.yml @@ -0,0 +1,6 @@ +--- +- name: Install NeoVim + ansible.builtin.package: + name: neovim + state: present + become: true diff --git a/roles/user/editors/neovim/tasks/main.yml b/roles/user/editors/neovim/tasks/main.yml new file mode 100644 index 0000000..47e64f8 --- /dev/null +++ b/roles/user/editors/neovim/tasks/main.yml @@ -0,0 +1,10 @@ +--- +- name: Packages + ansible.builtin.include_tasks: install.yml + tags: install + +- name: Install NvChad + ansible.builtin.git: + repo: https://github.com/NvChad/NvChad + dest: ~/.config/nvim + depth: 1 diff --git a/playbooks/roles/vscode/templates/code-url.desktop.j2 b/roles/user/editors/vscode/files/code-url-handler.desktop similarity index 100% rename from playbooks/roles/vscode/templates/code-url.desktop.j2 rename to roles/user/editors/vscode/files/code-url-handler.desktop diff --git a/playbooks/roles/vscode/templates/code.desktop.j2 b/roles/user/editors/vscode/files/code.desktop similarity index 100% rename from playbooks/roles/vscode/templates/code.desktop.j2 rename to roles/user/editors/vscode/files/code.desktop diff --git a/roles/user/editors/vscode/files/keybindings.json b/roles/user/editors/vscode/files/keybindings.json new file mode 100644 index 0000000..b0d125c --- /dev/null +++ b/roles/user/editors/vscode/files/keybindings.json @@ -0,0 +1,78 @@ +[ + { + "key": "alt+f", + "command": "workbench.action.toggleMaximizedPanel" + }, + { + "key": "f7", + "command": "workbench.view.explorer" + }, + { + "key": "f7", + "command": "workbench.action.toggleSidebarVisibility", + "when": "explorerViewletVisible" + }, + { + "key": "ctrl+shift+e", + "command": "-workbench.view.explorer" + }, + { + "key": "ctrl+shift+k", + "command": "workbench.action.terminal.clear", + "when": "terminalFocus" + }, + { + "key": "ctrl+pagedown", + "command": "workbench.action.terminal.focusNext", + "when": "terminalFocus" + }, + { + "key": "ctrl+pageup", + "command": "workbench.action.terminal.focusPrevious", + "when": "terminalFocus" + }, + { + "key": "ctrl+k k", + "command": "workbench.action.focusAboveGroup" + }, + { + "key": "ctrl+k ctrl+up", + "command": "-workbench.action.focusAboveGroup" + }, + { + "key": "ctrl+k j", + "command": "workbench.action.focusBelowGroup" + }, + { + "key": "ctrl+k ctrl+down", + "command": "-workbench.action.focusBelowGroup" + }, + { + "key": "ctrl+k h", + "command": "workbench.action.focusLeftGroup" + }, + { + "key": "ctrl+k ctrl+left", + "command": "-workbench.action.focusLeftGroup" + }, + { + "key": "ctrl+k l", + "command": "workbench.action.focusRightGroup" + }, + { + "key": "ctrl+k ctrl+right", + "command": "-workbench.action.focusRightGroup" + }, + { + "key": "shift+alt+m", + "command": "workbench.action.customizeLayout" + }, + { + "key": "ctrl+k ctrl+z", + "command": "workbench.action.toggleCenteredLayout" + }, + { + "key": "alt+b", + "command": "workbench.action.toggleAuxiliaryBar" + } +] diff --git a/roles/user/editors/vscode/files/settings.json b/roles/user/editors/vscode/files/settings.json new file mode 100644 index 0000000..7c97b0d --- /dev/null +++ b/roles/user/editors/vscode/files/settings.json @@ -0,0 +1,65 @@ +{ + "breadcrumbs.enabled": false, + "editor.cursorBlinking": "phase", + "editor.cursorStyle": "line", + // "editor.fontFamily": "BlexMono Nerd Font", + // "editor.fontFamily": "CaskaydiaCovePL Nerd Font", + // "editor.fontFamily": "CozetteVector", // ASCII drawing || table issues + // "editor.fontFamily": "Fantasque Sans Mono", // ASCII drawing || table issues + // "editor.fontFamily": "FiraCode Nerd Font", + // "editor.fontFamily": "Hack Nerd Font", + // "editor.fontFamily": "Hasklug Nerd Font", + // "editor.fontFamily": "Inconsolata Nerd Font", // ASCII drawing || table issues + // "editor.fontFamily": "InputMono Nerd Font", // ASCII drawing || table issues + // "editor.fontFamily": "InputMonoNarrow Nerd Font", + // "editor.fontFamily": "InputMonoCondensed Nerd Font", + // "editor.fontFamily": "InputMonoCompressed Nerd Font", + // "editor.fontFamily": "'Iosevka Term', 'InputMonoCompressed Nerd Font'", + // "editor.fontFamily": "'Iosevka Term Extended', 'InputMonoCompressed Nerd Font'", + // "editor.fontFamily": "'Iosevka Term Slab', 'InputMonoCompressed Nerd Font'", + // "editor.fontFamily": "'Iosevka Term Slab Extended', 'InputMonoCompressed Nerd Font'", + // "editor.fontFamily": "Pragmasevka", + // "editor.fontFamily": "Iosevka Comfy", + // "editor.fontFamily": "JetBrainsMono Nerd Font", + // "editor.fontFamily": "JuliaMono Nerd Font", + // "editor.fontFamily": "'Martian Mono Nr Rg', 'Hack Nerd Font'", // ASCII drawing || table issues + // "editor.fontFamily": "MartianMono Nerd Font", + // "editor.fontFamily": "Monocraft", // ASCII drawing || table issues + // "editor.fontFamily": "MonoLisa Nerd Font", // ASCII drawing || table issues + // "editor.fontFamily": "MPLUS1Code Nerd Font", // ASCII drawing || table issues + // "editor.fontFamily": "MPLUSCodeLatin50 Nerd Font", // ASCII drawing || table issues + // "editor.fontFamily": "MPLUSCodeLatin60 Nerd Font", + // "editor.fontFamily": "MPLUSCodeLatin Nerd Font", // ASCII drawing || table issues + // "editor.fontFamily": "PragmataPro", + // "editor.fontFamily": "PragmataPro Mono", + // "editor.fontFamily": "PragmataPro Liga", + "editor.fontFamily": "PragmataPro Mono Liga", + // "editor.fontFamily": "RecMonoLinear Nerd Font", + // "editor.fontFamily": "RobotoMono Nerd Font", + // "editor.fontFamily": "SauceCodePro Nerd Font", + // "editor.fontFamily": "SFMono Nerd Font", + // "editor.fontFamily": "VictorMono Nerd Font", // ASCII drawing || table issues + // "editor.fontWeight": 350, + // "editor.fontSize": 15, + "editor.fontSize": 18, + // "editor.fontSize": 17, + "editor.fontLigatures": true, + // "editor.fontLigatures": "'ss01'", // italics for Cascadia Code + // "editor.fontLigatures": "'ss08'", // PragmataPro stylistic set for Iosevka + "terminal.integrated.fontSize": 15, + "editor.lineNumbers": "relative", + "editor.minimap.enabled": false, + "editor.minimap.maxColumn": 80, + // "editor.renderWhitespace": "all", + "editor.rulers": [80, 100], + "window.menuBarVisibility": "toggle", + "window.titleBarStyle": "custom", + "workbench.settings.editor": "json", + "workbench.editor.showTabs": true, + "remote.containers.dockerPath": "podman", + "diffEditor.ignoreTrimWhitespace": false, + "editor.guides.indentation": true, + "editor.guides.highlightActiveIndentation": true, + "diffEditor.renderSideBySide": false, + "workbench.colorTheme": "Vampiro" +} diff --git a/playbooks/roles/vscode/templates/update.sh.j2 b/roles/user/editors/vscode/files/update.sh similarity index 100% rename from playbooks/roles/vscode/templates/update.sh.j2 rename to roles/user/editors/vscode/files/update.sh diff --git a/roles/user/editors/vscode/tasks/main.yml b/roles/user/editors/vscode/tasks/main.yml new file mode 100644 index 0000000..8884c97 --- /dev/null +++ b/roles/user/editors/vscode/tasks/main.yml @@ -0,0 +1,40 @@ +--- +- name: Create directories for VSCode + ansible.builtin.file: + path: "{{ item }}" + state: directory + mode: 0740 + loop: + - ~/.local/bin + - ~/.local/share + - "$HOME/.config/Code - Insiders/User" + +- name: Install VSCode script + ansible.builtin.copy: + src: files/update.sh + dest: ~/.local/bin/code-update.sh + mode: 0640 + +- name: Create app info for VSCode + ansible.builtin.copy: + src: files/code{{ item }}.desktop + dest: ~/.local/share/visual-studio-code-insiders{{ item }}.desktop + mode: 0640 + loop: + - "" + - "-url-handler" + +- name: Install VSCode configuration + ansible.builtin.copy: + src: files/{{ item }}.json + dest: "~/.config/Code - Insiders/User/{{ item }}.json" + mode: 0640 + loop: + - settings + - keybindings + +- name: Install VSCode + ansible.builtin.command: + cmd: bash ~/.local/bin/code-update.sh + creates: /opt/VSCode-linux-x64 + become: true diff --git a/roles/user/git/tasks/main.yml b/roles/user/git/tasks/main.yml new file mode 100644 index 0000000..104fd3b --- /dev/null +++ b/roles/user/git/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- name: Create git config + ansible.builtin.template: + src: templates/gitconfig + dest: ~/.gitconfig + mode: 0640 diff --git a/roles/user/git/templates/gitconfig b/roles/user/git/templates/gitconfig new file mode 100644 index 0000000..590295d --- /dev/null +++ b/roles/user/git/templates/gitconfig @@ -0,0 +1,42 @@ +[alias] + scommit = commit --signoff + graph = log --oneline --decorate --graph --all + +[commit] + gpgsign = true + +[core] + editor = code --wait + excludesfile = /home/{{ target_user }}/.gitignore + +[diff] + tool = vscode-difftool + +[difftool "vscode-difftool"] + cmd = code --wait --diff $LOCAL $REMOTE + +[gpg] + program = gpg2 + +[init] + defaultBranch = main + +[pull] + rebase = true + +[rebase] + autoStash = true + +[tag] + gpgSign = true + +[user] + name = {{ fullname }} + email = {{ git_email }} + signingkey = {{ gpg_signingkey }} + +[includeIf "gitdir:~/git/github.com/packit/"] + path = /home/mfocko/git/github.com/packit/.gitconfig + +[includeIf "gitdir:~/git/gitlab.fi.muni.cz/"] + path = /home/mfocko/git/gitlab.fi.muni.cz/.gitconfig diff --git a/playbooks/roles/haskell/templates/ghci.conf.j2 b/roles/user/lang/haskell/files/ghci.conf similarity index 100% rename from playbooks/roles/haskell/templates/ghci.conf.j2 rename to roles/user/lang/haskell/files/ghci.conf diff --git a/roles/user/lang/haskell/tasks/install.yml b/roles/user/lang/haskell/tasks/install.yml new file mode 100644 index 0000000..6b25947 --- /dev/null +++ b/roles/user/lang/haskell/tasks/install.yml @@ -0,0 +1,6 @@ +--- +- name: Install GHC + ansible.builtin.package: + name: ghc + state: present + become: true diff --git a/roles/user/lang/haskell/tasks/main.yml b/roles/user/lang/haskell/tasks/main.yml new file mode 100644 index 0000000..a8089d8 --- /dev/null +++ b/roles/user/lang/haskell/tasks/main.yml @@ -0,0 +1,16 @@ +--- +- name: Packages + ansible.builtin.include_tasks: install.yml + tags: install + +- name: Create directory for GHC config + ansible.builtin.file: + path: ~/.ghc + state: directory + mode: 0740 + +- name: Install ghci.conf + ansible.builtin.copy: + src: files/ghci.conf + dest: ~/.ghc/ghci.conf + mode: 0640 diff --git a/roles/user/secrets/bw/tasks/main.yml b/roles/user/secrets/bw/tasks/main.yml new file mode 100644 index 0000000..4b18383 --- /dev/null +++ b/roles/user/secrets/bw/tasks/main.yml @@ -0,0 +1,38 @@ +--- +- name: Download the latest release + ansible.builtin.unarchive: + src: https://vault.bitwarden.com/download/\?app\=cli\&platform\=linux + dest: ~/.local/bin/ + remote_src: yes + creates: ~/.local/bin/bw + +- name: Make it executable + ansible.builtin.file: + path: ~/.local/bin/bw + mode: u+x + +- name: Run the CLI to create initial file + ansible.builtin.command: + cmd: bw + creates: ~/.config/Bitwarden CLI/data.json + +- name: Create data stores for specific deployments + ansible.builtin.copy: + src: ~/.config/Bitwarden CLI/data.json + dest: ~/.config/Bitwarden CLI/{{ item }}.json + mode: 0600 + force: false + remote_src: true + loop: + - vault.bitwarden.com + - vault.mfocko.xyz + +- name: Symlink to the self-hosted deployment + ansible.builtin.file: + src: ~/.config/Bitwarden CLI/vault.mfocko.xyz.json + path: ~/.config/Bitwarden CLI/data.json + force: true + state: link +# - name: Switch the server on the self-hosted “login” +# ansible.builtin.command: +# cmd: bw config server https://vault.mfocko.xyz diff --git a/playbooks/roles/shell/templates/tmux.conf.j2 b/roles/user/shell/tmux/files/tmux.conf similarity index 97% rename from playbooks/roles/shell/templates/tmux.conf.j2 rename to roles/user/shell/tmux/files/tmux.conf index ae4fe13..7dcf42f 100644 --- a/playbooks/roles/shell/templates/tmux.conf.j2 +++ b/roles/user/shell/tmux/files/tmux.conf @@ -24,7 +24,7 @@ bind - resize-pane -D 2 bind-key 'C-,' previous-window bind-key 'C-.' next-window -bind-key r clear-history +bind-key K clear-history bind-key R source-file ~/.tmux.conf \; display "Reloaded config file ~/.tmux.conf" bind-key b set status bind-key P command-prompt -p 'save history to filename:' -I '~/tmux.history' 'capture-pane -S - ; save-buffer %1 ; delete-buffer' diff --git a/playbooks/roles/shell/templates/tmux_status.conf.j2 b/roles/user/shell/tmux/files/tmux_status.conf similarity index 100% rename from playbooks/roles/shell/templates/tmux_status.conf.j2 rename to roles/user/shell/tmux/files/tmux_status.conf diff --git a/roles/user/shell/tmux/tasks/install.yml b/roles/user/shell/tmux/tasks/install.yml new file mode 100644 index 0000000..dbc97b8 --- /dev/null +++ b/roles/user/shell/tmux/tasks/install.yml @@ -0,0 +1,6 @@ +--- +- name: Install tmux + ansible.builtin.package: + name: tmux + state: present + become: true diff --git a/playbooks/roles/shell/tasks/tmux.yml b/roles/user/shell/tmux/tasks/main.yml similarity index 50% rename from playbooks/roles/shell/tasks/tmux.yml rename to roles/user/shell/tmux/tasks/main.yml index 638da20..d6eedaf 100644 --- a/playbooks/roles/shell/tasks/tmux.yml +++ b/roles/user/shell/tmux/tasks/main.yml @@ -1,20 +1,27 @@ --- +- name: Packages + ansible.builtin.include_tasks: install.yml + tags: install + - name: Create .tmux - file: + ansible.builtin.file: path: ~/.tmux state: directory + mode: 0700 - name: Clone tpm - git: + ansible.builtin.git: repo: https://github.com/tmux-plugins/tpm dest: ~/.tmux/plugins/tpm - name: Create tmux.conf - template: - src: templates/tmux.conf.j2 + ansible.builtin.copy: + src: files/tmux.conf dest: ~/.tmux.conf + mode: 0600 - name: Create tmux status configuration - template: - src: templates/tmux_status.conf.j2 + ansible.builtin.copy: + src: files/tmux_status.conf dest: ~/.tmux/status.conf + mode: 0600 diff --git a/roles/user/shell/zsh/files/starship.toml b/roles/user/shell/zsh/files/starship.toml new file mode 100644 index 0000000..e07790e --- /dev/null +++ b/roles/user/shell/zsh/files/starship.toml @@ -0,0 +1,65 @@ +add_newline = false +format = """$username\ +$hostname\ +$directory\ +$git_branch\ +$git_commit\ +$git_state\ +$git_status\ +${custom.toolbox}\ +$nix_shell\ +$jobs\ +$time\ +$cmd_duration\ +$line_break\ +$character""" + +[username] +format = "[$user@]($style)" +show_always = true +style_user = "blue" + +[hostname] +format = "[$hostname]($style) " +ssh_only = false +style = "blue" + +[directory] +style = "yellow" + +[git_branch] +format = "[$branch]($style)" +style = "cyan" + +[git_state] +format = '\([$state( $progress_current/$progress_total)]($style)\) ' +style = "cyan" + +[git_status] +format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)" +style = "cyan" +conflicted = "​" +untracked = "​" +modified = "​" +staged = "​" +renamed = "​" +deleted = "​" +stashed = "≡" + +[custom.toolbox] +when = "ls /run/.containerenv" +symbol = " " +command = "~/.local/bin/toolbox_name.sh" +format = "in [$symbol($output )]($style)" +style = "bold purple" + +[time] +disabled = true + +[cmd_duration] +format = "[$duration]($style) " + +[character] +success_symbol = "[λ](green)" +error_symbol = "[λ](red)" +vimcmd_symbol = "[❮](green)" diff --git a/roles/user/shell/zsh/files/zshrc b/roles/user/shell/zsh/files/zshrc new file mode 100644 index 0000000..06d232a --- /dev/null +++ b/roles/user/shell/zsh/files/zshrc @@ -0,0 +1,173 @@ +export ZSH="/home/mfocko/.oh-my-zsh" + +ENABLE_CORRECTION=true +plugins=(git common-aliases history systemd sudo zsh-autosuggestions zsh-syntax-highlighting zsh-aliases-exa fzf direnv taskwarrior autojump) +source $ZSH/oh-my-zsh.sh + +### add .local/bin to PATH ### +export GOPATH=$HOME/.go +export PATH=$HOME/.go/bin:$HOME/.npm/bin:$HOME/.emacs.d/bin:$HOME/.local/bin:$PATH + +### zsh autosuggestions color ### +ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=8,bold,underline" + +### Ruby gems ### +if which ruby >/dev/null && which gem >/dev/null; then + PATH="$(ruby -r rubygems -e 'puts Gem.user_dir')/bin:$PATH" +fi + +### NeoVim ### +export EDITOR=nvim +alias vim=nvim + +alias alacrittyconf="$EDITOR ~/.config/alacritty/alacritty.yml" +alias kittyconf="$EDITOR ~/.config/kitty/kitty.conf" + +### git aliases ### +export GIT_EDITOR=$EDITOR +alias gcs="git commit -v -s" + +### tokens ### +source ~/.tokens + +### gpg as ssh key ### +function gpg_for_ssh() { + export GPG_TTY=$(tty) + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + gpgconf --launch gpg-agent +} +gpg_for_ssh + +### direnv & nixpkg ### +if [[ $(command -v direnv 2> /dev/null) ]]; then + eval "$(direnv hook zsh)"; +fi +if [ -e /home/mfocko/.nix-profile/etc/profile.d/nix.sh ]; then + . /home/mfocko/.nix-profile/etc/profile.d/nix.sh; +fi # added by Nix installer + +### Rust ### +# export RUSTUP_HOME=/opt/rustup +# export CARGO_HOME=/opt/cargo +# export PATH=/opt/cargo/bin:$PATH +export PATH=~/.cargo/bin:$PATH +# [[ -s "/opt/cargo/env" ]] && source /opt/cargo/env + +### Go ### +export PATH="$HOME/.go/bin:$PATH" + +### SDKMan ### +export SDKMAN_DIR="/opt/sdkman" +[[ -s "/opt/sdkman/bin/sdkman-init.sh" ]] && source "/opt/sdkman/bin/sdkman-init.sh" + +### Bitwarden ### +eval "$(bw completion --shell zsh); compdef _bw bw;" + +function bwu() { + local VAULT=$(readlink ~/.config/Bitwarden\ CLI/data.json | cut -d'/' -f6 | cut -d'.' -f-3) + local PASS=$(yad --text "Master password for Bitwarden Vault @ $VAULT:" --center --button "yad-ok" --entry --hide-text) + export BW_SESSION=$(bw unlock --raw "$PASS") +} + +# alias bwu='export BW_SESSION="$(bw unlock --raw)"' +alias bwl='export BW_SESSION=' + +alias bwrh='ln -sf $HOME/.config/Bitwarden\ CLI/{vault.bitwarden.com,data}.json' +alias bwvps='ln -sf $HOME/.config/Bitwarden\ CLI/{vault.mfocko.xyz,data}.json' + +function gen_pass() { + LENGTH=12 + if [[ -n $1 ]]; then + LENGTH=$1 + fi + + bw generate -uln --length $LENGTH +} + +function gen_passphrase() { + LENGTH=2 + if [[ -n $1 ]]; then + LENGTH=$1 + fi + + bw generate -p --words $LENGTH +} + +# HashiCorp Vault +export VAULT_ADDR="https://hvault.mfocko.xyz" +function hcvu() { + local PASS=$(yad --text "Password for HashiCorp Vault @ mfocko.xyz:" --center --button "yad-ok" --entry --hide-text) + vault login -method=userpass -no-print username=$(whoami) password=$PASS +} + +### public_html ### +function from_phrase() { + bw list items --search $2 | jq --raw-output ".[] | select(.folderId == \"$1\") | .fields[] | select(.value == \"$3\") | .name" +} + +function to_phrase() { + bw list items --search $2 | jq --raw-output ".[] | select(.folderId == \"$1\") | .fields[] | select(.name == \"$3\") | .value" +} + +function get_link() { + FOLDER=$(bw list folders --search public_html | jq --raw-output ".[0].id") + if [[ "$1" == "aisa" ]]; then + PREFIX="https://fi.muni.cz/~xfocko"; + elif [[ "$1" == "poincare" ]]; then + PREFIX="https://me.mfocko.xyz"; + fi; + + echo $PREFIX/$(to_phrase $FOLDER $1 $2) +} + +function ls_links() { + FOLDER=$(bw list folders --search public_html | jq --raw-output ".[0].id") + bw list items --search $1 | jq ".[] | select(.folderId == \"$FOLDER\") | .fields[].name" +} + +### Red Hat ### +alias rh_vpn='echo "$(bw get password Red\ Hat\ -\ SSO)$(bw get totp Red\ Hat\ -\ SSO)" | nmcli --ask connection up Brno\ \(BRQ\)' +alias rh_vpn_rdu2='echo "$(bw get password Red\ Hat\ -\ SSO)$(bw get totp Red\ Hat\ -\ SSO)" | nmcli --ask connection up Raleigh\ \(RDU2\)' +alias rh_wifi='echo -e "\n$(bw get password Red\ Hat\ -\ SSO)$(bw get totp Red\ Hat\ -\ SSO)" | nmcli --ask connection up Red\ Hat' +alias rh_ticket='echo "$(bw get password Red\ Hat\ -\ Kerberos)" | kinit mfocko@REDHAT.COM' + +### Fedora ### +alias fk='echo "$(bw get password Fedora\ Accounts)$(bw get totp Fedora\ Accounts)" | fkinit' + +### FI ### +alias fi_vpn='echo "$(bw get password Faculty\ Pass)" | nmcli --ask connection up VPN\ FI\ MU' + +### C(XX)FLAGS ### +# export CC=gcc +# export CFLAGS="-std=c11 -Wall -Werror" +# export CXXFLAGS="-std=c++14 -Wall -Werror" +# export LDLIBS="-lm -lkarel -lcurses" +# export LDLIBS="-lm" + +export LANG=en_US.UTF-8 + +### Lazy aliases ### +alias q="exit" +alias k="exit" +alias ts="tmux new -As default" +alias Reset="reset && tmux clear-history" + +### Java ### +export PATH="/opt/jdk-18/bin:$PATH" + +### fzf ### +# source $HOME/.oh-my-zsh/custom/plugins/fzf-tab-completion/zsh/fzf-zsh-completion.sh +# bindkey '^I' fzf_completion + +# if [[ "$TMUX" == "" && "$VSCODE_SHELL_INTEGRATION" == "" ]]; then +# tmux new -s +# fi; + +### sprunge ### +function sprunge_paste() { + echo "Paste your code: " + cat - | curl -F 'sprunge=<-' http://sprunge.us +} + +### Starship ### +eval "$(starship init zsh)" diff --git a/roles/user/shell/zsh/tasks/install.yml b/roles/user/shell/zsh/tasks/install.yml new file mode 100644 index 0000000..bd03c8b --- /dev/null +++ b/roles/user/shell/zsh/tasks/install.yml @@ -0,0 +1,23 @@ +--- +- name: Install zsh + ansible.builtin.package: + name: + - zsh + - autojump + state: present + become: true + +- name: Install fzf for fuzzy finding + ansible.builtin.package: + name: fzf + state: present + become: true + when: ansible_distribution not in [ "AlmaLinux" ] + +# “yet another dialog” for the functions in zshrc +- name: Install yad for prompts from shell + ansible.builtin.package: + name: yad + state: present + become: true + when: ansible_distribution not in [ "AlmaLinux" ] diff --git a/roles/user/shell/zsh/tasks/main.yml b/roles/user/shell/zsh/tasks/main.yml new file mode 100644 index 0000000..955e670 --- /dev/null +++ b/roles/user/shell/zsh/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: Packages + ansible.builtin.include_tasks: install.yml + tags: install + +- name: Plugin oh-my-zsh + ansible.builtin.include_tasks: oh-my-zsh.yml + tags: zsh-oh-my-zsh + +- name: Plugin starship + ansible.builtin.include_tasks: starship.yml + +- name: Set default shell + become: true + ansible.builtin.user: + name: "{{ target_user }}" + shell: /bin/zsh + tags: zsh/set-default-shell diff --git a/roles/user/shell/zsh/tasks/oh-my-zsh.yml b/roles/user/shell/zsh/tasks/oh-my-zsh.yml new file mode 100644 index 0000000..f62cec5 --- /dev/null +++ b/roles/user/shell/zsh/tasks/oh-my-zsh.yml @@ -0,0 +1,35 @@ +--- +- name: Fetch the oh-my-zsh installer + ansible.builtin.get_url: + url: https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh + dest: /tmp/oh-my-zsh.sh + mode: 0700 + +- name: Install oh-my-zsh + ansible.builtin.command: + cmd: sh /tmp/oh-my-zsh.sh --unattended + creates: ~/.oh-my-zsh + +- name: Clone zsh-autosuggestions + ansible.builtin.git: + repo: https://github.com/zsh-users/zsh-autosuggestions + dest: ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions + update: no + +- name: Clone zsh-syntax-highlighting + ansible.builtin.git: + repo: https://github.com/zsh-users/zsh-syntax-highlighting.git + dest: ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting + update: no + +- name: Clone zsh-aliases-exa + ansible.builtin.git: + repo: https://github.com/DarrinTisdale/zsh-aliases-exa.git + dest: ~/.oh-my-zsh/custom/plugins/zsh-aliases-exa + update: no + +- name: Install the config + ansible.builtin.copy: + src: files/zshrc + dest: ~/.zshrc + mode: 0600 diff --git a/roles/user/shell/zsh/tasks/starship.yml b/roles/user/shell/zsh/tasks/starship.yml new file mode 100644 index 0000000..0ef3ad3 --- /dev/null +++ b/roles/user/shell/zsh/tasks/starship.yml @@ -0,0 +1,17 @@ +--- +- name: Fetch the starship installer + ansible.builtin.get_url: + url: https://starship.rs/install.sh + dest: /tmp/starship.sh + mode: 0700 + +- name: Install starship + ansible.builtin.command: + cmd: sh /tmp/starship.sh -f -b $HOME/.local/bin + creates: ~/.local/bin/starship + +- name: Install starship configuration + ansible.builtin.copy: + src: files/starship.toml + dest: ~/.config/starship.toml + mode: 0600 diff --git a/roles/user/ssh/files/ssh_config b/roles/user/ssh/files/ssh_config new file mode 100644 index 0000000..d13d6fb --- /dev/null +++ b/roles/user/ssh/files/ssh_config @@ -0,0 +1,58 @@ +# Allow authentication via Kerberos +GSSAPIAuthentication no + +# By default use the FIDO2 key from Yubikey +IdentityFile ~/.ssh/id_ed25519_sk + +# PIV secrets, disabled by default +PKCS11Provider none +# PKCS11Provider libykcs11.so.2 + +# Needs to be done for using the SSH key from GnuPG via Yubikey +Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" + +# Public +Host github.com + User git + Hostname github.com + +Host gitlab.com + User git + Hostname gitlab.com + +# FI +Host gitlab.fi.muni.cz + User git + Hostname gitlab.fi.muni.cz + +Host aisa anxur pontos0? + GSSAPIAuthentication yes + User xfocko + Hostname %h.fi.muni.cz + +Host nymfe* + GSSAPIAuthentication yes + User xfocko + ProxyJump xfocko@aisa.fi.muni.cz + Hostname %h.fi.muni.cz + +# Private +Host maxwell + User mfocko + Hostname maxwell.mfocko.xyz + Port 6969 + +Host poincare + User mfocko + Hostname mfocko.xyz + Port 10022 + +Host git.mfocko.xyz + User git + Hostname git.mfocko.xyz + Port 2222 + +Host git.maxwell.mfocko.xyz + User git + Hostname git.maxwell.mfocko.xyz + Port 6969 diff --git a/roles/user/ssh/tasks/main.yml b/roles/user/ssh/tasks/main.yml new file mode 100644 index 0000000..6be4275 --- /dev/null +++ b/roles/user/ssh/tasks/main.yml @@ -0,0 +1,14 @@ +--- +- name: Install SSH config + ansible.builtin.copy: + src: files/ssh_config + dest: ~/.ssh/config + mode: 0600 + tags: user-ssh-config + +- name: Install ‹.ssh/authorized_keys› + ansible.builtin.get_url: + url: https://gitlab.com/mfocko.keys + dest: ~/.ssh/authorized_keys + mode: 0600 + tags: user-ssh-authorized-keys diff --git a/roles/user/terminals/alacritty/files/alacritty.yml b/roles/user/terminals/alacritty/files/alacritty.yml new file mode 100755 index 0000000..b100232 --- /dev/null +++ b/roles/user/terminals/alacritty/files/alacritty.yml @@ -0,0 +1,118 @@ +import: + # - /home/mfocko/.config/alacritty/colors/ayu_dark.yml + # - /home/mfocko/.config/alacritty/colors/ayu_mirage.yml + # - /home/mfocko/.config/alacritty/colors/breeze.yml + # - /home/mfocko/.config/alacritty/colors/campbell.yml + - /home/mfocko/.config/alacritty/colors/codedark.yml +# - /home/mfocko/.config/alacritty/colors/codelight.yml +# - /home/mfocko/.config/alacritty/colors/default.yml +# - /home/mfocko/.config/alacritty/colors/dracula.yml +# - /home/mfocko/.config/alacritty/colors/gruvbox_dark.yml +# - /home/mfocko/.config/alacritty/colors/gruvbox_light.yml +# - /home/mfocko/.config/alacritty/colors/kanagawa.yml +# - /home/mfocko/.config/alacritty/colors/monokai/classic.yml +# - /home/mfocko/.config/alacritty/colors/monokai/pro.yml +# - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_machine.yml +# - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_octagon.yml +# - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_ristretto.yml +# - /home/mfocko/.config/alacritty/colors/monokai/pro_filter_spectrum.yml +# - /home/mfocko/.config/alacritty/colors/night_owl.yml +# - /home/mfocko/.config/alacritty/colors/nord.yml +# - /home/mfocko/.config/alacritty/colors/ocean.yml +# - /home/mfocko/.config/alacritty/colors/one_dark.yml +# - /home/mfocko/.config/alacritty/colors/one_dark_pro.yml +# - /home/mfocko/.config/alacritty/colors/one_light.yml +# - /home/mfocko/.config/alacritty/colors/onehalf_light.yml +# - /home/mfocko/.config/alacritty/colors/onehalf_dark.yml +# - /home/mfocko/.config/alacritty/colors/outrun_electric.yml +# - /home/mfocko/.config/alacritty/colors/rainier.yml +# - /home/mfocko/.config/alacritty/colors/rainier_retro.yml +# - /home/mfocko/.config/alacritty/colors/rose-pine.yml +# - /home/mfocko/.config/alacritty/colors/rose-pine-dawn.yml +# - /home/mfocko/.config/alacritty/colors/rose-pine-moon.yml +# - /home/mfocko/.config/alacritty/colors/solarized_dark.ymk +# - /home/mfocko/.config/alacritty/colors/solarized_light.yml +# - /home/mfocko/.config/alacritty/colors/tokyo_night.yml +# - /home/mfocko/.config/alacritty/colors/tokyo_night_storm.yml +# - /home/mfocko/.config/alacritty/colors/tomorrow_day.yml +# - /home/mfocko/.config/alacritty/colors/tomorrow_night.yml +# - /home/mfocko/.config/alacritty/colors/tomorrow_night_bright.yml + +env: + TERM: alacritty + +window: + padding: + x: 4 + y: 4 + dimensions: + columns: 144 + lines: 37 + dynamic_padding: true + decorations: none + +font: + normal: + # family: Berkeley Mono Variable + # family: Cascadia Mono PL + # family: Comic Code Ligatures + # family: Commit Mono + # family: CozetteVector + # family: Fira Code + # family: Fragment Mono + # family: Hack + # family: IBM Plex Mono + # family: Inconsolata + # family: Input Mono Narrow + # family: Iosevka Term + # family: Iosevka Term Slab + # family: Iosevka Comfy + # family: Iosevka Comfy Motion + # family: Iosevka Comfy Wide + # family: Iosevka Mornfall + # family: Pragmasevka + # family: JetBrains Mono + # family: JuliaMono + # family: Maple Mono NF + # family: Martian Mono + # family: Monocraft Nerd Font + # family: MonoLisa Nerd Font + # family: Pragmata Pro Mono + # family: Rec Mono Linear + # family: Roboto Mono + # family: Source Code Pro + # family: SFMono Nerd Font + # family: Twilio Sans Mono + family: Victor Mono + style: "SemiLight" + size: 14.0 + +cursor: + # Block, Underline, Beam + style: Beam + thickness: 0.33 + blinking: On + +selection: + # This string contains all characters that are used as separators for + # "semantic words" in Alacritty. + semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" + # When set to `true`, selected text will be copied to the primary clipboard. + save_to_clipboard: true + +mouse: + hints: + launcher: + # This depends on your OS, on Mac it’s `open` + program: open + modifiers: Control + +key_bindings: + - key: F11 + action: ToggleFullscreen + - key: N + mods: Control|Shift + action: SpawnNewInstance + - key: K + mods: Control|Shift + action: ClearHistory diff --git a/playbooks/roles/shell/templates/alacritty/colors/ayu_dark.yml b/roles/user/terminals/alacritty/files/colors/ayu_dark.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/ayu_dark.yml rename to roles/user/terminals/alacritty/files/colors/ayu_dark.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/ayu_mirage.yml b/roles/user/terminals/alacritty/files/colors/ayu_mirage.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/ayu_mirage.yml rename to roles/user/terminals/alacritty/files/colors/ayu_mirage.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/breeze.yml b/roles/user/terminals/alacritty/files/colors/breeze.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/breeze.yml rename to roles/user/terminals/alacritty/files/colors/breeze.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/campbell.yml b/roles/user/terminals/alacritty/files/colors/campbell.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/campbell.yml rename to roles/user/terminals/alacritty/files/colors/campbell.yml diff --git a/roles/user/terminals/alacritty/files/colors/codedark.yml b/roles/user/terminals/alacritty/files/colors/codedark.yml new file mode 100644 index 0000000..16ebf41 --- /dev/null +++ b/roles/user/terminals/alacritty/files/colors/codedark.yml @@ -0,0 +1,28 @@ +colors: + primary: + background: "#1e1e1e" + foreground: "#d4d4d4" + + cursor: + text: "#d4d4d4" + cursor: "#d4d4d4" + + normal: + black: "#1e1e1e" + red: "#f44747" + green: "#608b4e" + yellow: "#dcdcaa" + blue: "#569cd6" + magenta: "#c678dd" + cyan: "#56b6c2" + white: "#d4d4d4" + + bright: + black: "#545454" + red: "#f44747" + green: "#608b4e" + yellow: "#dcdcaa" + blue: "#569cd6" + magenta: "#c678dd" + cyan: "#56b6c2" + white: "#d4d4d4" diff --git a/roles/user/terminals/alacritty/files/colors/codelight.yml b/roles/user/terminals/alacritty/files/colors/codelight.yml new file mode 100644 index 0000000..9d3d5c6 --- /dev/null +++ b/roles/user/terminals/alacritty/files/colors/codelight.yml @@ -0,0 +1,28 @@ +colors: + primary: + background: "#ffffff" + foreground: "#1e1e1e" + + cursor: + text: "#d4d4d4" + cursor: "#d4d4d4" + + normal: + black: "#1e1e1e" + red: "#c72e0f" + green: "#009000" + yellow: "#795e25" + blue: "#007acc" + magenta: "#af00db" + cyan: "#56b6c2" + white: "#d4d4d4" + + bright: + black: "#1e1e1e" + red: "#c72e0f" + green: "#009000" + yellow: "#795e25" + blue: "#007acc" + magenta: "#af00db" + cyan: "#56b6c2" + white: "#d4d4d4" diff --git a/playbooks/roles/shell/templates/alacritty/colors/default.yml b/roles/user/terminals/alacritty/files/colors/default.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/default.yml rename to roles/user/terminals/alacritty/files/colors/default.yml diff --git a/roles/user/terminals/alacritty/files/colors/dracula.yml b/roles/user/terminals/alacritty/files/colors/dracula.yml new file mode 100644 index 0000000..1399c40 --- /dev/null +++ b/roles/user/terminals/alacritty/files/colors/dracula.yml @@ -0,0 +1,61 @@ +# Dracula theme for Alacritty +# https://draculatheme.com/alacritty +# +# Color palette +# https://spec.draculatheme.com +# +# Template +# https://github.com/alacritty/alacritty/blob/master/alacritty.yml + +colors: + primary: + background: "#282a36" + foreground: "#f8f8f2" + bright_foreground: "#ffffff" + cursor: + text: CellBackground + cursor: CellForeground + vi_mode_cursor: + text: CellBackground + cursor: CellForeground + search: + matches: + foreground: "#44475a" + background: "#50fa7b" + focused_match: + foreground: "#44475a" + background: "#ffb86c" + footer_bar: + background: "#282a36" + foreground: "#f8f8f2" + hints: + start: + foreground: "#282a36" + background: "#f1fa8c" + end: + foreground: "#f1fa8c" + background: "#282a36" + line_indicator: + foreground: None + background: None + selection: + text: CellForeground + background: "#44475a" + normal: + black: "#21222c" + red: "#ff5555" + green: "#50fa7b" + yellow: "#f1fa8c" + blue: "#bd93f9" + magenta: "#ff79c6" + cyan: "#8be9fd" + white: "#f8f8f2" + bright: + black: "#6272a4" + red: "#ff6e6e" + green: "#69ff94" + yellow: "#ffffa5" + blue: "#d6acff" + magenta: "#ff92df" + cyan: "#a4ffff" + white: "#ffffff" diff --git a/playbooks/roles/shell/templates/alacritty/colors/gruvbox_dark.yml b/roles/user/terminals/alacritty/files/colors/gruvbox_dark.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/gruvbox_dark.yml rename to roles/user/terminals/alacritty/files/colors/gruvbox_dark.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/gruvbox_light.yml b/roles/user/terminals/alacritty/files/colors/gruvbox_light.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/gruvbox_light.yml rename to roles/user/terminals/alacritty/files/colors/gruvbox_light.yml diff --git a/roles/user/terminals/alacritty/files/colors/kanagawa.yml b/roles/user/terminals/alacritty/files/colors/kanagawa.yml new file mode 100644 index 0000000..07c0e5d --- /dev/null +++ b/roles/user/terminals/alacritty/files/colors/kanagawa.yml @@ -0,0 +1,33 @@ +# Kanagawa Alacritty Colors +colors: + primary: + background: "0x1f1f28" + foreground: "0xdcd7ba" + + normal: + black: "0x090618" + red: "0xc34043" + green: "0x76946a" + yellow: "0xc0a36e" + blue: "0x7e9cd8" + magenta: "0x957fb8" + cyan: "0x6a9589" + white: "0xc8c093" + + bright: + black: "0x727169" + red: "0xe82424" + green: "0x98bb6c" + yellow: "0xe6c384" + blue: "0x7fb4ca" + magenta: "0x938aa9" + cyan: "0x7aa89f" + white: "0xdcd7ba" + + selection: + background: "0x2d4f67" + foreground: "0xc8c093" + + indexed_colors: + - { index: 16, color: "0xffa066" } + - { index: 17, color: "0xff5d62" } diff --git a/playbooks/roles/shell/templates/alacritty/colors/monokai/classic.yml b/roles/user/terminals/alacritty/files/colors/monokai/classic.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/monokai/classic.yml rename to roles/user/terminals/alacritty/files/colors/monokai/classic.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/monokai/pro.yml b/roles/user/terminals/alacritty/files/colors/monokai/pro.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/monokai/pro.yml rename to roles/user/terminals/alacritty/files/colors/monokai/pro.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_machine.yml b/roles/user/terminals/alacritty/files/colors/monokai/pro_filter_machine.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_machine.yml rename to roles/user/terminals/alacritty/files/colors/monokai/pro_filter_machine.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_octagon.yml b/roles/user/terminals/alacritty/files/colors/monokai/pro_filter_octagon.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_octagon.yml rename to roles/user/terminals/alacritty/files/colors/monokai/pro_filter_octagon.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_ristretto.yml b/roles/user/terminals/alacritty/files/colors/monokai/pro_filter_ristretto.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_ristretto.yml rename to roles/user/terminals/alacritty/files/colors/monokai/pro_filter_ristretto.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_spectrum.yml b/roles/user/terminals/alacritty/files/colors/monokai/pro_filter_spectrum.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/monokai/pro_filter_spectrum.yml rename to roles/user/terminals/alacritty/files/colors/monokai/pro_filter_spectrum.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/night_owl.yml b/roles/user/terminals/alacritty/files/colors/night_owl.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/night_owl.yml rename to roles/user/terminals/alacritty/files/colors/night_owl.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/nord.yml b/roles/user/terminals/alacritty/files/colors/nord.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/nord.yml rename to roles/user/terminals/alacritty/files/colors/nord.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/ocean.yml b/roles/user/terminals/alacritty/files/colors/ocean.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/ocean.yml rename to roles/user/terminals/alacritty/files/colors/ocean.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/one_dark.yml b/roles/user/terminals/alacritty/files/colors/one_dark.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/one_dark.yml rename to roles/user/terminals/alacritty/files/colors/one_dark.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/one_dark_pro.yml b/roles/user/terminals/alacritty/files/colors/one_dark_pro.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/one_dark_pro.yml rename to roles/user/terminals/alacritty/files/colors/one_dark_pro.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/one_light.yml b/roles/user/terminals/alacritty/files/colors/one_light.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/one_light.yml rename to roles/user/terminals/alacritty/files/colors/one_light.yml diff --git a/roles/user/terminals/alacritty/files/colors/onehalf_dark.yml b/roles/user/terminals/alacritty/files/colors/onehalf_dark.yml new file mode 100644 index 0000000..0f22194 --- /dev/null +++ b/roles/user/terminals/alacritty/files/colors/onehalf_dark.yml @@ -0,0 +1,27 @@ +# Colors (One Half Dark) +colors: + primary: + background: "0x282c34" + foreground: "0xdcdfe4" + + normal: + black: "0x393d45" + # black: '0x282c34' + red: "0xe06c75" + green: "0x98c379" + yellow: "0xe5c07b" + blue: "0x61afef" + magenta: "0xc678dd" + cyan: "0x56b6c2" + white: "0xdcdfe4" + + bright: + black: "0x393d45" + # black: '0x282c34' + red: "0xe06c75" + green: "0x98c379" + yellow: "0xe5c07b" + blue: "0x61afef" + magenta: "0xc678dd" + cyan: "0x56b6c2" + white: "0xdcdfe4" diff --git a/roles/user/terminals/alacritty/files/colors/onehalf_light.yml b/roles/user/terminals/alacritty/files/colors/onehalf_light.yml new file mode 100644 index 0000000..cb4e083 --- /dev/null +++ b/roles/user/terminals/alacritty/files/colors/onehalf_light.yml @@ -0,0 +1,25 @@ +# Colors (One Half Light) +colors: + primary: + background: "0xfafafa" + foreground: "0x383a42" + + normal: + black: "0x383a42" + red: "0xe45649" + green: "0x50a14f" + yellow: "0xc18401" + blue: "0x0184bc" + magenta: "0xa626a4" + cyan: "0x0997b3" + white: "0xfafafa" + + bright: + black: "0x383a42" + red: "0xe45649" + green: "0x50a14f" + yellow: "0xc18401" + blue: "0x0184bc" + magenta: "0xa626a4" + cyan: "0x0997b3" + white: "0xfafafa" diff --git a/playbooks/roles/shell/templates/alacritty/colors/outrun_electric.yml b/roles/user/terminals/alacritty/files/colors/outrun_electric.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/outrun_electric.yml rename to roles/user/terminals/alacritty/files/colors/outrun_electric.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/rainier.yml b/roles/user/terminals/alacritty/files/colors/rainier.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/rainier.yml rename to roles/user/terminals/alacritty/files/colors/rainier.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/rainier_retro.yml b/roles/user/terminals/alacritty/files/colors/rainier_retro.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/rainier_retro.yml rename to roles/user/terminals/alacritty/files/colors/rainier_retro.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/rose-pine-dawn.yml b/roles/user/terminals/alacritty/files/colors/rose-pine-dawn.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/rose-pine-dawn.yml rename to roles/user/terminals/alacritty/files/colors/rose-pine-dawn.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/rose-pine-moon.yml b/roles/user/terminals/alacritty/files/colors/rose-pine-moon.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/rose-pine-moon.yml rename to roles/user/terminals/alacritty/files/colors/rose-pine-moon.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/rose-pine.yml b/roles/user/terminals/alacritty/files/colors/rose-pine.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/rose-pine.yml rename to roles/user/terminals/alacritty/files/colors/rose-pine.yml diff --git a/roles/user/terminals/alacritty/files/colors/solarized_dark.yml b/roles/user/terminals/alacritty/files/colors/solarized_dark.yml new file mode 100644 index 0000000..1ba5953 --- /dev/null +++ b/roles/user/terminals/alacritty/files/colors/solarized_dark.yml @@ -0,0 +1,28 @@ +# Colors (Solarized Dark) +colors: + # Default colors + primary: + background: "0x002b36" + foreground: "0x839496" + + # Normal colors + normal: + black: "0x073642" + red: "0xdc322f" + green: "0x859900" + yellow: "0xb58900" + blue: "0x268bd2" + magenta: "0xd33682" + cyan: "0x2aa198" + white: "0xeee8d5" + + # Bright colors + bright: + black: "0x002b36" + red: "0xcb4b16" + green: "0x586e75" + yellow: "0x657b83" + blue: "0x839496" + magenta: "0x6c71c4" + cyan: "0x93a1a1" + white: "0xfdf6e3" diff --git a/playbooks/roles/shell/templates/alacritty/colors/solarized_light.yml b/roles/user/terminals/alacritty/files/colors/solarized_light.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/solarized_light.yml rename to roles/user/terminals/alacritty/files/colors/solarized_light.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/tokyo_night.yml b/roles/user/terminals/alacritty/files/colors/tokyo_night.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/tokyo_night.yml rename to roles/user/terminals/alacritty/files/colors/tokyo_night.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/tokyo_night_storm.yml b/roles/user/terminals/alacritty/files/colors/tokyo_night_storm.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/tokyo_night_storm.yml rename to roles/user/terminals/alacritty/files/colors/tokyo_night_storm.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/tomorrow_day.yml b/roles/user/terminals/alacritty/files/colors/tomorrow_day.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/tomorrow_day.yml rename to roles/user/terminals/alacritty/files/colors/tomorrow_day.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/tomorrow_night.yml b/roles/user/terminals/alacritty/files/colors/tomorrow_night.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/tomorrow_night.yml rename to roles/user/terminals/alacritty/files/colors/tomorrow_night.yml diff --git a/playbooks/roles/shell/templates/alacritty/colors/tomorrow_night_bright.yml b/roles/user/terminals/alacritty/files/colors/tomorrow_night_bright.yml similarity index 100% rename from playbooks/roles/shell/templates/alacritty/colors/tomorrow_night_bright.yml rename to roles/user/terminals/alacritty/files/colors/tomorrow_night_bright.yml diff --git a/roles/user/terminals/alacritty/tasks/install.yml b/roles/user/terminals/alacritty/tasks/install.yml new file mode 100644 index 0000000..f91ca68 --- /dev/null +++ b/roles/user/terminals/alacritty/tasks/install.yml @@ -0,0 +1,13 @@ +--- +- name: Enable alacritty PPA + ansible.builtin.apt_repository: + repo: ppa:aslatter/ppa + become: true + when: ansible_distribution == "Ubuntu" + +- name: Install alacritty + ansible.builtin.package: + name: alacritty + state: present + become: true +# FIXME: Handle EPEL diff --git a/roles/user/terminals/alacritty/tasks/main.yml b/roles/user/terminals/alacritty/tasks/main.yml new file mode 100644 index 0000000..b32ab07 --- /dev/null +++ b/roles/user/terminals/alacritty/tasks/main.yml @@ -0,0 +1,10 @@ +--- +- name: Packages + ansible.builtin.include_tasks: install.yml + tags: install + +- name: Install alacritty configuration + ansible.builtin.copy: + src: files/ + dest: ~/.config/alacritty/ + mode: 0740 diff --git a/playbooks/roles/shell/templates/kitty/colors/ayu_dark.conf b/roles/user/terminals/kitty/files/colors/ayu_dark.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/ayu_dark.conf rename to roles/user/terminals/kitty/files/colors/ayu_dark.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/ayu_mirage.conf b/roles/user/terminals/kitty/files/colors/ayu_mirage.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/ayu_mirage.conf rename to roles/user/terminals/kitty/files/colors/ayu_mirage.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/convert.py b/roles/user/terminals/kitty/files/colors/convert.py similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/convert.py rename to roles/user/terminals/kitty/files/colors/convert.py diff --git a/playbooks/roles/shell/templates/kitty/colors/default.conf b/roles/user/terminals/kitty/files/colors/default.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/default.conf rename to roles/user/terminals/kitty/files/colors/default.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/dracula.conf b/roles/user/terminals/kitty/files/colors/dracula.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/dracula.conf rename to roles/user/terminals/kitty/files/colors/dracula.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/kanagawa.conf b/roles/user/terminals/kitty/files/colors/kanagawa.conf similarity index 99% rename from playbooks/roles/shell/templates/kitty/colors/kanagawa.conf rename to roles/user/terminals/kitty/files/colors/kanagawa.conf index ebda64b..2916b2b 100644 --- a/playbooks/roles/shell/templates/kitty/colors/kanagawa.conf +++ b/roles/user/terminals/kitty/files/colors/kanagawa.conf @@ -44,4 +44,3 @@ color15 #DCD7BA # extended colors color16 #FFA066 color17 #FF5D62 - diff --git a/playbooks/roles/shell/templates/kitty/colors/monokai/classic.yml b/roles/user/terminals/kitty/files/colors/monokai/classic.yml similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/monokai/classic.yml rename to roles/user/terminals/kitty/files/colors/monokai/classic.yml diff --git a/playbooks/roles/shell/templates/kitty/colors/monokai/pro.yml b/roles/user/terminals/kitty/files/colors/monokai/pro.yml similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/monokai/pro.yml rename to roles/user/terminals/kitty/files/colors/monokai/pro.yml diff --git a/playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_machine.yml b/roles/user/terminals/kitty/files/colors/monokai/pro_filter_machine.yml similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_machine.yml rename to roles/user/terminals/kitty/files/colors/monokai/pro_filter_machine.yml diff --git a/playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_octagon.yml b/roles/user/terminals/kitty/files/colors/monokai/pro_filter_octagon.yml similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_octagon.yml rename to roles/user/terminals/kitty/files/colors/monokai/pro_filter_octagon.yml diff --git a/playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_ristretto.yml b/roles/user/terminals/kitty/files/colors/monokai/pro_filter_ristretto.yml similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_ristretto.yml rename to roles/user/terminals/kitty/files/colors/monokai/pro_filter_ristretto.yml diff --git a/playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_spectrum.yml b/roles/user/terminals/kitty/files/colors/monokai/pro_filter_spectrum.yml similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/monokai/pro_filter_spectrum.yml rename to roles/user/terminals/kitty/files/colors/monokai/pro_filter_spectrum.yml diff --git a/playbooks/roles/shell/templates/kitty/colors/night_owl.conf b/roles/user/terminals/kitty/files/colors/night_owl.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/night_owl.conf rename to roles/user/terminals/kitty/files/colors/night_owl.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/nord.conf b/roles/user/terminals/kitty/files/colors/nord.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/nord.conf rename to roles/user/terminals/kitty/files/colors/nord.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/ocean.conf b/roles/user/terminals/kitty/files/colors/ocean.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/ocean.conf rename to roles/user/terminals/kitty/files/colors/ocean.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/one_dark.conf b/roles/user/terminals/kitty/files/colors/one_dark.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/one_dark.conf rename to roles/user/terminals/kitty/files/colors/one_dark.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/one_dark_pro.conf b/roles/user/terminals/kitty/files/colors/one_dark_pro.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/one_dark_pro.conf rename to roles/user/terminals/kitty/files/colors/one_dark_pro.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/one_light.conf b/roles/user/terminals/kitty/files/colors/one_light.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/one_light.conf rename to roles/user/terminals/kitty/files/colors/one_light.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/onehalf_dark.conf b/roles/user/terminals/kitty/files/colors/onehalf_dark.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/onehalf_dark.conf rename to roles/user/terminals/kitty/files/colors/onehalf_dark.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/onehalf_light.conf b/roles/user/terminals/kitty/files/colors/onehalf_light.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/onehalf_light.conf rename to roles/user/terminals/kitty/files/colors/onehalf_light.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/outrun_electric.conf b/roles/user/terminals/kitty/files/colors/outrun_electric.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/outrun_electric.conf rename to roles/user/terminals/kitty/files/colors/outrun_electric.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/rainier.conf b/roles/user/terminals/kitty/files/colors/rainier.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/rainier.conf rename to roles/user/terminals/kitty/files/colors/rainier.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/rainier_retro.conf b/roles/user/terminals/kitty/files/colors/rainier_retro.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/rainier_retro.conf rename to roles/user/terminals/kitty/files/colors/rainier_retro.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/solarized_dark.conf b/roles/user/terminals/kitty/files/colors/solarized_dark.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/solarized_dark.conf rename to roles/user/terminals/kitty/files/colors/solarized_dark.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/solarized_light.conf b/roles/user/terminals/kitty/files/colors/solarized_light.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/solarized_light.conf rename to roles/user/terminals/kitty/files/colors/solarized_light.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/tokyo_night.conf b/roles/user/terminals/kitty/files/colors/tokyo_night.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/tokyo_night.conf rename to roles/user/terminals/kitty/files/colors/tokyo_night.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/tokyo_night_storm.conf b/roles/user/terminals/kitty/files/colors/tokyo_night_storm.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/tokyo_night_storm.conf rename to roles/user/terminals/kitty/files/colors/tokyo_night_storm.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/tomorrow_day.conf b/roles/user/terminals/kitty/files/colors/tomorrow_day.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/tomorrow_day.conf rename to roles/user/terminals/kitty/files/colors/tomorrow_day.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/tomorrow_night.conf b/roles/user/terminals/kitty/files/colors/tomorrow_night.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/tomorrow_night.conf rename to roles/user/terminals/kitty/files/colors/tomorrow_night.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/tomorrow_night_blue.conf b/roles/user/terminals/kitty/files/colors/tomorrow_night_blue.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/tomorrow_night_blue.conf rename to roles/user/terminals/kitty/files/colors/tomorrow_night_blue.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/tomorrow_night_bright.conf b/roles/user/terminals/kitty/files/colors/tomorrow_night_bright.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/tomorrow_night_bright.conf rename to roles/user/terminals/kitty/files/colors/tomorrow_night_bright.conf diff --git a/playbooks/roles/shell/templates/kitty/colors/tomorrow_night_eighties.conf b/roles/user/terminals/kitty/files/colors/tomorrow_night_eighties.conf similarity index 100% rename from playbooks/roles/shell/templates/kitty/colors/tomorrow_night_eighties.conf rename to roles/user/terminals/kitty/files/colors/tomorrow_night_eighties.conf diff --git a/playbooks/roles/shell/templates/kitty/kitty.conf b/roles/user/terminals/kitty/files/kitty.conf similarity index 98% rename from playbooks/roles/shell/templates/kitty/kitty.conf rename to roles/user/terminals/kitty/files/kitty.conf index ced9eaf..c195d63 100755 --- a/playbooks/roles/shell/templates/kitty/kitty.conf +++ b/roles/user/terminals/kitty/files/kitty.conf @@ -4,38 +4,43 @@ # font_family BlexMono Nerd Font # font_family CaskaydiaCovePL Nerd Font -# font_family CozetteVector -# font_family FiraCode Nerd Font +# font_family CozetteVector # doesn't work +# font_family FantasqueSansMono Nerd Font # doesn't work +# font_family FiraCode Nerd Font # doesn't work # font_family Hack Nerd Font # font_family Hasklug Nerd Font -# font_family Inconsolata Nerd Font +# font_family Inconsolata Nerd Font # doesn't work # font_family InputMono Nerd Font # font_family InputMonoNarrow Nerd Font # font_family InputMonoCondensed Nerd Font # font_family InputMonoCompressed Nerd Font -font_family Iosevka Term +# font_family Iosevka Term # font_family Iosevka Term Slab # font_family Iosevka Term Extended # font_family Iosevka Term Slab Extended # font_family JetBrainsMono Nerd Font -# font_family Martian Mono EARLY ADOPTERS Cn Bk +# font_family JuliaMono Nerd Font # doesn't work +# font_family Martian Mono EARLY ADOPTERS Cn Bk # doesn't work +# font_family Monocraft # font_family MonoLisa Nerd Font +font_family PragmataPro Mono Liga # font_family RecMonoLinear Nerd Font # font_family RobotoMono Nerd Font # font_family SauceCodePro Nerd Font # font_family SFMono Nerd Font -# font_family VictorMono Nerd Font +# font_family VictorMono Nerd Font # doesn't work -font_size 15.0 +font_size 16.0 #: }}} #: Color scheme {{{ +# include colors/dracula.conf # include colors/solarized_light.conf # include colors/solarized_dark.conf -# include colors/tokyo_night.conf -include colors/tomorrow_day.conf +include colors/tokyo_night.conf +# include colors/tomorrow_day.conf # include colors/tomorrow_night.conf # include colors/tomorrow_night_bright.conf @@ -399,7 +404,7 @@ cursor_underline_thickness 2 #: values set top, horizontal and bottom. Four values set top, right, #: bottom and left. -window_padding_width 4 +# window_padding_width 0 #: The window padding (in pts) (blank area between the text and the #: window border). A single value sets all four sides. Two values set diff --git a/roles/user/terminals/kitty/tasks/install.yml b/roles/user/terminals/kitty/tasks/install.yml new file mode 100644 index 0000000..e73d574 --- /dev/null +++ b/roles/user/terminals/kitty/tasks/install.yml @@ -0,0 +1,6 @@ +--- +- name: Install Kitty + ansible.builtin.package: + name: kitty + state: present + become: true diff --git a/roles/user/terminals/kitty/tasks/main.yml b/roles/user/terminals/kitty/tasks/main.yml new file mode 100644 index 0000000..79dd0a0 --- /dev/null +++ b/roles/user/terminals/kitty/tasks/main.yml @@ -0,0 +1,10 @@ +--- +- name: Packages + ansible.builtin.include_tasks: install.yml + tags: install + +- name: Install Kitty configuration + ansible.builtin.copy: + src: files/ + dest: ~/.config/kitty/ + mode: 0740