6 files changed, 44 insertions, 91 deletions
diff --git a/nixos/.sops.yaml b/nixos/.sops.yaml
index 9f81f91..6b89a0c 100644
--- a/nixos/.sops.yaml
+++ b/nixos/.sops.yaml
@@ -1,9 +1,9 @@
 keys:
-  - &user_boopy EE731799CAE9F76B048BDF71F05C1C600B728A18
+  - &user_zach 346833414516C852FFB238E19F734565641C2F14
   - &host_alpha 39513104f6c28be21b21a437ee6e9d915470eba4
 creation_rules:
   - path_regex: alpha/secrets/[^/]+\.yaml$
     key_groups:
       - pgp:
         - *host_alpha
-        - *user_boopy
+        - *user_zach
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index fd5ea82..3b2ed23 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -196,10 +196,10 @@
   };
 
   sops.defaultSopsFile = ./secrets/secrets.yaml;
-  sops.secrets.spotify-password.owner = "boopy";
+  sops.secrets.spotify-password.owner = "zach";
 
   users.users = {
-    boopy = {
+    zach = {
       isNormalUser = true;
       shell = pkgs.zsh;
 
diff --git a/nixos/alpha/hardware-configuration.nix b/nixos/alpha/hardware-configuration.nix
index 10f0514..0d0593f 100644
--- a/nixos/alpha/hardware-configuration.nix
+++ b/nixos/alpha/hardware-configuration.nix
@@ -54,8 +54,8 @@
     fsType = "zfs";
   };
 
-  fileSystems."/home/boopy" = {
-    device = "rpool/home/boopy";
+  fileSystems."/home/zach" = {
+    device = "rpool/home/zach";
     fsType = "zfs";
   };
 
diff --git a/nixos/alpha/secrets/secrets.yaml b/nixos/alpha/secrets/secrets.yaml
index f8efd27..17e7a2d 100644
--- a/nixos/alpha/secrets/secrets.yaml
+++ b/nixos/alpha/secrets/secrets.yaml
@@ -1,52 +1,43 @@
-spotify-password: ENC[AES256_GCM,data:otDJGl4reG9AG/Z1CyoerZNZe2IP5WShVg==,iv:ZXIJKMPOemyRFTLTe7DOpqvaKYEGHJ5usdr+EtZyLtY=,tag:4t6L/+vQihMiLlcL0gxAbg==,type:str]
+spotify-password: ENC[AES256_GCM,data:tWOoEQk2oQT2s8pdRA4TAUtT8P5RSclZoQ==,iv:sgXUI3i72/QD2oIe0rtgO595PkfqL+EVAjtsuWjkFe8=,tag:MbiqIAiF3kEhZDXUCFg9aA==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-01-26T13:57:35Z"
-    mac: ENC[AES256_GCM,data:DdGEasSF+O0SvNFTnXBASFhmaqjHtwAmKb49fbDCRaIEqF4cdCH/rZ7ZUdx0TaerLXheLSMAiD9GOPS4ZdTeYISs5eMTUAD3Xrl4szPrrrn/JrRTaKEmxKP5U4FOwmsmC1oNtGfab8dfw8uHE2tusuX82CR9YDIkX4yqGe4mYTM=,iv:93OBF+zOddKEn2YAjEd/mJtsw839a29ONA6+xtqfPiU=,tag:o/7SLaynaH9xOnxiIuYabg==,type:str]
+    lastmodified: "2022-02-12T09:11:12Z"
+    mac: ENC[AES256_GCM,data:DcbZnvlX2fytF4EKoBSE2WPApcrPiGQvzOzILrRPoSf+kCVrL2W1+KgITma0lh9/Ja7An2SRnDmsmeGddZIPOih2VShMAexQu6jh0YvWsJ+0MF91rSG7ZeHRYiLdPv/Y/ovodibUlxolewtJTmB6pR+/hm+wLt2ns7gLP9LzqO4=,iv:hGgfEo3QxmBUFNRHG3So1uUT/2TI6v5W8aVnxBVyPZ0=,tag:aoyklCavONqvYJdPA+HO3g==,type:str]
     pgp:
-        - created_at: "2022-01-26T13:57:16Z"
+        - created_at: "2022-02-12T09:11:01Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA+5unZFUcOukAQ/8DaPz65z9S2a8SygsY0LAUooMJzBI42rLScw4EpZFiPNk
-            K803ZhXVpvN2sfVbj9TvfOxQyHvOttIA523iyzbQTrCV0Yhs4ow55mk+GJTp/Uuh
-            Uqsx1SMr5UEGuIbUEDPTYyQTHR/0mg1gSbAMbUdhWL3nOW2Wnw0eiIaUuraSHoXa
-            ovJZDXz51o0OW0AiQl5MuT0RKgCFw4Uz2/ASzvIMQL8rI3gHtAOsfS7D5aNPfouL
-            R7N7t1zOS6hbnfG4mzQaN9YkR7WEwNEkZDOd7JpQVMHWsHxfnTIzjWhmlMtyI3Ln
-            SRodzG5FcWPdDann2VDKcrV68LBT3JC0K5/DerpVBfPrZtmU1lsUOEAA7HeoK3wN
-            kDT11gQ0mE1gFuRW2I6UIvZvqLeTpa9x83Yr8+IPS2dCEVe2MN78xHjAEozT8A8R
-            TF9TDgYClP58sj25OF/UJOUzivQM8nPvP7/2+xHugrKs8jlLQcKynZ1VdwpRvFmb
-            A9uawS/h6GkdQ+EDc4zcXnwkODpiLeHFFQOVi8+Vp6KSwZXyy+3hbEQI5u8kOWis
-            hPkmr3EoKBd6feMRtH3Sjd/mn4dZ0EzWcvS4Q+nkdw9mFkjrDuJ7uYhrIXNojR8k
-            Y19ubWPf9LohGTB/YPFsYp9LWMonRIXlbV/2aY78z3MvcW9IB1rBJ6NXY2n7cLTS
-            WAGOL+I4xJUzhjDj8INB09b37TxUbnxPNzObFhqyVYiQAr2ZSmvu2oV/fXDq+Kw/
-            +dCV41LQurBwT1dpJIP9tywl/6TJvP/xVz/9c6sVSmWsAd7Ap72we+A=
-            =L5ht
+            hQIMA+5unZFUcOukAQ//V4BWqpo8VN8kd+8wb/7p+hcODgdfS84MgmVcS5kXtTgg
+            GlF1S2Y8sZNYeaoR+QmWj9+AnXOuS5Lzc8HZgeE8LlgfMSsE+7lQOMKVvRHkOchY
+            bvCx9LRmJr1L7jnxkaq/BU8vC+ztIz0Xl1UePMoqz4GpuyiX2ObMEaH8IW8DuQJv
+            vR22j5P/0Zw/UihwaCS+nkXZntFfDYmdvOTwXkyfuZE06kHbqxDEbuOkjsS/jegg
+            OUciGa0BC+B0CvqNA1p5SIOLlAi5QwGOHbv9IOXeF4laUMV57O3QnxXNZ1CPmBVJ
+            N/MDFc1ZVxL/jix4P5NPpDb786f++KjmTApHJXYvbm+JMMyl3QDopjLFJ7sMTXB3
+            1/eO3euxkkbLRkdySw834gSeazfS9KlBONXs250NBrmEttPMU1e2KuOhzwwFXPpS
+            FwT76e0w+UqhS1NL969+LzWaI8PsnBHgl2VYIGU5KoyUMZjwgtlriD9Kw1J6N4dL
+            N6G5jOvJq8S+sHb8IXKVXDvY/apehQ4btgnxiuNtndWf8qWRmDaFt+OGVKKwbplS
+            Q8/2K70J27SnwqyLQtRw7pmGwzIo5TQ2cT2o0Us1J4Pexc6/1ulrnMqRBseACddI
+            0BBG3MF1erxRg180SwjZpU8DeWS2FxI1i0hBu/pA9sua/4Ij26lVs8H2moWv3RLS
+            VgG167RUeqXMqdXlMY9YP6qxQylXO0V2g34nzT4tIXhxRZ27PWqOgpEhboO/Hu5z
+            fnTsX9fr1tJUYSSrvrZtBBhbfvY+Zfs6BUsabqprVzQ1MShtSP6b
+            =eyfG
             -----END PGP MESSAGE-----
           fp: 39513104f6c28be21b21a437ee6e9d915470eba4
-        - created_at: "2022-01-26T13:57:16Z"
+        - created_at: "2022-02-12T09:11:01Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMAzBHloZFtyD7ARAAlJHlwcuckuWQhNKOaWyLH2zsTCvaHdDnrmliSnmFLD8H
-            jiXfKw6jg1FRhlgP4UWNORjj1a6yJO7F8N8V5NCN5a+mwxn1b4LV9Bkvk7ouBLM/
-            VENlgAckq22shuZSM2m8neZyyfH/zm1+sRG4xms6BwLzY1Jkzkey7DWZg3aOnUcC
-            JxMx/4zY9s7cb2dA+yLekLDLbOvCNGyXAMjzvUOSi7L9ViUn+Bwe/Ef1KRShswhF
-            HPpwHV13+uU5ibHrVrFjWyTJ4/NFqQMs19b1Rk5s3ymxSFhU/xp06sARiRzyYojW
-            EMtLiiFsQxpUseRBOOSj1cMiLyAkvyMnn5Vvdd1h4xpLPMO7uo+SLFHOiOwt5p48
-            TDZpyuj4gmE7EhPCGlH9Ck1YCNlB3zy4TIG1LZ3mjWTCaVJ/mpFDuFtEc1/2brau
-            zJAVePxQA+h7FeYnLpVcmnAOecmLpGX/2Dc0AmNoLsUi6gcg0UgYZjnqyZS/UMPD
-            MXwZCQRFju5r4XJnEz7P9ruxTPzzeGHwTqTI1jdxw7LA0Jf2OdZnipBFHm7ReQTp
-            Q6n+rgDHm/TVgB6laS8UGMZzrHv7o8mY9aXWc4CwIQ0a7ol/TZxMLrAhkeUjVdPY
-            MdjR+FtMhx6Ji7s6BsVzcvr+br8+yJEDjIXq+o6TRLL1wdqbNNAUy+ETPgM5BlrS
-            XgFgg3oqsJEEIXk4OsH7CrGvNANpmrMrALG31+JHRL/F+IRHlhynjEsS8n7Fue0/
-            DWvs7bv3yyG6maLQzi33THccUT1W7oEwTVm2fnB5PSzbCgeL58Y8gKBm3S0PkrI=
-            =Gcih
+            hF4Dod9S80wXQ00SAQdApdVK41an40JF07p4gDcSvpYnjRmZQTXF1drUqP5A1XIw
+            5nxHskuJ+voJeSi/HLJRY/9xURyaOawt0Nd6VLrf8oA8qmzYCiYvl+lrHR2T8lzX
+            0lwBTZtzmsDw8fYALzLaRUchwEXOOj05DMpo9zxu5VHkSPftqX8mhLqUPv/FbjC3
+            DO/SoZmwuGj12qaOSJu2fq0hvqM9MXs2rjDsd+5C6/EWiKM+87siRqBXaBRPWQ==
+            =/ycG
             -----END PGP MESSAGE-----
-          fp: EE731799CAE9F76B048BDF71F05C1C600B728A18
+          fp: 346833414516C852FFB238E19F734565641C2F14
     unencrypted_suffix: _unencrypted
     version: 3.7.1
diff --git a/nixos/secrets/keys/users/boopy.asc b/nixos/secrets/keys/users/boopy.asc
deleted file mode 100644
index 5580dab..0000000
--- a/nixos/secrets/keys/users/boopy.asc
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGGBNKMBEAC/FfuwKRKjb5TNVD7FtSuj9LcP/fzWWAg/xi0Cu4cX2S8lUotr
-kJ8Mj5/Mk4LhQ9D1TQE+fcQIc91Ibk2AO0+ddCrZwZxBLzizj3Bvq8XLO8wS6LsF
-pRcd4a67fzKRg5w/5ldJuO7GbV1we1a9Nwl2DRIyQn9MmlPOEgjJ85U26m+jeoNz
-rt+IsR0nJadbcrzgfiTy2NQ5FuvcOLhDBe7PTOs+pkqrtcM+AJHGEuUQk6r0E3Tr
-yXFIzSzST9CYKVGLkR3VvRL3b7X+gBPKdJRi9x8JjQbc2LfDX2Jas35HNHIzsTAS
-54fDNvjDp5qJdbMXPZzUZKCxcMD7+GGblcUnZ9U7OO4ZEfE+I2Bx6wagpRbs0ZFX
-+poLuoMkgs5oLO/UhVkZI7tOYOVvy0i7zJTQ8fXEa/kT0bc0I8rp+gtReGnjOpTT
-mp6VVfH87nVWRcndUf8S3aNF0fRsxGz6kTL/rC89/MQzbC6/yRjGt1fpNkiLPf0K
-7SCmEeavScJf3P7EUvSj/itdzt29zmZyrtkWEpFWUKvjFrFSqiUEOFulkJlx4+Ew
-NkVk2KoT7EGDIRyyNng1qu6QdM7ikpv61JI59bMkdFpIKhvOD7/bAO7z2D8bdWU9
-UudCNuxXwLE+vqDKfUXu2NcyIJeEEG51Nrrm7/pHuZniSKzKzR+6m7bsFQARAQAB
-tBVaYWNrIEEgPGhpQGJvb3B5LmRldj6JAlQEEwEIAD4CGwMFCwkIBwIGFQoJCAsC
-BBYCAwECHgECF4AWIQTucxeZyun3awSL33HwXBxgC3KKGAUCYawAbgUJBc5mSwAK
-CRDwXBxgC3KKGIQSEACwAob0zFlfJCL4IZyFnx8Gj+RT5FypnNPq+lBtZ8jDWWqy
-pM9BR8ugXvpTfNmwSI6h82cAAHALQ71Z+hFV8XeO111gxW22dGMWPS6NsIA7M0go
-TMLfU19ZZb9zUG6kDXB9g4JijEBYgbLVUddXy61r2NUKMCEA/8GDLjeQLpbRf4fa
-2UAHt5UfOzoWh30SdYvMmeku/Lg0YuSnVbduFstlGbHSUHGjjDj8+o10sGfaRi4c
-6Etsk23qYATczd3WFj6vksrp0+vlsnI/Dq7F2FgZKNqmHEGo+lpMyuOHTWNoxkvf
-NvD7hZSz/GR7RpomyJdHD/ENnu7cWHD7MNx4JCiE2uXeqvDRx4cIgPA/AjbHV7m2
-cgilMzVRydksHuQM+DFEZtYrkw8pHAR4j0+DXD5tXWx5ziv1eK0jrlNIKf9ZRmCB
-au1Z54mMQ7XczOeC2v1XTVfRA5Qn1QkqSRhK6/WDI/MGnZV+rZfr5TgxpJSeuJTW
-6BamHfWogaoO3uIME380JroMCk4aQ4lbW/9HtUFz01Ti5UE/GrcrWhd/SS3dr7q7
-ygCIAcMTqI/QRbPG/2but96/P7FJYpyguDFAxZbpTaQ52n0vFWQ624AJshvoenis
-wi53DXHGxym7dGpRBPYgAdsh0YqQ9C/u/AzhuJ0DroKZjAbsx0zH2x8ljd0Pv7kC
-DQRhgTSjARAAyjp257sZZqW6/hFqkrVCygwSYY2RRQC2CIkO1mhWPwV2OJ/2tG48
-7HNeCkcTGGQMxzgBz+M055pZMyxGoBVdu6MI4p6UvGroBW5W/N+sVKqDOg30v5Tc
-4UqpcrOZUp6gQ3uebOrS9w6LXiPA6n36SuouWMViinm4/GNNYOEPOZL9fO18qyfW
-rc5tQiyoOmyvB8wu+ftumoLBMsMDsuu3StptETGv2EeY7jBp/fn2Mt/Luot5/8nX
-rrxtywcscbItIlV7wlhf/o1gS6EfmVjs1DkVAAJBlgRlsIFis7mo17f4br4pTsY7
-ZoaNKyDiOo6ot/O6ntYLDFiM02MAqvDKt/TvOHyuXI3FzcGlRVfVNBQ0ISg5sr5C
-55UkanmeHIt4zR20Hpr0mI6GyFSkm7VYIK1lQxLhCCTxsmtm83MZc3IhpsRQcsqY
-oihFIAFOUQ9kbBqo8FDqmQy4zXSP33lkUpJmcLpwvRPHrJlEJjXk3sFHdXobw65s
-xOgy9p8QB3tQgwd3kB3tD2jCoJ9+RACcMT3RRfyQsylZalyuiLCPxCmF/aU1fNyI
-1Bk3t4iUAa9dvxsif8qfx/4Bh3Gj7RUc+MaTexSBudBxVcO1qxDuQOaW/c2R5CRm
-vcd9J23WoKYN1j4dzM5aMxNFCyTtu4VeYaU3bi3VbAc53q60f7s6dusAEQEAAYkC
-PAQYAQgAJgIbDBYhBO5zF5nK6fdrBIvfcfBcHGALcooYBQJhrAC/BQkFzmacAAoJ
-EPBcHGALcooYAT4P/jayUQMDUGG8zMqIjyMS3GXY8Pg024AGhjvCkAgV6HjW8Q/v
-aOPZOWaQvWYTKHEsi/+qhq1ybKjhKqXeI/dS75YCpNzBSPpI9J8TMJybEc6G36Ja
-F2QRd+/a+vjvoFpfbzMhr1ECbLsHu48B3QgTvP8H1xy5P8SO02OxRd+/W44bRvs9
-+89mSNbXWQD4qbDeq9bPSleCKBF9haA+xA96vtfMwRnx2+olCWr5I0keCLGG5MV1
-zwmefTHxHiuMyzJjkrBFNAcuPYINEkLrjips5aq8wrgBJDeDQW81FmhPGgtKbfoN
-DT4aT4UxVLyy4WaoBe7uZquoEC+EHxxgba7aqxOiBmmqti4aG8F180QTrSIT1Dol
-d2GK+CUxiyUpdK1bg5Iyv8Gwlvey+yVXXLKDVUsde3+M6mRRVLJbWlur/ej69oAA
-m7A28LZZxvYGzuWCcZvP5ATAzl9umbASO6BuEzzLsrO081Bb0etZWT9hx4wreLyE
-90uGYZctokEJWA5Vk0YKLGmyiRymoGehxepYEJ2eiEsQgy2KS1SR9MB7iHJSFpu3
-iEFF9ODikeb0rmroUWL/lqY38AEuEt/tRlgS6w0DnZBnkL29RhXFiDaR5kM0eaf5
-sYx2723BpXQSGG6MptN8rYr70EpIIp9FCC17sQkn3Fx2PCRS8IDxGhe0+xQI
-=pcnT
------END PGP PUBLIC KEY BLOCK-----
diff --git a/nixos/secrets/keys/users/zach.asc b/nixos/secrets/keys/users/zach.asc
new file mode 100644
index 0000000..8da119e
--- /dev/null
+++ b/nixos/secrets/keys/users/zach.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEYgdGKBYJKwYBBAHaRw8BAQdAGwLyUjM7Ebj6LOz4ioWcWKnLExIjmY3HUJ2J
+BYy245G0F3phY2hlbCA8emFjaEB6YWNoZWwuaW8+iJQEExYKADwWIQQ0aDNBRRbI
+Uv+yOOGfc0VlZBwvFAUCYgdGKAIbAwUJA8JnAAQLCQgHBBUKCQgFFgIDAQACHgUC
+F4AACgkQn3NFZWQcLxS2JwEAr9NyzI53Cn3/U4o6CJ5+xHQvQfHurB4jJa6TguYK
+aVoA/11EWBO2+GxoSFYASG6S7zM9DVmIJg++Xx8dB/dG9ocKuDgEYgdGKBIKKwYB
+BAGXVQEFAQEHQJm4I7HwpZC4NDYuBMSzU8MCq3tQkY3YrA5hMOVthhYrAwEIB4h+
+BBgWCgAmFiEENGgzQUUWyFL/sjjhn3NFZWQcLxQFAmIHRigCGwwFCQPCZwAACgkQ
+n3NFZWQcLxTSAgEAyj++2tuw+6uoGJX8dzAr8LeWSkiC5pf24kOaQsAem/UBAKZg
+qLOUbpUhLcE1JvotRlUDeNFAq+hNbfyTYAcrZawO
+=p+WA
+-----END PGP PUBLIC KEY BLOCK-----