Compare commits

...

6 Commits

Author SHA1 Message Date
ea61e071c5
Sign commits true
All checks were successful
dotfiles/pipeline/head This commit looks good
2021-08-31 15:50:51 +02:00
1108eb54f2 Remove unused group_vars
All checks were successful
dotfiles/pipeline/head This commit looks good
2021-08-31 15:10:04 +02:00
fb655f347e Add Jenkinsfile with ansible-lint step
All checks were successful
dotfiles/pipeline/head This commit looks good
2021-08-31 15:04:52 +02:00
34ee1e126f Make ansible-lint happy 2021-08-31 14:27:56 +02:00
1ef6921640 Fix keychain agents config 2021-08-31 14:00:05 +02:00
13c9a79da7 Fix gpg-agent.conf 2021-08-31 13:53:10 +02:00
6 changed files with 56 additions and 44 deletions

11
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,11 @@
pipeline {
agent any
stages {
stage('lint') {
steps {
sh 'ansible-lint dotfiles.yml'
}
}
}
}

View File

@ -1,6 +1,3 @@
home: '{{ "~" | expanduser }}' home: '{{ "~" | expanduser }}'
dotfiles_dir: '{{home}}/src/dotfiles' dotfiles_dir: '{{home}}/src/dotfiles'
files_dir: '{{dotfiles_dir}}/roles/dotfiles/files' files_dir: '{{dotfiles_dir}}/roles/dotfiles/files'
git_mail: 'mail@johannes-rothe.de'
git_name: 'Johannes Rothe'
diff_tool: 'vimdiff'

View File

@ -7,4 +7,4 @@ if status --is-login
end end
end end
eval (keychain --eval --agents ssh --agents gpg 82CD152AAAE9CAF77EACB29E73F092605AF3286C) eval (keychain --eval --agents ssh,gpg 82CD152AAAE9CAF77EACB29E73F092605AF3286C)

View File

@ -8,3 +8,5 @@
st = status st = status
co = checkout co = checkout
br = branch br = branch
[commit]
gpgsign = true

View File

@ -1,2 +1 @@
default-cache-ttl 10800 default-cache-ttl 10800
maximum-cache-ttl 10800

View File

@ -31,43 +31,46 @@
- name: Remove old backup - name: Remove old backup
file: file:
path: '{{home}}/tmp/dotfiles_backup' path: '{{ home }}/tmp/dotfiles_backup'
state: absent state: absent
- name: Create new backup dir - name: Create new backup dir
file: file:
path: '{{home}}/tmp/dotfiles_backup' path: '{{ home }}/tmp/dotfiles_backup'
state: directory state: directory
mode: 0700
- name: Backup stuff - name: Backup stuff
copy: copy:
src: '{{ item }}' src: '{{ item }}'
dest: '{{home}}/tmp/dotfiles_backup' dest: '{{ home }}/tmp/dotfiles_backup'
remote_src: True # copy the folder from the host instead of ansible remote_src: True # copy the folder from the host instead of ansible
mode: 0600
ignore_errors: yes ignore_errors: yes
loop: loop:
# dirs (without trailing '/' copies the whole dir) # dirs (without trailing '/' copies the whole dir)
- '{{home}}/.config/fish' - '{{ home }}/.config/fish'
# files # files
- '{{home}}/.tmux.conf' - '{{ home }}/.tmux.conf'
- '{{home}}/.vimrc' - '{{ home }}/.vimrc'
- '{{home}}/.ssh/config' - '{{ home }}/.ssh/config'
- '{{home}}/.config/i3/config' - '{{ home }}/.config/i3/config'
- '{{home}}/.config/i3status/config' - '{{ home }}/.config/i3status/config'
- '{{home}}/.config/rofi/config' - '{{ home }}/.config/rofi/config'
- '{{home}}/.gitconfig' - '{{ home }}/.gitconfig'
- '{{home}}/.gnupg/gpg-agent.conf' - '{{ home }}/.gnupg/gpg-agent.conf'
- name: Make sure folders exist - name: Make sure folders exist
file: file:
path: '{{item}}' path: '{{ item }}'
state: directory state: directory
mode: 0700
loop: loop:
- '{{home}}/.config/i3/' - '{{ home }}/.config/i3/'
- '{{home}}/.config/i3status/' - '{{ home }}/.config/i3status/'
- '{{home}}/.config/rofi/' - '{{ home }}/.config/rofi/'
- '{{home}}/.ssh/' - '{{ home }}/.ssh/'
- '{{home}}/pictures/shots/' - '{{ home }}/pictures/shots/'
- '{{home}}/.gnupg/' - '{{ home }}/.gnupg/'
- name: Link files - name: Link files
file: file:
@ -76,23 +79,23 @@
state: link state: link
force: True force: True
loop: loop:
- src: '{{files_dir}}/vimrc' - src: '{{ files_dir }}/vimrc'
dest: '{{home}}/.vimrc' dest: '{{ home }}/.vimrc'
- src: '{{files_dir}}/i3_config' - src: '{{ files_dir }}/i3_config'
dest: '{{home}}/.config/i3/config' dest: '{{ home }}/.config/i3/config'
- src: '{{files_dir}}/i3status_config' - src: '{{ files_dir }}/i3status_config'
dest: '{{home}}/.config/i3status/config' dest: '{{ home }}/.config/i3status/config'
- src: '{{files_dir}}/rofi_config' - src: '{{ files_dir }}/rofi_config'
dest: '{{home}}/.config/rofi/config' dest: '{{ home }}/.config/rofi/config'
- src: '{{files_dir}}/tmux.conf' - src: '{{ files_dir }}/tmux.conf'
dest: '{{home}}/.tmux.conf' dest: '{{ home }}/.tmux.conf'
- src: '{{files_dir}}/ssh_config' - src: '{{ files_dir }}/ssh_config'
dest: '{{home}}/.ssh/config' dest: '{{ home }}/.ssh/config'
- src: '{{files_dir}}/fish' - src: '{{ files_dir }}/fish'
dest: '{{home}}/.config/fish' dest: '{{ home }}/.config/fish'
- src: '{{files_dir}}/wallpaper' - src: '{{ files_dir }}/wallpaper'
dest: '{{home}}/pictures/wallpaper' dest: '{{ home }}/pictures/wallpaper'
- src: '{{files_dir}}/gitconfig' - src: '{{ files_dir }}/gitconfig'
dest: '{{home}}/.gitconfig' dest: '{{ home }}/.gitconfig'
- src: '{{files_dir}}/gpg-agent.conf' - src: '{{ files_dir }}/gpg-agent.conf'
dest: '{{home}}/.gnupg/gpg-agent.conf' dest: '{{ home }}/.gnupg/gpg-agent.conf'