diff --git a/.sops.yaml b/.sops.yaml index 9225529..4ef0406 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,6 +1,7 @@ keys: &all - &op_noe age1lq5q5g5qjsdcc3key0n6qytkc9z3qx3d3e96ap9zre2aqgvc9ujq82l9hd - &op_noe_2 age1p0f62dwatt558sf5s4equdqwtg5m7lsnaytrf3xjnvmx3e0lqu4svtugyp + - &op_noe_3 age13c5wv623jxjja5mjz7fajg9qqwvypzgsfqrs4tmk7rpgyzu7aufs4ul9f9 - &m_thonkpad age1f5cqspxexkl8f42v5ne47mx6xmm4v00lafdlslq9g79a508e4p9qrku72s - &m_blueberry age1ts3t7q08cthuwj39juajve2jjk0rw28ljzesnrmnkwd0n7zs49kq7dgxnm - &m_work-mac age14vsmekuppm4xhp4rthhv9jjgzfv45v39a0q8dsgg6yusw0pjkvaqnr9kq8 @@ -16,28 +17,33 @@ creation_rules: - age: - *op_noe - *op_noe_2 + - *op_noe_3 - *m_thonkpad - path_regex: secrets/blueberry/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - *op_noe - *op_noe_2 + - *op_noe_3 - *m_blueberry - path_regex: secrets/work-mac/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - *op_noe - *op_noe_2 + - *op_noe_3 - *m_work-mac - path_regex: secrets/cider/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - *op_noe - *op_noe_2 + - *op_noe_3 - *m_cider - path_regex: secrets/aerial/[^/]+\.(yaml|json|env|ini)$ key_groups: - age: - *op_noe - *op_noe_2 + - *op_noe_3 - *m_aerial diff --git a/home-manager/features/fish.nix b/home-manager/features/fish.nix index 2c8fa22..e053c8f 100644 --- a/home-manager/features/fish.nix +++ b/home-manager/features/fish.nix @@ -11,6 +11,8 @@ ${pkgs.w3m}/bin/w3m "https://lite.duckduckgo.com/lite?kd=-1" end ''; + + hm = ''${pkgs.w3m}/bin/w3m https://nix-community.github.io/home-manager/options.xhtml''; }; shellAliases = { diff --git a/home-manager/features/spotify.nix b/home-manager/features/spotify.nix new file mode 100644 index 0000000..6f38bb5 --- /dev/null +++ b/home-manager/features/spotify.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.programs = [ + pkgs.spotify + ]; +} diff --git a/home-manager/noe/common/home-user.nix b/home-manager/noe/common/home-user.nix index 1c8eba4..f6f8652 100644 --- a/home-manager/noe/common/home-user.nix +++ b/home-manager/noe/common/home-user.nix @@ -4,6 +4,10 @@ let homeDirectory = if isDarwin then "/Users/noe" else "/home/noe"; in { + imports = [ + ../../features/spotify.nix + ]; + home = { inherit homeDirectory; username = "noe"; diff --git a/secrets/default.yaml b/secrets/default.yaml index 4ae10fa..b3311bd 100644 --- a/secrets/default.yaml +++ b/secrets/default.yaml @@ -11,65 +11,74 @@ sops: - recipient: age1lq5q5g5qjsdcc3key0n6qytkc9z3qx3d3e96ap9zre2aqgvc9ujq82l9hd enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0OVlrV3lBV2hVdlh4d1Jh - OEJ1emNkcHduRXdQWjQ2aTFXN1FvekVtVnc4CjJzK1hLWUNPOEQyNWkxa0kremJh - VER5Slk2elc4d01tN0NNMkR6NmNGK00KLS0tIERzWkpqcWlmTUlPOTBWbVcva0M1 - aG9IY2Q4dExuTWFOakY2ZWV0a1d3cFkK8H6XQkjBNiFl1Fvdfdo/5YmdzVaWZanx - gEewBpIaXVxe3tmX3JnAXEIZcc8yNnmIbBOmxGd8dMuMfeOGCQSkqQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1WkZzMWpmeHBjRTBIcGRF + Z2VSQW12SjVDcFhjeG5PQW5VTXJJUHE5NW5NCnFCYXVsVmdTWUdWcUJURCtmUjBS + bDN6NGtyQkhRL3dpWnhYVTdzaXpVSDQKLS0tIG4yZXJMMWVtSWZFL3VBV2d2TFQy + UnJhb1paL2MySUxQTG83UVJ1RTAzTlkKALbFvqA5L9AZx97LUa5ijYIXKZFUII3Y + v/6Zuu9Pqjujn9a2S4DaVKPCiLw89wmu5RuudwcN8daP8aEX+IHfOg== -----END AGE ENCRYPTED FILE----- - recipient: age1p0f62dwatt558sf5s4equdqwtg5m7lsnaytrf3xjnvmx3e0lqu4svtugyp enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0WVowY3UvL2NvZDZwRFV6 - U1g2WWVMak1zVXlrbUJyYXRwN0lQZUY2RG1FCkw0QVpKU0JPNE5qaGVIeHZXN0J1 - emFrMnJ3eEkzaHVqZnFmQklOb29UM0kKLS0tIEFFRU8rOERucUwxbFg1ckpRZjNV - bGR6MDVNdVptVTNONVpsTVE5UUtEaU0K5xgcPhZeB9cWRtUFf/WIxGBCcNMPZG48 - NOX7rhYVZj/cqeODqGMjv/8W+PSi7cLy1iz82+VjKwhT157b1txjTQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUajNmWEt2ZlBTU0hnUFVB + VjNFQ3U4cmlPQm9HbDU4WEZmUHdVOXVsblRZCkNsVm9uMzZGWEhLOXJ0NGFKVHgv + aVNYcWx2R0JZR0t4QS9obTBFODM2UWMKLS0tIGx4UGlSUmp5T1lHK09PcUdkRDdO + ZVl6aGR1VjUwVld1aExQNG1WQzV4QnMKmK5MlG1PCX2plvZ1OpGjarUplnS3NdR1 + J4dNkaiyRaR6uH2c2khPHi+lCQXTEamg9DGr4VbTwYDSl8SOQNrxXQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age13c5wv623jxjja5mjz7fajg9qqwvypzgsfqrs4tmk7rpgyzu7aufs4ul9f9 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnbFdobUROV2tBWUYydjNi + am11M1I1SVNGbzRETHJ4S1FNb3FJRm9hZFg4CnlGRysycGZrYTZXemFzVXdMS2kr + VE83ZEIxVGJINkYxanlldk5SK3paTjQKLS0tIEhtbEVTbW8xdW1ZL05Qei81Uzdn + SEZLZUFWTEFDNTlEb0tLWm5KeUY0WHMKOL/N7oqLqw/aCL8FS7ooPXfegxf8b3NG + Buv+Tan5aypcHqQgdUKDpp70Rg4/jjKmhbuxrNat3EJJ0VA5PripsA== -----END AGE ENCRYPTED FILE----- - recipient: age1f5cqspxexkl8f42v5ne47mx6xmm4v00lafdlslq9g79a508e4p9qrku72s enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5OEpRM2t5c0E5L0VYVURH - OXg5L3ZhTWlBMGZzS0tQcU56ZXZ0a1Ntc2prClZZUnV2NklYOEFmemZjQXZzN1B0 - Y2xtME9vZm9yWnR6b0MzcUFsRzFjUEUKLS0tIGI2MGo2UE82Ymp0dXpzdkNtMXdm - OWl2MUVYZ3JValN0TncvNjN3Z09HQjAKOkoaerZuKKweIARkRBiNCNMGBeQVNxA9 - AAcU1OCkNQEHbF/O9Kh4GCvzVrXGTCJ9VU7ubDA5phTbKeAw75e0Lg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0U2xWWmpsUVc5dk54K251 + QUNIVXRwUUVsUVdGdXpzby9va2owN01DMzFvCnlsaGJoWFdWSGdQUnVHbjk2dEtO + NFJWM2M5Tm9aZjNMb2RPdUNQYXJRNWsKLS0tIEJKRzdURHpOOGtudHlhOUtnT2hz + VnpNUjlaVE5tM0hDV2xTdUlKd2RrTjgKEm3WktYDs+VEd6HFCBzddv3i7Z30AUk8 + tZ3mAjzJPEnUQ6LQjEiBifNV+R9nQCYQc4BMkMWvb+azSw84ZG0fNw== -----END AGE ENCRYPTED FILE----- - recipient: age1ts3t7q08cthuwj39juajve2jjk0rw28ljzesnrmnkwd0n7zs49kq7dgxnm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaTlVDTFo2cXFsRXEzSjJY - Z1B1L1FKZWNWS1g1eU81N1lwdUc1NXpnenhJClA2TWJvdUN5WlQxUE4ySVZMNlRh - djRsakt4WW5JV1IxaFZkL2g2S1NETTQKLS0tIG5RelNFSXNDOE1UTXR2UkR5bFI1 - NGZLS0Y5YWdUZHc5ZjBUWHlGWnF6T2cKyXYGkkQyxdhNzlnLOEFE9lbWj+mD3ECr - wk9tDNobeX67UWWLkHQmLqT2SfO4etH5B8NbbKI8ufzTBR1ov7AOdg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqV2hFU2o1czJVc0xZZ3ZV + OWdhSVNmUkIybTB4c0NkRUl4Sk9ObG01VWpnCmc4RHJRVFJuOEhreE5YQkNTNW9m + SjRPcjNtUXRrNW1iSlBMeGlMOFhXaU0KLS0tIGc2SnBKaHpINFdqNVFuOXF4WFU2 + T2FlYjc2aXdycGxFK2pCdCtsU2J4VTQKy8SItZEI9bC26QR/jaNnKtFpEQ+jLjq9 + Bjfwrx8qOjC/l507sRI0IWtWB++QgvlIjTX+m7repVDlvBlQT6cUcA== -----END AGE ENCRYPTED FILE----- - recipient: age14vsmekuppm4xhp4rthhv9jjgzfv45v39a0q8dsgg6yusw0pjkvaqnr9kq8 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuYTRHRVRRZlZ6OEVFOE9Z - ZUsycGJiT01zWjFIUWtvVFdJYnRMRGpiK0I0CisrbFRLNDJOODNicmRRaEFic3Zl - ZDRPSTBCZ013QmhQeW5pSTgwdVR5NEEKLS0tIC92ZDZFOFJYUnE2ZWJiSm1DSDJK - dUR3SEx6VVhxNVNMVmh3UDJFZVRNU28KXKxlTY0UYFLUoRNrRlNKIDmD9ufZKYaS - wcX4CvtpFS9akiIaYwigwefZ+ucZiOl+jlPA+pJmrTelKarLXo1KeA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqWGN0MHU0VGR0Z014SnFF + WFExTG1TeGZUdkRBYk5QUUpGSVB4a2lVb3dFCm9JczRQYUdScEM3ZjdVY0wxYzVh + eEFpT1VZTnVua2E3OW5Ja1BGcjA1N0EKLS0tIHkrODR5VnZkeVlUZGViY1liZTJj + OGM3dDVURFB4MFVsU1AzL3o0Z01hQ0EK6AhhW+nE+VNmK05qx5TDjtwZpubOdjAT + ldqSfyCJ7aIl+v+1mzFlFnVflRok2/9ArH8oS630D7yIVuGg8fTWQg== -----END AGE ENCRYPTED FILE----- - recipient: age1kjsga2kf95lu7p5stqr5d9p87jquyypnx97cycj6jvhsm9zkn93quexx4r enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUS29MR0V3SXZVK3cvUVVy - OWROUjhTVEt2S0FoazZjNDhrcUFDdXdSYnpRCll6NTdqK2s0YU9OWGRraUpGakdQ - U09PY0tjRER3eEY5LytNYXBXSXhYWEEKLS0tIFlzNmhFVXZwNHIxSHg0K1lvUDd5 - VFJ0VlVHTnoyYWtod25aQzYwa1BIS00KeKbEX1hVhpkgWR0Plxv5ePUdV1s2jTzj - /QNudGnkydvf8oGkFc6jVKcr+sYf5LC6wnJ31kneOakMXQj8TI7vwQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSKzV4S2VFcGx1OGtwVm1S + S25aL2dsTzlDRGZlWmtJVzBPL2pCaDZvRW1ZClY2TzAyeC9kNm1JRktHcUxzY21v + ZVZsZHVzc09xeVNkc0xUaUVuc0NFWEkKLS0tIG9ITFpobmFqMkRjMzZYNW4xWUZt + WURkUlZrYUtXblBaVVkrcmhpMEFKSmsKtZEP8+w80F2jqCBYjUJZOgkIsgnUPTV5 + HnYTLGIrct1NM6a+LoBeW2iwcf1CGSEx0+xARBaFjp1duZVHvAn3Kg== -----END AGE ENCRYPTED FILE----- - recipient: age1jc6ghxfgxe3gx53xa55azxan447cfxaqfqeh5y5yzqapj7mw7ajql8kv02 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBidG8vUEpmSklDZjFEZ2ZU - Q2dSS3g0eThTa3JFK0N0Y1RCSjhzcElDbVF3ClRqejFMODliUFI1ZXpBb3ladkty - c2xLV0RLYkpTOXRDYnJHMmFmL0hJQWsKLS0tIEZrbUNSR3VUL0RCNWMyNWNGZXdv - akMzSkpZaTM5eGpPOGgrLzJ0ZXFMS0UKajf2WOL+SxIzxiJo6oUOsbZKhwwdRHK/ - NaLlXj9Yh7FyLk73Ga48aIXCfiUYUZMBZ/BhMcf+mauxvib1m7Xz7g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVWXNPaVV0Y3NzTlJmWmlU + dFRiU2NZNVgrckxrdVFHM21lblV2YzRBQVhRCmR0QVQ5MHN4bTJOWFhiNzc3SXZj + cGNoK1BlMG5BWmdNV0RlZnN6OEVNVW8KLS0tIEF5Tk9MV1Q2dlh1VTlhQzFZMUdS + V2MrVDAvUUhOcUtXNGFFcGhoMnVJa28Knt90Cs/tEaxeMjX7McVjEeP+e2Jb0wVs + 4etiUZ3Msf5trKLQyDUgRlIVFpn7b17XVt/gLTMBH7RtVfuZCWA2yQ== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-12-15T05:47:08Z" mac: ENC[AES256_GCM,data:hNsO2DNV9tIsr/22SajbpXSWt2PHmXVKL0UyMDhdE5hvLNbQNgze/FyW6bjQ1z7PnuCoiXrEHf2pvgsNZc3Fl+cRxvtpjSo1l2U45lp8wXhj6a5YeV9xSCy78yajmEk3XXhTyMuAXUn4eZ+UWUXk+Co1Fdmd15DOLZhH0vLiyRQ=,iv:y9mEhHZuJIP5VyX/R9wqUlNEI3q1tmzaIX7nVuR8WAE=,tag:II47gT99xY8emAKPKcpLNg==,type:str]