Skip to content

Commit

Permalink
bulk: ⌨️Bulk update.
Browse files Browse the repository at this point in the history
  • Loading branch information
TechDufus committed Oct 1, 2024
1 parent 8e1ef29 commit 9cbfd82
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 33 deletions.
35 changes: 35 additions & 0 deletions roles/1password/files/agent.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This is the 1Password SSH agent config file, which allows you to customize the
# behavior of the SSH agent running on this machine.
#
# You can use it to:
# * Enable keys from other vaults than the Private vault
# * Control the order in which keys are offered to SSH servers
#
# EXAMPLE
#
# By default, all keys in your Private vault(s) are enabled:
#
# [[ssh-keys]]
# vault = "Private"
#
# You can enable more keys by adding more `[[ssh-keys]]` entries.
# For example, to first enable item "My SSH Key" from "My Custom Vault":
#
# [[ssh-keys]]
# item = "My SSH Key"
# vault = "My Custom Vault"
#
# [[ssh-keys]]
# vault = "Private"
#
# You can test the result by running:
#
# SSH_AUTH_SOCK=~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock ssh-add -l
#
# More examples can be found here:
# https://developer.1password.com/docs/ssh/agent/config
[[ssh-keys]]
vault = "Personal"

[[ssh-keys]]
vault = "Raft"
2 changes: 1 addition & 1 deletion roles/1password/tasks/MacOSX.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
name: "{{ item }}"
state: present
loop:
- 1password@beta
- 1password
- 1password-cli@beta
25 changes: 25 additions & 0 deletions roles/1password/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,28 @@
- name: "{{ role_name }} | Run Tasks: {{ ansible_distribution }}"
ansible.builtin.include_tasks: "{{ ansible_distribution }}.yml"
when: distribution_config.stat.exists

- name: "{{ role_name }} | Ensure config dir exists"
ansible.builtin.file:
path: "{{ ansible_user_dir }}/.config"
state: directory
mode: "0755"


- name: "{{ role_name }} | Ensure 1Password config dir exists"
ansible.builtin.file:
path: "{{ ansible_user_dir }}/.config/1Password"
state: directory
mode: "0755"

- name: "{{ role_name }} | Ensure ssh 1Password config dir exists"
ansible.builtin.file:
path: "{{ ansible_user_dir }}/.config/1Password/ssh"
state: directory
mode: "0755"

- name: "{{ role_name }} | Deploy ssh config"
ansible.builtin.copy:
src: agent.toml
dest: "{{ ansible_user_dir }}/.config/1Password/ssh/agent.toml"
mode: "0644"
28 changes: 10 additions & 18 deletions roles/hammerspoon/files/config/apps.lua
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@
return {
-- Brave = {
-- id = 'com.brave.Browser',
-- summon = 'b', -- [B]rowser
-- },
Agenda = {
id = 'com.apple.iCal',
summon = 'a', -- [A]genda
},
Browser = {
id = 'com.google.Chrome',
summon = 'b', -- [B]rowser
},
MatterMost = {
id = 'com.mattermost.desktop',
id = 'Mattermost.Desktop',
summon = 'c', -- [C]hat
},
Discord = {
id = 'com.hnc.Discord',
summon = 'd', -- [D]iscord
},
-- Messages = {
-- id = 'com.apple.MobileSMS',
-- summon = 'i', -- imessage
-- },
-- Ray = {
-- id = 'be.spatie.ray',
-- summon = 'r',
-- },
Outlook = {
id = 'com.microsoft.Outlook',
summon = 'e', -- [E]mail
Expand All @@ -33,7 +25,7 @@ return {
},
Spotify = {
id = 'com.spotify.client',
summon = 'm', -- [M]usic
summon = 's', -- [M]usic
},
Obsidian = {
id = 'md.obsidian',
Expand All @@ -43,11 +35,11 @@ return {
id = 'com.1password.1password',
summon = 'o', -- [O]nePassword
},
Slack = {
id = 'com.tinyspeck.slackmacgap',
summon = 's', -- [S]lack
Teams = {
id = 'com.microsoft.teams2',
summon = 'm', -- [M]eetings
},
Kitty = {
Terminal = {
id = 'net.kovidgoyal.kitty',
summon = 't', -- [T]erminal
},
Expand Down
10 changes: 6 additions & 4 deletions roles/hammerspoon/files/config/layouts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ return {
apps = {
MatterMost = { cell = 1, open = true },
Spotify = { cell = 2, open = true },
Outlook = { cell = 2, open = true },
Obsidian = { cell = 3, open = true },
Kitty = { cell = 4, open = true },
Browser = { cell = 5, open = true },
Terminal = { cell = 4, open = true },
Browser = { cell = 5, open = true },
OnePassword = { cell = 6, open = true },
Teams = { cell = 6 },
Agenda = { cell = 6 },
Discord = { cell = 7, open = true },
Outlook = { cell = 7, },
},
},
{
Expand All @@ -32,7 +34,7 @@ return {
positions.standard.right_hidden, -- 6
},
apps = {
Browser = { cell = 1, open = true },
Browser = { cell = 1, open = true },
Obsidian = { cell = 2, open = true },
Kitty = { cell = 3, open = true },
},
Expand Down
20 changes: 10 additions & 10 deletions roles/hammerspoon/files/config/positions.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
return {
full_grid = '160x40',
full = '0,0 160x40',
full_grid = '80x40',
full = '0,0 80x40',

-- EXACT PIXELS
-- 0,0 1356x689
Expand All @@ -15,14 +15,14 @@ return {
-- 59,0 60x40
-- 102,0 42x40
standard = {
top_left = '0,0 42x19',
bottom_left = '0,9 42x21',
full_left = '0,0 42x40',
left_center = '42,0 16x40',
center = '58,0 60x40',
right = '118,0 42x40',
right_hidden = '90,5 60x30', -- This is a full 1920x1080 on a 5120x1440 screen
left_hidden = '20,5 60x30', -- This is a full 1920x1080 on a 5120x1440 screen
top_left = '0,0 21x19',
bottom_left = '0,19 21x21',
full_left = '0,0 21x40',
left_center = '21,0 8x40',
center = '29,0 30x40',
right = '59,0 21x40',
right_hidden = '45,5 30x30', -- This is a full 1920x1080 on a 5120x1440 screen
left_hidden = '10,5 30x30', -- This is a full 1920x1080 on a 5120x1440 screen
},

thirds = {
Expand Down
12 changes: 12 additions & 0 deletions roles/kitty/tasks/MacOSX.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,15 @@
community.general.homebrew_cask:
name: kitty
state: present

- name: "Kitty | MacOSX | Deploy Kitty Config"
ansible.builtin.file:
path: "{{ ansible_user_dir }}/.config/kitty"
mode: "0755"
state: directory

- name: "Kitty | MacOSX | Deploy Kitty Config"
ansible.builtin.copy:
src: kitty.conf
dest: "{{ ansible_user_dir }}/.config/kitty/kitty.conf"
mode: "0644"
3 changes: 3 additions & 0 deletions roles/zsh/files/zsh/brew_completions.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env zsh

eval "$(/opt/homebrew/bin/brew shellenv)"
1 change: 1 addition & 0 deletions roles/zsh/files/zsh/paths_vars.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env zsh

addToPath /opt/homebrew/bin
addToPath /usr/local/go/bin
addToPath $GOPATH/bin
addToPath $HOME/go/bin
Expand Down

0 comments on commit 9cbfd82

Please sign in to comment.