From 595b300a299934c54505c8f86c94595775dcae68 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Mon, 25 Jan 2021 12:12:53 +0100 Subject: [PATCH 1/5] Update git config - main branch - signed commit alias - rebase when pulling Closes #27 Signed-off-by: Matej Focko --- playbooks/roles/git/templates/gitconfig.j2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/playbooks/roles/git/templates/gitconfig.j2 b/playbooks/roles/git/templates/gitconfig.j2 index 47dc81f..696be6b 100644 --- a/playbooks/roles/git/templates/gitconfig.j2 +++ b/playbooks/roles/git/templates/gitconfig.j2 @@ -1,3 +1,6 @@ +[alias] + scommit = commit --signoff + [commit] gpgsign = true @@ -14,6 +17,12 @@ [gpg] program = gpg2 +[init] + defaultBranch = main + +[pull] + rebase = true + [user] name = Matej Focko email = {{ git_email }} -- 2.45.2 From cc174d843e972c69242e1cb217bf59346ae0b584 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Mon, 25 Jan 2021 12:19:56 +0100 Subject: [PATCH 2/5] Add pre-commit Signed-off-by: Matej Focko --- .pre-commit-config.yaml | 19 +++++++++++++++++++ .../roles/fedora/packages/tasks/main.yml | 4 ++-- .../roles/fedora/repositories/tasks/main.yml | 2 +- .../rpmfusion-free-updates-testing.repo.j2 | 1 - .../local/rpmfusion-free-updates.repo.j2 | 1 - .../templates/local/rpmfusion-free.repo.j2 | 1 - .../rpmfusion-nonfree-updates-testing.repo.j2 | 1 - .../local/rpmfusion-nonfree-updates.repo.j2 | 1 - .../templates/local/rpmfusion-nonfree.repo.j2 | 1 - .../rpmfusion-free-updates-testing.repo.j2 | 1 - .../remote/rpmfusion-free-updates.repo.j2 | 1 - .../templates/remote/rpmfusion-free.repo.j2 | 1 - .../rpmfusion-nonfree-updates-testing.repo.j2 | 1 - .../remote/rpmfusion-nonfree-updates.repo.j2 | 1 - .../remote/rpmfusion-nonfree.repo.j2 | 1 - playbooks/roles/fedora/upgrade/tasks/main.yml | 2 +- playbooks/roles/git/tasks/main.yml | 2 +- playbooks/roles/haskell/tasks/main.yml | 2 +- playbooks/roles/shell/templates/init.vim.j2 | 14 +++++++------- .../roles/shell/templates/starship.toml.j2 | 2 +- playbooks/roles/shell/templates/tmux.conf.j2 | 2 +- .../roles/shell/templates/tmux_status.conf.j2 | 2 +- playbooks/roles/ssh/templates/ssh_config.j2 | 2 +- .../vscode/templates/code-url.desktop.j2 | 2 +- .../vscode/templates/keybindings.json.j2 | 2 +- .../roles/vscode/templates/settings.json.j2 | 2 +- scripts/export_keys.sh | 2 +- scripts/generate_gpg.sh | 2 +- 28 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..e72ee08 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,19 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files + - repo: https://github.com/prettier/pre-commit + rev: v2.1.2 + hooks: + - id: prettier + - repo: https://github.com/ansible/ansible-lint.git + rev: v4.2.0 + hooks: + - id: ansible-lint + files: \.(yaml|yml)$ diff --git a/playbooks/roles/fedora/packages/tasks/main.yml b/playbooks/roles/fedora/packages/tasks/main.yml index 6c988ac..d3671a1 100644 --- a/playbooks/roles/fedora/packages/tasks/main.yml +++ b/playbooks/roles/fedora/packages/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Upgrade all packages dnf: - name: '*' + name: "*" state: latest - name: Install playerctl and flameshot @@ -12,4 +12,4 @@ state: present - include: shell.yml -- include: haskell.yml \ No newline at end of file +- include: haskell.yml diff --git a/playbooks/roles/fedora/repositories/tasks/main.yml b/playbooks/roles/fedora/repositories/tasks/main.yml index 05847fe..b1cf462 100644 --- a/playbooks/roles/fedora/repositories/tasks/main.yml +++ b/playbooks/roles/fedora/repositories/tasks/main.yml @@ -31,4 +31,4 @@ - rpmfusion-free - rpmfusion-nonfree-updates-testing - rpmfusion-nonfree-updates - - rpmfusion-nonfree \ No newline at end of file + - rpmfusion-nonfree 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 index aa58187..c6418ec 100644 --- 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 @@ -29,4 +29,3 @@ 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 index 89d7673..ac3f67d 100644 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free-updates.repo.j2 @@ -29,4 +29,3 @@ 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 index 0325937..7284d60 100644 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-free.repo.j2 @@ -31,4 +31,3 @@ 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 index 7cd3fe8..b00cbd1 100644 --- 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 @@ -29,4 +29,3 @@ 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 index fb79a02..7f69190 100644 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree-updates.repo.j2 @@ -29,4 +29,3 @@ 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 index d064986..710381b 100644 --- a/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/local/rpmfusion-nonfree.repo.j2 @@ -32,4 +32,3 @@ 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-free-updates-testing.repo.j2 b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates-testing.repo.j2 index e4cbddd..662defc 100644 --- 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 @@ -28,4 +28,3 @@ 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 index 1405931..d520472 100644 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free-updates.repo.j2 @@ -28,4 +28,3 @@ 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 index e65aa5b..4a66f92 100644 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-free.repo.j2 @@ -30,4 +30,3 @@ 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 index d8998fa..6aebcf4 100644 --- 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 @@ -28,4 +28,3 @@ 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 index 6d4d825..a456130 100644 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree-updates.repo.j2 @@ -28,4 +28,3 @@ 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 index dfb5110..100cb93 100644 --- a/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree.repo.j2 +++ b/playbooks/roles/fedora/repositories/templates/remote/rpmfusion-nonfree.repo.j2 @@ -31,4 +31,3 @@ 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 index 5de5cea..01520ae 100644 --- a/playbooks/roles/fedora/upgrade/tasks/main.yml +++ b/playbooks/roles/fedora/upgrade/tasks/main.yml @@ -7,7 +7,7 @@ - name: Update all packages dnf: - name: '*' + name: "*" state: latest - name: Install system-upgrade plugin diff --git a/playbooks/roles/git/tasks/main.yml b/playbooks/roles/git/tasks/main.yml index 844af79..b77e708 100644 --- a/playbooks/roles/git/tasks/main.yml +++ b/playbooks/roles/git/tasks/main.yml @@ -2,4 +2,4 @@ - name: Create git config template: src: templates/gitconfig.j2 - dest: ~/.gitconfig \ No newline at end of file + dest: ~/.gitconfig diff --git a/playbooks/roles/haskell/tasks/main.yml b/playbooks/roles/haskell/tasks/main.yml index 3c4dcd5..cceb081 100644 --- a/playbooks/roles/haskell/tasks/main.yml +++ b/playbooks/roles/haskell/tasks/main.yml @@ -12,4 +12,4 @@ - name: Install HLint.hs template: src: templates/HLint.hs.j2 - dest: ~/.ghc/HLint.hs \ No newline at end of file + dest: ~/.ghc/HLint.hs diff --git a/playbooks/roles/shell/templates/init.vim.j2 b/playbooks/roles/shell/templates/init.vim.j2 index 4632ef8..7b566c0 100644 --- a/playbooks/roles/shell/templates/init.vim.j2 +++ b/playbooks/roles/shell/templates/init.vim.j2 @@ -13,11 +13,11 @@ " Then run vim and install the plugins using command in normal mode: " :PlugInstall " -" Most of the settings come from vimconfig.com. +" 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 +" Ctrl+Up/Down Move line or a block of selected lines +" Ctrl+j/k " pp Toggle paste mode on and off " Disable search highlight " @@ -80,7 +80,7 @@ if &term =~ '256color' " 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 +endif " If you happen to still have a problem on some terminal, uncomment: " set t_Co=256 @@ -99,12 +99,12 @@ 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 @@ -113,7 +113,7 @@ set smarttab " Enable smart-tabs set softtabstop=4 expandtab " Number of spaces per Tab set wrap " Wrap lines - + """"" """"" Advanced """"" diff --git a/playbooks/roles/shell/templates/starship.toml.j2 b/playbooks/roles/shell/templates/starship.toml.j2 index f661b69..0a7b939 100644 --- a/playbooks/roles/shell/templates/starship.toml.j2 +++ b/playbooks/roles/shell/templates/starship.toml.j2 @@ -32,4 +32,4 @@ format = "[$path]($style)[$read_only]($read_only_style) " [character] success_symbol = "[%%](bold green)" -error_symbol = "[%%](bold red)" \ No newline at end of file +error_symbol = "[%%](bold red)" diff --git a/playbooks/roles/shell/templates/tmux.conf.j2 b/playbooks/roles/shell/templates/tmux.conf.j2 index bdd5df6..4b46461 100644 --- a/playbooks/roles/shell/templates/tmux.conf.j2 +++ b/playbooks/roles/shell/templates/tmux.conf.j2 @@ -34,4 +34,4 @@ set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @continuum-restore 'on' -run '~/.tmux/plugins/tpm/tpm' \ No newline at end of file +run '~/.tmux/plugins/tpm/tpm' diff --git a/playbooks/roles/shell/templates/tmux_status.conf.j2 b/playbooks/roles/shell/templates/tmux_status.conf.j2 index fd4916f..eb792d9 100644 --- a/playbooks/roles/shell/templates/tmux_status.conf.j2 +++ b/playbooks/roles/shell/templates/tmux_status.conf.j2 @@ -7,4 +7,4 @@ set -g status-interval 1 set -g status-justify centre set -g status-position top setw -g window-status-current-format '#[fg=colour2][#I|#W#F]' -setw -g window-status-format '[#I|#W#F]' \ No newline at end of file +setw -g window-status-format '[#I|#W#F]' diff --git a/playbooks/roles/ssh/templates/ssh_config.j2 b/playbooks/roles/ssh/templates/ssh_config.j2 index 3dab22a..91f7a80 100644 --- a/playbooks/roles/ssh/templates/ssh_config.j2 +++ b/playbooks/roles/ssh/templates/ssh_config.j2 @@ -34,4 +34,4 @@ Host git.mfocko.xyz Host git.gauss.mfocko.xyz User git Hostname git.gauss.mfocko.xyz - Port 2222 \ No newline at end of file + Port 2222 diff --git a/playbooks/roles/vscode/templates/code-url.desktop.j2 b/playbooks/roles/vscode/templates/code-url.desktop.j2 index 1540473..c750536 100644 --- a/playbooks/roles/vscode/templates/code-url.desktop.j2 +++ b/playbooks/roles/vscode/templates/code-url.desktop.j2 @@ -9,4 +9,4 @@ NoDisplay=true StartupNotify=true Categories=Utility;TextEditor;Development;IDE; MimeType=x-scheme-handler/vscode-insiders; -Keywords=vscode; \ No newline at end of file +Keywords=vscode; diff --git a/playbooks/roles/vscode/templates/keybindings.json.j2 b/playbooks/roles/vscode/templates/keybindings.json.j2 index b56fe6b..8b31edb 100644 --- a/playbooks/roles/vscode/templates/keybindings.json.j2 +++ b/playbooks/roles/vscode/templates/keybindings.json.j2 @@ -31,4 +31,4 @@ "command": "workbench.action.terminal.focusPrevious", "when": "terminalFocus" } -] \ No newline at end of file +] diff --git a/playbooks/roles/vscode/templates/settings.json.j2 b/playbooks/roles/vscode/templates/settings.json.j2 index e7234ef..b32c052 100644 --- a/playbooks/roles/vscode/templates/settings.json.j2 +++ b/playbooks/roles/vscode/templates/settings.json.j2 @@ -43,4 +43,4 @@ "gitlens.views.repositories.location": "scm", "gitlens.views.search.location": "scm", "diffEditor.renderSideBySide": true -} \ No newline at end of file +} diff --git a/scripts/export_keys.sh b/scripts/export_keys.sh index 4dbb96e..6727667 100644 --- a/scripts/export_keys.sh +++ b/scripts/export_keys.sh @@ -5,4 +5,4 @@ cat ~/.ssh/id_ed25519.pub echo ">>> Exporting public GPG key <<<" ID=$(gpg --list-secret-keys --keyid-format LONG | perl -n -e'/^sec.*\/(\w*)\s+/ && print $1') -gpg --armor --export $ID \ No newline at end of file +gpg --armor --export $ID diff --git a/scripts/generate_gpg.sh b/scripts/generate_gpg.sh index 3ac6e6f..7c42b4b 100644 --- a/scripts/generate_gpg.sh +++ b/scripts/generate_gpg.sh @@ -7,4 +7,4 @@ ID=$(gpg --list-secret-keys --keyid-format LONG | perl -n -e'/^sec.*\/(\w*)\s+/ echo ">>> ID: $ID <<<" echo ">>> Exporting public key <<<" -gpg --armor --export $ID \ No newline at end of file +gpg --armor --export $ID -- 2.45.2 From 6f2a6653ffbbcb21e47a9ad8bd2b6e7b63266918 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Mon, 25 Jan 2021 12:30:39 +0100 Subject: [PATCH 3/5] Add alacritty Closes #26 Signed-off-by: Matej Focko --- .../roles/fedora/packages/tasks/shell.yml | 3 +- playbooks/roles/shell/tasks/alacritty.yml | 5 ++++ playbooks/roles/shell/tasks/main.yml | 5 ++-- .../shell/templates/alacritty/alacritty.yml | 28 +++++++++++++++++++ .../templates/alacritty/colors/ayu_dark.yml | 25 +++++++++++++++++ .../templates/alacritty/colors/ayu_mirage.yml | 25 +++++++++++++++++ .../templates/alacritty/colors/default.yml | 27 ++++++++++++++++++ .../templates/alacritty/colors/night_owl.yml | 26 +++++++++++++++++ .../templates/alacritty/colors/ocean.yml | 25 +++++++++++++++++ .../alacritty/colors/outrun_electric.yml | 25 +++++++++++++++++ .../templates/alacritty/colors/rainier.yml | 25 +++++++++++++++++ .../alacritty/colors/rainier_retro.yml | 25 +++++++++++++++++ 12 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 playbooks/roles/shell/tasks/alacritty.yml create mode 100755 playbooks/roles/shell/templates/alacritty/alacritty.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/ayu_dark.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/ayu_mirage.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/default.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/night_owl.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/ocean.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/outrun_electric.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/rainier.yml create mode 100644 playbooks/roles/shell/templates/alacritty/colors/rainier_retro.yml diff --git a/playbooks/roles/fedora/packages/tasks/shell.yml b/playbooks/roles/fedora/packages/tasks/shell.yml index 8d5fb3a..b14b3ff 100644 --- a/playbooks/roles/fedora/packages/tasks/shell.yml +++ b/playbooks/roles/fedora/packages/tasks/shell.yml @@ -6,4 +6,5 @@ - tmux - neovim - emacs - state: present \ No newline at end of file + - alacritty + state: present diff --git a/playbooks/roles/shell/tasks/alacritty.yml b/playbooks/roles/shell/tasks/alacritty.yml new file mode 100644 index 0000000..fdcb9b4 --- /dev/null +++ b/playbooks/roles/shell/tasks/alacritty.yml @@ -0,0 +1,5 @@ +--- +- name: Install alacritty configuration + template: + src: templates/alacritty + dest: ~/.config/ diff --git a/playbooks/roles/shell/tasks/main.yml b/playbooks/roles/shell/tasks/main.yml index 7802987..06772ac 100644 --- a/playbooks/roles/shell/tasks/main.yml +++ b/playbooks/roles/shell/tasks/main.yml @@ -6,10 +6,11 @@ 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 +# - 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/templates/alacritty/alacritty.yml b/playbooks/roles/shell/templates/alacritty/alacritty.yml new file mode 100755 index 0000000..76b170b --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/alacritty.yml @@ -0,0 +1,28 @@ +import: + - /home/mfocko/.config/alacritty/colors/ayu_dark.yml + +env: + TERM: alacritty + +window: + dimensions: + columns: 107 + lines: 30 + + dynamic_padding: true + decorations: none + startup_mode: Maximized + +font: + normal: + family: JetBrainsMonoNL Nerd Font + size: 13.0 + +cursor: + # Block, Underline, Beam + style: Underline + thickness: 0.33 + +key_bindings: + - key: F11 + action: ToggleFullscreen diff --git a/playbooks/roles/shell/templates/alacritty/colors/ayu_dark.yml b/playbooks/roles/shell/templates/alacritty/colors/ayu_dark.yml new file mode 100644 index 0000000..9daef4d --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/ayu_dark.yml @@ -0,0 +1,25 @@ +# Ayu Dark +colors: + primary: + foreground: "#b3b1ad" + background: "#0a0e14" + + normal: + black: "#00010a" + blue: "#53bdfa" + cyan: "#90e1c6" + green: "#91b362" + magenta: "#fae994" + red: "#ea6c73" + white: "#c7c7c7" + yellow: "#f9af4f" + + bright: + black: "#686868" + blue: "#59c2ff" + cyan: "#95e6cb" + green: "#c2d94c" + magenta: "#ffee99" + red: "#f07178" + white: "#ffffff" + yellow: "#ffb454" diff --git a/playbooks/roles/shell/templates/alacritty/colors/ayu_mirage.yml b/playbooks/roles/shell/templates/alacritty/colors/ayu_mirage.yml new file mode 100644 index 0000000..b6f6891 --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/ayu_mirage.yml @@ -0,0 +1,25 @@ +# Ayu Mirage +colors: + primary: + foreground: "#cbccc6" + background: "#1f2430" + + normal: + black: "#191e2a" + blue: "#6dcbfa" + cyan: "#90e1c6" + green: "#a6cc70" + magenta: "#cfbafa" + red: "#ed8274" + white: "#c7c7c7" + yellow: "#fad07b" + + bright: + black: "#686868" + blue: "#73d0ff" + cyan: "#95e6cb" + green: "#bae67e" + magenta: "#d4bfff" + red: "#f28779" + white: "#ffffff" + yellow: "#ffd580" diff --git a/playbooks/roles/shell/templates/alacritty/colors/default.yml b/playbooks/roles/shell/templates/alacritty/colors/default.yml new file mode 100644 index 0000000..2c0a158 --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/default.yml @@ -0,0 +1,27 @@ +colors: + # Default colors + primary: + background: "#333333" + foreground: "#F2F2F2" + + # Normal colors + normal: + black: "#333333" + red: "#CC0000" + green: "#4E9A06" + yellow: "#C4A000" + blue: "#3465A4" + magenta: "#75507B" + cyan: "#06989A" + white: "#D3D7CF" + + # Bright colors + bright: + black: "#88807C" + red: "#F15D22" + green: "#73C48F" + yellow: "#FFCE51" + blue: "#48B9C7" + magenta: "#AD7FA8" + cyan: "#34E2E2" + white: "#EEEEEC" diff --git a/playbooks/roles/shell/templates/alacritty/colors/night_owl.yml b/playbooks/roles/shell/templates/alacritty/colors/night_owl.yml new file mode 100644 index 0000000..174c1c9 --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/night_owl.yml @@ -0,0 +1,26 @@ +# Night Owl +colors: + primary: + foreground: "#d6deeb" + # background: '#011627' # for Night Owl + background: "#000000" # for Night Owl Black + + normal: + black: "#011627" + blue: "#82AAFF" + cyan: "#21c7a8" + green: "#22da6e" + magenta: "#C792EA" + red: "#EF5350" + white: "#ffffff" + yellow: "#c5e478" + + bright: + black: "#575656" + blue: "#82AAFF" + cyan: "#7fdbca" + green: "#22da6e" + magenta: "#C792EA" + red: "#EF5350" + white: "#ffffff" + yellow: "#ffeb95" diff --git a/playbooks/roles/shell/templates/alacritty/colors/ocean.yml b/playbooks/roles/shell/templates/alacritty/colors/ocean.yml new file mode 100644 index 0000000..cbc5bf3 --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/ocean.yml @@ -0,0 +1,25 @@ +# Ocean +colors: + primary: + foreground: "#8F93A2" + background: "#0F111A" + + normal: + black: "#000000" + blue: "#3A75C4" + cyan: "#87D3F8" + green: "#14B37D" + magenta: "#703FAF" + red: "#E25822" + white: "#FFFFFF" + yellow: "#F2F27A" + + bright: + black: "#3A75C4" + blue: "#3A75C4" + cyan: "#87D3F8" + green: "#14B37D" + magenta: "#703FAF" + red: "#E25822" + white: "#F3EFE0" + yellow: "#F2F27A" diff --git a/playbooks/roles/shell/templates/alacritty/colors/outrun_electric.yml b/playbooks/roles/shell/templates/alacritty/colors/outrun_electric.yml new file mode 100644 index 0000000..af17bb3 --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/outrun_electric.yml @@ -0,0 +1,25 @@ +# Outrun Electric +colors: + primary: + foreground: "#e4eeff" + background: "#090819" + + normal: + black: "#283034" + red: "#ff2e97" + green: "#62a9cf" + yellow: "#ffd400" + blue: "#42c6ff" + magenta: "#ff2afc" + cyan: "#42c6ff" + white: "#d9e0e9" + + bright: + black: "#435056" + red: "#ff2e97" + green: "#add0e5" + yellow: "#ffd400" + blue: "#42c6ff" + magenta: "#ff2afc" + cyan: "#42c6ff" + white: "#f4f6f9" diff --git a/playbooks/roles/shell/templates/alacritty/colors/rainier.yml b/playbooks/roles/shell/templates/alacritty/colors/rainier.yml new file mode 100644 index 0000000..8ab15a7 --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/rainier.yml @@ -0,0 +1,25 @@ +# Rainier +colors: + primary: + foreground: "#b3c8dc" + background: "#171d23" + + normal: + black: "#171d23" + blue: "#509ddb" + cyan: "#509ddb" + green: "#37c2b6" + magenta: "#b9346c" + red: "#b9346c" + white: "#b3c8dc" + yellow: "#c9c994" + + bright: + black: "#627d96" + blue: "#509ddb" + cyan: "#509ddb" + green: "#37c2b6" + magenta: "#9d79d8" + red: "#b9346c" + white: "#f2f2f2" + yellow: "#d6af78" diff --git a/playbooks/roles/shell/templates/alacritty/colors/rainier_retro.yml b/playbooks/roles/shell/templates/alacritty/colors/rainier_retro.yml new file mode 100644 index 0000000..b63c600 --- /dev/null +++ b/playbooks/roles/shell/templates/alacritty/colors/rainier_retro.yml @@ -0,0 +1,25 @@ +# Rainier - Retro +colors: + primary: + foreground: "#b9d3e9" + background: "#201825" + + normal: + black: "#201825" + blue: "#509ddb" + cyan: "#509ddb" + green: "#37c2b6" + magenta: "#b9346c" + red: "#b9346c" + white: "#b9d3e9" + yellow: "#c9c994" + + bright: + black: "#7B6296" + blue: "#509ddb" + cyan: "#509ddb" + green: "#37c2b6" + magenta: "#9d79d8" + red: "#b9346c" + white: "#f2f2f2" + yellow: "#d6af78" -- 2.45.2 From b61a8814d7ad1c70ab40f696a6402ea47a51dd63 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Mon, 25 Jan 2021 19:26:36 +0100 Subject: [PATCH 4/5] Fix installing of RPM fusion Signed-off-by: Matej Focko --- playbooks/roles/fedora/repositories/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbooks/roles/fedora/repositories/tasks/main.yml b/playbooks/roles/fedora/repositories/tasks/main.yml index b1cf462..0ad57df 100644 --- a/playbooks/roles/fedora/repositories/tasks/main.yml +++ b/playbooks/roles/fedora/repositories/tasks/main.yml @@ -8,6 +8,7 @@ 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 - name: Install Google Chrome repository -- 2.45.2 From d2a345cc0e7f30d632a461693d655fb249bb3c85 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Mon, 25 Jan 2021 19:27:01 +0100 Subject: [PATCH 5/5] Update starship.rs config - install to local directory - add command for toolbox status Signed-off-by: Matej Focko --- playbooks/roles/shell/tasks/zsh.yml | 2 +- playbooks/roles/shell/templates/starship.toml.j2 | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/shell/tasks/zsh.yml b/playbooks/roles/shell/tasks/zsh.yml index a37b47d..75974cb 100644 --- a/playbooks/roles/shell/tasks/zsh.yml +++ b/playbooks/roles/shell/tasks/zsh.yml @@ -19,7 +19,7 @@ dest: ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting - name: Clone starship - shell: sh -c "$(curl -fsSL https://starship.rs/install.sh)" "" -f + shell: sh -c "$(curl -fsSL https://starship.rs/install.sh)" "" -f -b $HOME/.local/bin - name: Create zshrc template: diff --git a/playbooks/roles/shell/templates/starship.toml.j2 b/playbooks/roles/shell/templates/starship.toml.j2 index 0a7b939..22c6cda 100644 --- a/playbooks/roles/shell/templates/starship.toml.j2 +++ b/playbooks/roles/shell/templates/starship.toml.j2 @@ -1,5 +1,6 @@ add_newline = false -format = """$username\ +format = """${custom.toolbox}\ +$username\ $hostname\ $git_branch\ $git_commit\ @@ -33,3 +34,8 @@ format = "[$path]($style)[$read_only]($read_only_style) " [character] success_symbol = "[%%](bold green)" error_symbol = "[%%](bold red)" + +[custom.toolbox] +when = "ls /run/.containerenv" +command = "echo ⬢" +style = "bold purple" -- 2.45.2