Compare commits

..

No commits in common. "6706d042984e09830dba85c9b613e98e7d299c86" and "8cabb029b36a7f399c8a55f4625bf400415fb7b4" have entirely different histories.

2 changed files with 4 additions and 26 deletions

View file

@ -7,56 +7,40 @@ for name, user_config in node.metadata.get('users').items():
directories = { directories = {
join(user_config['home'], '.zsh'): { join(user_config['home'], '.zsh'): {
'owner': name, 'owner': name,
'group': name,
}, },
join(user_config['home'], '.zsh/oh-my-zsh'): { join(user_config['home'], '.zsh/oh-my-zsh'): {
'owner': name, 'owner': name,
'group': name,
}, },
join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): { join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): {
'owner': name, 'owner': name,
'group': name,
'needs': [ 'needs': [
f"git_deploy:{join(user_config['home'], '.zsh/oh-my-zsh')}", f"git_deploy:{join(user_config['home'], '.zsh/oh-my-zsh')}",
] ]
}, },
} }
git_deploy = { git_deploy = {
join(user_config['home'], '.zsh/oh-my-zsh'): { join(user_config['home'], '.zsh/oh-my-zsh'): {
'repo': 'https://github.com/ohmyzsh/ohmyzsh.git', 'repo': 'https://github.com/ohmyzsh/ohmyzsh.git',
'rev': 'master', 'rev': 'master',
'triggers': [
f'action:chown_zsh_{name}',
],
}, },
join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): { join(user_config['home'], '.zsh/oh-my-zsh/custom/plugins/zsh-autosuggestions'): {
'repo': 'https://github.com/zsh-users/zsh-autosuggestions.git', 'repo': 'https://github.com/zsh-users/zsh-autosuggestions.git',
'rev': 'master', 'rev': 'master',
'triggers': [
f'action:chown_zsh_{name}',
],
}, },
} }
files = { files = {
join(user_config['home'], '.zshrc'): { join(user_config['home'], '.zshrc'): {
'owner': name, 'owner': name,
'group': name,
'source': 'zshrc', 'source': 'zshrc',
}, },
join(user_config['home'], '.zsh/oh-my-zsh/themes/bw.zsh-theme'): { join(user_config['home'], '.zsh/oh-my-zsh/themes/bw.zsh-theme'): {
'owner': name, 'owner': name,
'group': name,
'needs': [ 'needs': [
f"git_deploy:{join(user_config['home'], '.zsh/oh-my-zsh')}", f"git_deploy:{join(user_config['home'], '.zsh/oh-my-zsh')}",
] ]
}, },
} }
actions = {
f'chown_zsh_{name}': {
'command': f"chown -R {name}:{name} {user_config['home']}",
'triggered': True,
},
}

View file

@ -30,15 +30,9 @@
], ],
}, },
'users': { 'users': {
'ckn': { 'root': {
'shell': '/usr/bin/zsh', 'shell': '/usr/bin/zsh',
'authorized_keys': {
'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEU1l2ijW3ZqzFGZcdWg2ESgTGehdNfBTfafxsjWvWdS mwiegand@macbook',
},
}, },
}, },
'sudoers': {
'ckn': {'ALL'},
},
}, },
} }