Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ Ansible:
- roles/**/*
- bootstrap.yml

Git:
- changed-files:
- any-glob-to-any-file:
- git/**/*

Neovim:
- changed-files:
- any-glob-to-any-file:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
scopes: |
alacritty
ansible
git
neovim
starship
task
Expand Down
20 changes: 20 additions & 0 deletions git/.gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[diff]
tool = difftastic
[merge]
conflictStyle = zdiff3
[user]
name = Kirill Morozov
[pager]
difftool = true
[push]
autoSetupRemote = true
[pull]
rebase = true
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
[credential "https://github.com"]
helper = !/opt/homebrew/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper = !/opt/homebrew/bin/gh auth git-credential
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
state: latest
package:
- btop
- difftastic
- eza
- fd
- fzf
Expand Down
1 change: 1 addition & 0 deletions roles/development_machine/tasks/install-rpm-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
pkg:
- alacritty
- btop
- difftastic
- eza
- fd-find
- fzf
Expand Down
2 changes: 2 additions & 0 deletions roles/development_machine/vars/config-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
development_machine_directory_mapping:
- source: "{{ playbook_dir }}/alacritty"
target: "{{ development_machine_xdg_config_home }}/alacritty"
- source: "{{ playbook_dir }}/git"
target: "~"
- source: "{{ playbook_dir }}/neovim"
target: "{{ development_machine_xdg_config_home }}/nvim"
- source: "{{ playbook_dir }}/starship"
Expand Down