diff --git a/.sops.nix b/.sops.nix
index cac2fee..b463d71 100644
--- a/.sops.nix
+++ b/.sops.nix
@@ -8,9 +8,10 @@
     };
     hosts = {
       # nix run github:Mic92/ssh-to-pgp -- -i /etc/ssh/ssh_host_rsa_key
-      shorthair = "B5237D6B63AB2E13FDA07170E5AED9775DD21543";
-      greylag = "047bf8897df877fe86133e98522c6d280d545c00";
+      shorthair =   "B5237D6B63AB2E13FDA07170E5AED9775DD21543";
+      greylag =     "047bf8897df877fe86133e98522c6d280d545c00";
       saurosuchus = "12f47c96d9066c52897cdf9ddf581f86799fb07c";
+      ocicat =      "58BF6324CE6D45E156490D0F4579865C9D4CE67E";
     };
   };
 in
@@ -26,6 +27,7 @@
         keys.hosts.shorthair
         keys.hosts.greylag
         keys.hosts.saurosuchus
+        keys.hosts.ocicat
       ];
     }
     {
@@ -33,6 +35,7 @@
       pgp = nixpkgs.lib.concatStringsSep "," [
         keys.users.coded
         keys.hosts.shorthair
+        keys.hosts.ocicat
       ];
     }
     {
diff --git a/homes/x86_64-linux/coded@ocicat/default.nix b/homes/x86_64-linux/coded@ocicat/default.nix
new file mode 100644
index 0000000..eb3c115
--- /dev/null
+++ b/homes/x86_64-linux/coded@ocicat/default.nix
@@ -0,0 +1,48 @@
+{
+  # Snowfall Lib provides a customized `lib` instance with access to your flake's library
+  # as well as the libraries available from your flake's inputs.
+  lib,
+  # An instance of `pkgs` with your overlays and packages applied is also available.
+  pkgs,
+  # You also have access to your flake's inputs.
+  inputs,
+
+  # Additional metadata is provided by Snowfall Lib.
+  home, # The home architecture for this host (eg. `x86_64-linux`).
+  target, # The Snowfall Lib target for this home (eg. `x86_64-home`).
+  format, # A normalized name for the home target (eg. `home`).
+  virtual, # A boolean to determine whether this home is a virtual target using nixos-generators.
+  host, # The host name for this home.
+
+  # All other arguments come from the home home.
+  config,
+  ...
+}:
+{
+  chimera.users.coded.enable = true;
+
+  chimera.waybar.modules = {
+    laptop.enable = true;
+    temperature.hwmonPath = "/sys/class/hwmon/hwmon4/temp1_input";
+  };
+
+  chimera.niri = {
+    enable = true;
+
+    monitors = {
+      "eDP-1" = {
+        mode = {
+          width = 2560;
+          height = 1600;
+          refresh = 165.;
+        };
+        position = {
+          x = 0;
+          y = 0;
+        };
+      };
+    };
+  };
+
+  chimera.theme.wallpaper = ./wallpaper.png;
+}
diff --git a/homes/x86_64-linux/coded@ocicat/wallpaper.png b/homes/x86_64-linux/coded@ocicat/wallpaper.png
new file mode 100644
index 0000000..e758376
--- /dev/null
+++ b/homes/x86_64-linux/coded@ocicat/wallpaper.png
Binary files differ
diff --git a/modules/nixos/wifi/wifi-passwords.sops.chimera.env.bin b/modules/nixos/wifi/wifi-passwords.sops.chimera.env.bin
index 800269a..5d08490 100644
--- a/modules/nixos/wifi/wifi-passwords.sops.chimera.env.bin
+++ b/modules/nixos/wifi/wifi-passwords.sops.chimera.env.bin
@@ -10,34 +10,39 @@
 		"mac": "ENC[AES256_GCM,data:iinHFpC5NDZQzDZQwSJnxiaL9v91q+Yq3zt+D1e++OgLbVg4NVAEfqEhx75ugBDk6NAc6AEXkH4N7JTfhu/ueh+NwHr483p9zbBWUHpccAaFjst3RXFiGi2wBVYEU5TuJRqck0EIzDPkR38356dMYNXoWhsB5r8kZ7d05hVN0es=,iv:MxlPbWBV2YqlxiEkyM/0NtILHOY+MHUAB9EwIm0pio8=,tag:KopQkfIR8BAhHQFUnJTR8A==,type:str]",
 		"pgp": [
 			{
-				"created_at": "2024-04-16T17:09:43Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4D6MHlIv4I/7ASAQdAwZJ22hVeyBJ0oyDxFhe49BgxE+QM5pa/hPwDpSK231Yw\nruc3HejETVulkC1ZWY1kJ4Fet82jFUupK9/Kv+Rce7DIUtqbC0su+57d93CMdvnP\n0l4Bj0LYhCir5SFG9tbE95hV5akVbF6euZnFoHl4bKwHk+t+55b2+Aw1xewc2x00\n3GWPDG6AsLZPFRxkY2O1P02me4T/zQXJkx6D06eLFhL2D8LpQ1LA66Kq+vNt6R+6\n=/ynV\n-----END PGP MESSAGE-----",
+				"created_at": "2024-06-28T21:45:32Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4D6MHlIv4I/7ASAQdAQJMZo/3Zv/7kmDnJgHUa+kK7C7SFTRVZMtyzTKoYxB4w\njdfvgRoYyntHEsVz5VDYTkx3EZlgP3Mp4kimwWIJhdzi+anFCp9DCEsJi/d1Kdnk\n0l4B4qlMI3C2B9kcJOznGHbpKoiWh8HJV2rLkTBV0+pV4lyAHs6CMniBC0c8U4Gs\nfC0BG/LZ0pB/2z31laHzogbiypg1fBhnJdf50OmQIAolRb+Y9BDXj1w/URTf1QpP\n=h2uv\n-----END PGP MESSAGE-----",
 				"fp": "BC82DF237610AE9113EB075900E944BFBE99ADB5"
 			},
 			{
-				"created_at": "2024-04-16T17:09:43Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DxpBiwsu2o5wSAQdAWnTge3KgH9G1XRcEv36k0S6vyiD8l88B+a/UDsEuwxUw\nFYOkQ+nPqR6N1bDC/KqMNmlitbaFEiRIeMVsNvIqhcwMIeqJFND0NCXHv74+xipR\n0l4BxXCJfmslUUD3zDeZ4ON8A/VaIWWT0y8iROEBzAyEKMwkzIyWwFHqVFWEnae3\nfpMGCS5rl/E4UId+kW/M09zqhl1eQJUK4AYll3gfrSiNrIQYLgYgTJd5FamTYYE7\n=nIef\n-----END PGP MESSAGE-----",
+				"created_at": "2024-06-28T21:45:32Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DxpBiwsu2o5wSAQdA27+/DXToF0DZWMWC14DYglqiEvhUOOGSdt85T67QF0Qw\nzgpwrU4n6UjIHh1122f+g0OkRtk3/dJ9sJWzLrPxIqmfSB5Tq+kamfx7IeGilpiB\n0l4BL2x4AUcCJJs06LUsl9nf1kxnuiakqz+NMlbxZSAf4OJZ3FAstt7rhxVu6Ypg\nzFV6o2lxjtctiWnp9HBoDXhHvR3Wa/rNDn5DGCQBSYiwII2zzaxyVhnDKfU32Tyr\n=/3jl\n-----END PGP MESSAGE-----",
 				"fp": "76E0B09A741C4089522111E5F27E3E5922772E7A"
 			},
 			{
-				"created_at": "2024-04-16T17:09:43Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA9bzf+GUl7kkARAAmceR1L/4jpKGGFArB6CoD2a37/OHXUHOWibo9W86OWMG\nRuoJV7XJWt2SEOgZLj5rfLr5E12F7XzpFOgmHDA1sZbVkdMgrA3aM5xmLCdlXrsH\nDLLYb5NV+IKnVsuXtkl+pRFPo5Zqix8uqaFH5BnczuJLa3FGN99WdNQaJNa6+DWu\nTSAE63P24JFi6Gg6AB+zm1gRFRM6ZPGsvpp/nUcubKk3wLfDuktBquWtCYsQoLgT\n3YFa1SiBLoyGCsJ7fTulkoLpwZjzjp/BHx+L58TmG3vZ2/mqUcDXYXEp5jG6LMPt\nnCfLQdBe/PziUeiz6sxiao8tbWkZ5b6n25Qd5uPPreuPAmyWiZXRIEHguu5bAGul\nmROorT0UH8uDLhVC6mhtgObL7omT8FCZzSHOW5CZomyOyjq9C0yUHxY4vYZFUmSn\ncX9X6DmPWmS/Pa72Wqrj0AIHEoHdM/FROk+58juq+kJI9gk7vyCYMBsIKFn7rfh6\ncCxeU4yyYrhioQaFdyvguh8OeUbQaSjTWrw93Z8u5RQNJTKFa1kS0kNDBThIIZfU\npcrtMipOz5n/fIUP5ZTC2brYWZqtx442dYsJMjFjcQnr8SiXRjMclg/PKL+rQerO\ntWATF0aSTdM5ertjE5Uth3GDdHLYJRCBi83qhfQTWJVP74nTGz11pzVVNvJ1i8nS\nXgHeZO4+EPf44V5bHyMtYVmZVZDbWI4QIzsheOvH4eLQ/ZZo+1gqzxfmcKTh39wf\njzJSK8j74kq5is78HVl3iIyrL2J2wzDZsxqG1o6iBf2gvwlCXo68IWD4hC0Hi2A=\n=g0YG\n-----END PGP MESSAGE-----",
+				"created_at": "2024-06-28T21:45:32Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA9bzf+GUl7kkAQ//ZXKPpKs7dhlnqCwxyPF+qsS1G8iE4YatGEFDEJpzx1n8\nF7Oxq7hF4KL/Tq7isda/ycsJFJRYXd7A4a5h4dno3vjakPXMFMxbZcXwXyOzRDdm\ngauW4fneFL2Pyc24iW+uc+INx6smzoHvTOReNO51OmaxALBNyndH7EJ+Oakt0CMC\nANhjeO5vIJ146sJaI68MHihPoORlbX3XSoVghFWrTN3Mny3L52mNIFjuNQGkfS70\nrxLvljmNJXZsI0k5nJPRkMtZE/ZwN4FGYYJiS8FQTVg8mN3R0fWNcR6Nk3a57hqw\nUUK6Yf1f+sfuWmteBgbU0wnOuL0AThb9DgIQnv5l/kvFI/K4u7D7dCoZIdQqlobP\nOmhecNOCqt/QelHiN4+jy5cg/rr00aVF5/0O4u187vQyZQUjm34NJHhlImcPPFit\n7/WoL5v0zy6VDu8n+EDrYIc0sjgBMUbVbKZHnHEuPKwiAG6zgKg7YJ3eUO1XB0Kp\nCCw+b1+Xh845lHtn+LXmCaR/P9NsG0shXyjuDYv7e68CjVA00DH+IwAq2flAtDrI\nepi3ADk5xDg/j13VA6nXfgXhXNDmQoVt+EKvkBRWc09vN8cTYQYpxPfXqrVIVZ2T\nu3lEyqetl0VJbtTVqoboWgnoLEYkqjpNwaZi3wwpKmVw+pfEEmZr1waeHiL2wkvS\nXgEup+BsnKx3SFdtGf2pWfaorlD0eNdA7SirNLkSg33f0XNnt/ddeUUUg8sr9LD7\ncikoU3u4dgUosCkEHigPqf5Ms9a9VDnC/N+0ryM7ezEcCAeQ2cb15a2hXNQAhJ0=\n=qZdF\n-----END PGP MESSAGE-----",
 				"fp": "8F50789F12AC6E6206EA870CE5E1C2D43B0E4AB3"
 			},
 			{
-				"created_at": "2024-04-16T17:09:43Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA+Wu2Xdd0hVDARAAiFI3B8hPwkFhrNc9rrtam7AgWv8A6R8UoNbB2LKMoM5x\nvDT+n4AfvSJxqLS6Le8/yc3ttYJaLxNefCKPl3ocrlWZH37sEMpMjArYdOsHgUve\nbqPXW3bQMpmXh8BbzJBykk62Hsfl5N+i2HxdzWZ3oLhY7tfPYPkwuQC3n/2WUb/v\nUba6z8j/dB/WNTMLFdULR/5VhVLzntWc6rkCrhoSz5gYyBgX+oXAscmdg0nWtCSb\nz9LAg5Xhs4A/qk1fh6JTTKtmoTXcjV4IBAozx6kpLplPo4Z4mQ9aWo8Cu/YRkbV3\nYJT+HIZu1Q1LKQyHqvFNjp35oqB4dxHBOQSMo4RwhpQ6/rQ7vtzXai6wypuXulgu\nZpZ/PKjoU9qnMSYOkMxaFMwcaSPiCijgelybbjqIqUXeoBlg4PE03XcTb1jbTYW4\nsCTzDirUbWQNHy0iKcT9ct3+WvAKHIt3bYExk05tKQI5XSJZ83NHfar8mUKikpBP\nvJh1j6BqUxN+ym2Qzwj2Ji/KOsFJMwVe8YxRfm7ZMcgpPhRUe9ORlfOacslw3wcA\nCvSjgNp5DuaPIxv9CM+aCKk8+ZUKiWnyqtIzWU8PojJq/yt/CNgalF/vGL5ZYnv6\nmgi1qNUeI+w6Jsp3Xk0cAPWQzFelJzmJWxZYdixLfh7niTM/baWeudWC8FgDr3fS\nWAFvgLRQf6e7rQde+VqZ/G6O8nRyI3KXkMg5g83W9joZpGJdGXMefCRenTtZ5zBc\nl2D+yeZvWX5NaGMA+jODzFTpn8VbNK4Tc5ZO6qhAlyBJ2O1uKKVa/WU=\n=uApR\n-----END PGP MESSAGE-----",
+				"created_at": "2024-06-28T21:45:32Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA+Wu2Xdd0hVDAQ/+I5elxgVOdTXCkrzYTkCp81JW5hwN/6rwuwRnPYjf6ckV\nQA8Bc3645VLk5umGX1Fr5mZHuP85p3MHS09QMkjPFyLCpvSRK5+Ep+0heKmaboI/\nPSg0N/Wri/S9UwZBQuuDJu6IkDF4nXFH3EDvLyUCLV5cHQGASbJaTx5TjF596vWc\nwbwy/SBxTwvgYSES8H3uQsPsg98HNcpEdUAaB6y81/0KbjGfN/nuQBL5VmNxJY1C\nyqRV01lMQxGvxZUZNS625VgoqAgMygn1pmjJg3u5K6GrszHguaFLLpDGhSea4YRB\nZCOfj5Zd/nDKEF85hKdqwrLwKF9V74ns+OQFc3ywSFH4qA3ihHlud0nEqTjF5bKs\nXGl3GRQP590SfTYAKbObErK7iJ6eXyoXg40CNzYKfVwmR+FbigRMKDFec4CPAcGw\nycf+YsoMJBO2ooFT93NiFVGpyJkrHCOoNL/ZCP268kmvrUbxZRdr33oUVeY9wVqf\nFanAcaHUgDRv0EOIuQhm7IT2LopEqr3IRRbSR4nvvTCnxpRmXj5YzHyPaDgKPfeR\nXt4gvAJ1CgvqHB65W0BRZWJqEbPyq1rGQBbEZ9yBaot7fF05B9+6LhmhKBUxlpZS\nVhv0TPvfGUhfXIoHtO4DlFcnqbC5LGlqBVvn0uYVxljs/eHMPvZ0Kzhg0bIReKnS\nWAG9lgclyB59xwuxZdB8xcG1maeDKNJMBf22wa3/njt0goQ3FEo/WCAiwPAmrb0C\nNUZaR/14Ly8esKIGys/o2+/ETP4r8vav1XK4cvcQjBzjrYG1QdnH42k=\n=VubZ\n-----END PGP MESSAGE-----",
 				"fp": "B5237D6B63AB2E13FDA07170E5AED9775DD21543"
 			},
 			{
-				"created_at": "2024-04-16T17:09:43Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA1IsbSgNVFwAARAAjyUf07l2em7EcOVQfwZacNBtMaei38JX3jXgoPIFkHlE\n1Vnf850HFrGGd6aopqigh1d1SEudIeWsissKU6aDwQiJ/12EJgSbD9mwO0XUHp1D\nxtRv/EhhKwmxYGLSFAdto1hiUHsqAGurKfC73xaigoAPfauckh6olBghp7HYUm+R\noQGtVXR+BvINOndROoWCmqioEzCTeFvlxSTA2SvOhpwLLEik38c33kU9fcGNITYP\nRzJzUaNHNodpY4XrUUc1dKE6YPZewNLITAeSUvLZaIvc5soSvx6t+HgKnwFd3Rre\noo0shAeKpvIAIF23wDiYdxEEEAFJj+NfmmashfvXgxJt696x5ynIEfYdxpLAH6BI\nMEVagrZotIUWkiQMCU/ToQ3sXWJRzAQcl0mjEOEMraPlBhGOudpukNg5pdq7bCca\nIcJfb1B00QEue81HsN3CEywWPzs2+1SNJmOU4AsTv8JCAbrcNZ75KiQyNuzovxmR\naZ0x9/ua0arCE0DOm6spZI/0HMNM7+Xy3Xb61/qD+/lumK0d/H4+d5gKdyScyKzB\nqVwngDJRnmHqQIhPsOfzoC0ZqxGSXGtzEdXXqAJ2mbXb4jbNfwc5ooPc/rwyE6/a\n46jJ/DaqMxNacEMsTbOR5ELu8KO71beHMddVmiG61f0hQtaNhzdjLN73w3RxPTbS\nWAGSNUsNrgx6G/2139bqUb41vt1xeG7DVw1RYjYBwmfmGfQZxyUGUzbuvMNJSVT+\n0lXktD+puI5WTIAPxrhutzA/zVYYfw+bgLqD9mNg3RYdMc4sDn+taY0=\n=PJCL\n-----END PGP MESSAGE-----",
+				"created_at": "2024-06-28T21:45:32Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA1IsbSgNVFwAAQ/9EYAll7SoB6xs53Rw6v7BDLqbVLtTH0wpMyrfMX7se5xN\nZRlBCpF0E9KwJ4jy4Kg7qDdXWaqLsr04QwCYZuxJ6bLEuyrn9z04D0cir1m5tKxI\nNoEGjGBJYFEMPSzfjL1Pd14Nsg9Ujolar4zH/TTqIkcNM32q0lqpeAIOizt4boVf\nZuKx0PtOhf+Y7rHlrAHG9rnUm1yvelCUWKNgdpukK2RTAbDhEUus2mm+G7Hr+o2d\nlZzPY5dgJLJ+O1m/f5WSrt7WELDlgXI3gLzlY0rVJRz/hsTTsVEvxP2KfUMYk3vb\n+uYcWTv2nPS+/yIyelvCkUcs+9rRMdyuTYjfb59Y8az9lG5rG5RS9MUSLMLD/UtZ\nK2QUorLNEoAK2nJYYt+mJr+DL/a5fj9YRSUFHLMUr1CZoO1zjot9xImHkMdeerY3\nAV4X1IffALBtiLBVGUy8h0Riy81QspqHtljBGNLeQPjm8SS13ypJe1xz2nMiOFWN\nmdLIlwte/EnvNfpWdW21MZfgrxCQLNWNex7i3zopUOoU85f06e+4axSCVpPOhylN\nv0B1z7lTInBeAsms3fRcjtIHzn8d1fUcqMq718dxEvR+7xrMshQXw/kwYbkvDUwg\nSdCyBOXS0nKffwWWBno65f8BIDql6cGnsCwrECHZF58oXVjrtaYoE2wO3QrtY3/S\nWAFNmstZlG8x8QqiBcl+//mLV59CRP4NdikrvnFs7ZQ7WKHYAApoMZD0edvZSWee\nXdZLC47ZUo+TCU8iYuX9ab+H9Je3WH+wgLKSf9Rpztj8LyFxYQGQp44=\n=a0te\n-----END PGP MESSAGE-----",
 				"fp": "047bf8897df877fe86133e98522c6d280d545c00"
 			},
 			{
-				"created_at": "2024-04-16T17:09:43Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA99YH4Z5n7B8AQ/+JEvS/5/mMbr+Ezo/aVHKfm70QX8QS0o6F23fh1Zvq/Cv\n1dh+J9p3BQvjBsY4grKk48bLA45kTa8MaZgAxq/gXnak7Qm2Xjc3M6Nmkjkv8/K6\niIeeH34exYwb9If9MHcfk3phY57qufWFh/Nk0/24Oes57p7iClpASCYOjmfRiK6g\nmQidErOhE+8Gnl3y2xKgoPibo0RoH6dsfmygdqutPKaulfwCnUfZUe90/5jVvzJg\nbGsxb/xOyt8sJdfR9Pb6p3B66ymQA+yUXlwGXxezsXw43AgjUWX0fRCmDZSKM1Pu\ndWXTTVjl5p5kIzeC7i3REDDbTkMB1S6+TrXIwSq8H44G1eT9eFA4/+vWrnhgwI2v\nrUpJ+RjoWX1CGFh/hzxouTZV3V8xb2bxvylrYGkSCcu4OKEw66UYUqgxcX1rHhGw\nS2YsdAcolDknzgbJAt3nWQA1SCbZ00IyuOho3EzYe4eiaMiX1RgUIzUyIIt1kURI\nhwMLdronbhpVS5OGj1kITx8CI0GQFt9yb7EPTT5XRbIv/lmZXDwfJbWQjLQyx7sp\n3RLlARHUhYpUzKhViFy4My3sxOW0zUxYCQGjN2qBvd1uUS+sl1BCES4igiPhmEzL\nOwv55727wLX8zH4yaxHFjCV8ItLnr0a5i7RxdsXUdpODjYUoHqNbAkPSYqVLOh/S\nWAFM3F9bpSHk/Nqm0BqrwVMT9yZYkRv+F09l4pRtXOMxPqaa4vHFI+Etu2yQ2fmm\nVDoufsCEFQ5ScIB6egxqB4Jm0qONxrBOfh+Zs4PymZKymRyz/A4E1j4=\n=LP3s\n-----END PGP MESSAGE-----",
+				"created_at": "2024-06-28T21:45:32Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA99YH4Z5n7B8AQ//QIDGPgmh61G3iwQdGbTo1LaqNLj3MDmqkx+lQkJyVpRG\nX1Mir8gbLV2ziT4hq4CAA/bF21DBlLI8IiIr3uxVGuWz0knkX7CwpWrkWfuTtuw0\nCALV6vlEZO/yg/oxdbN8bWxo3QzqxpfTEI1S3XUyCbfiWj+bbiDi7pYVD34MFeDa\nBqqXIc/LTcjQ/+/SdK2ue95vMWBoKDdMQlXd19ytaIJphcumg9pUG3yZgibux/z2\nrDfqc0+vLho6BWZRUVy98cpBNK2so4wP+dteRpq2dzsd6r1zD2EfJKt8mm/1RPUj\n7r8Swf4p2P+BClLCUEu2ILuOkZqj67SizQ6jHTPVWmP/TFTmOLikUDL3F4mfacE+\nHCq+UGD95BDdgPb/E8iISwGve3kuduhZYxN+BzPw2nQOc8LU9meuulX+um4aM91C\nq/Q3v5wplpX1/+Gk7/0LGQZB72XO193q8PyJIMEHE+FfRrVtXcDEtRL/3x8KkSaq\nzMES2K4mQ3Y3HimD4mVAQrHMMh1F8+oi5Qn3aqDnMXrhTNYcdiGZ/kPbAXq6e0xi\nJ+gzeR7+vRoOGl1YSpqsH1Khih44o6uo+UNv2d4IphKlFKJAy8bxyI0yPzN5paTw\nCKkMZFwtbWgCuCb3eISCiKx8ToqV6Nke9h0ey/cutkR0kfUG+I+JgsfvOGk46drS\nWAGbOlVZ4jpZUdj5bHxSl3J2tTFxGHcbfKqytzNejhCwYvi4QRKMgK+1o9JUojUu\n0Ly7McGmnJnnGrpy2tqk9VhdIs2ApYCum3aW85h0eTDvHe1/i9SySIs=\n=YYJD\n-----END PGP MESSAGE-----",
 				"fp": "12f47c96d9066c52897cdf9ddf581f86799fb07c"
+			},
+			{
+				"created_at": "2024-06-28T21:45:32Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQILA0V5hlydTOZ+AQ/4htA9A5aJnwIZK1dF7/JGiFwAc8ijP7FJb/mxscAk3FM/\nbl19UXi8hTAzj+cDBxeM9HB6oRv0At/LS7QWVAg5skhVSZ8tXCnwU8TmbDKj802w\nDh38wky3ppqVF453f7qU3SasW2B8g53Sdcl7y/Oiy/xirm3CMLVJSFTbAmY6klkh\nevQLP+neL5mJHSSvfZADpLuxyxyCiwCzWCgkDnELmA19g12gAC2Cp7CjsbWXEltp\nAm3mhCDplrNQf6VzTsz1c7qCxYBNIL4kSShmYOU0e2/p8uZDnTpIo3zEjQ5JSZWV\nZXIzHADIICpCgzTAnbFWjTlHF2+SQcFNeiUG82IL8pPNkxpz3iy940uPNpcQlfV5\ncqDDuNPckdtizJ3npr3dfgJRGPE1JfAXYkVVlmZhLi3Qqeue5VuxGlVhaLfO6A/T\n0tfXGq/5t1XjUAUQy5f/1WJ874STBcsU8rFgXLNwt3QnxQ0wq4XJcQElBDLh74hu\nqCoZNkHrXEL3pTOMV7fc6fMgjfweBiY1GX7VF/fNBKBZ8vn72Eut6LAtIu1WvFwO\nl5+qze4HNjbKtKl70dnDmQsALLBzlv5kT8IWpfeouaeotHyhTlwMUBUdbBdrw8Oz\nFQTFSLS7jz5j6thjD7EXDKPKpznq109clybddm0zgTp4Wwt8b9j/U1ldinNprtJY\nAYSkKmCdhxiCSMoLB4RSivFVPUvZe3TDAfS62aVqCEBHG/1a1ROLClWuUN+xZyy+\nwgzk2+i2N2cXgjez82CC6Xvl0Soh/SG7Eb6KtHIN0or4Rv7QyVWWyA==\n=MI/9\n-----END PGP MESSAGE-----",
+				"fp": "58BF6324CE6D45E156490D0F4579865C9D4CE67E"
 			}
 		],
 		"unencrypted_suffix": "_unencrypted",
diff --git a/systems/x86_64-linux/ocicat/boot/default.nix b/systems/x86_64-linux/ocicat/boot/default.nix
new file mode 100644
index 0000000..2941952
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/boot/default.nix
@@ -0,0 +1,33 @@
+{ ... }:
+{
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "sd_mod"
+    "ext4"
+  ];
+  boot.initrd.kernelModules = [
+    "kvm-amd"
+    "amdgpu"
+  ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  boot.initrd = {
+    systemd.enable = true; # needed for the way we do our YubiKey
+    luks.devices."key".device = "/dev/disk/by-uuid/a703bd90-d5ff-42fe-b5b7-dfa696d665ca";
+    luks.devices."NIXROOT" = {
+      device = "/dev/disk/by-uuid/0ab9f369-f8a2-4522-bca6-024a5236290c";
+      keyFile = "/key:/dev/mapper/key";
+    };
+    # luks.devices."BACKUPS" = {
+    #   device = "/dev/disk/by-uuid/{FILL_IN}";
+    #   keyFile = "/key:/dev/mapper/key";
+    # };
+  };
+}
diff --git a/systems/x86_64-linux/ocicat/compositor/default.nix b/systems/x86_64-linux/ocicat/compositor/default.nix
new file mode 100644
index 0000000..d6a852e
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/compositor/default.nix
@@ -0,0 +1,3 @@
+{
+  chimera.compositors.niri.enable = true;
+}
diff --git a/systems/x86_64-linux/ocicat/console/default.nix b/systems/x86_64-linux/ocicat/console/default.nix
new file mode 100644
index 0000000..bfb89e8
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/console/default.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  console.keyMap = "us";
+}
diff --git a/systems/x86_64-linux/ocicat/default.nix b/systems/x86_64-linux/ocicat/default.nix
new file mode 100644
index 0000000..b0d10ba
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/default.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  imports = [
+    ./boot
+    ./compositor
+    ./console
+    ./games
+    ./hardware/cpu
+    ./hardware/filesystems
+    ./networking
+    ./users
+    ./time
+    ./yubikey
+  ];
+}
diff --git a/systems/x86_64-linux/ocicat/games/default.nix b/systems/x86_64-linux/ocicat/games/default.nix
new file mode 100644
index 0000000..aa603bc
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/games/default.nix
@@ -0,0 +1,3 @@
+{ ... }: {
+  chimera.games.steam.enable = true;
+}
\ No newline at end of file
diff --git a/systems/x86_64-linux/ocicat/hardware/cpu/default.nix b/systems/x86_64-linux/ocicat/hardware/cpu/default.nix
new file mode 100644
index 0000000..c019598
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/hardware/cpu/default.nix
@@ -0,0 +1,4 @@
+{ lib, config, ... }:
+{
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/systems/x86_64-linux/ocicat/hardware/filesystems/default.nix b/systems/x86_64-linux/ocicat/hardware/filesystems/default.nix
new file mode 100644
index 0000000..77b98e2
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/hardware/filesystems/default.nix
@@ -0,0 +1,18 @@
+{ ... }:
+{
+  fileSystems."/" = {
+    device = "/dev/mapper/NIXROOT";
+    fsType = "btrfs";
+  };
+
+  # fileSystems."/backups" = {
+  #   device = "/dev/mapper/BACKUPS";
+  #   fsType = "btrfs";
+  # };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/90EA-208A";
+    fsType = "vfat";
+    options = [ "umask=0022" ];
+  };
+}
diff --git a/systems/x86_64-linux/ocicat/networking/default.nix b/systems/x86_64-linux/ocicat/networking/default.nix
new file mode 100644
index 0000000..5b990ba
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/networking/default.nix
@@ -0,0 +1,7 @@
+{ lib, config, ... }:
+{
+  networking = {
+    hostName = "ocicat";
+    useDHCP = lib.mkDefault true;
+  };
+}
diff --git a/systems/x86_64-linux/ocicat/time/default.nix b/systems/x86_64-linux/ocicat/time/default.nix
new file mode 100644
index 0000000..ae0d0da
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/time/default.nix
@@ -0,0 +1,3 @@
+{ ... }: {
+  time.timeZone = "America/New_York";
+}
diff --git a/systems/x86_64-linux/ocicat/users/default.nix b/systems/x86_64-linux/ocicat/users/default.nix
new file mode 100644
index 0000000..cf0e733
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/users/default.nix
@@ -0,0 +1,28 @@
+{ config, ... }:
+{
+  users.users.coded.hashedPasswordFile =
+    config.sops.secrets."systems/x86_64-linux/ocicat/users/passwords.sops.coded.json:coded".path;
+
+  users.users.minion.hashedPasswordFile =
+    config.sops.secrets."systems/x86_64-linux/ocicat/users/passwords.sops.coded.json:minion".path;
+
+  sops.secrets."systems/x86_64-linux/ocicat/users/passwords.sops.coded.json:coded" = {
+    mode = "0400";
+    owner = config.users.users.root.name;
+    group = config.users.users.root.group;
+    sopsFile = ./passwords.sops.coded.json;
+    format = "json";
+    key = "coded";
+    neededForUsers = true;
+  };
+
+  sops.secrets."systems/x86_64-linux/ocicat/users/passwords.sops.coded.json:minion" = {
+    mode = "0400";
+    owner = config.users.users.root.name;
+    group = config.users.users.root.group;
+    sopsFile = ./passwords.sops.coded.json;
+    format = "json";
+    key = "minion";
+    neededForUsers = true;
+  };
+}
diff --git a/systems/x86_64-linux/ocicat/users/passwords.sops.coded.json b/systems/x86_64-linux/ocicat/users/passwords.sops.coded.json
new file mode 100644
index 0000000..d21f783
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/users/passwords.sops.coded.json
@@ -0,0 +1,32 @@
+{
+	"coded": "ENC[AES256_GCM,data:HbydDoeYX+hoOMijjLFJCwWUl68rpZUHnXL9M0JJLUCMwFTcTWfzgL8hIP9dzU7VVbUCh4dB4VNT0YFQ,iv:dqZf+/aFAb4Zrw09gmO1PKPtY8NJ7oLam3Few6c6zzs=,tag:m+xTA5ZcINVRP7oI+ZLHVA==,type:str]",
+	"minion": "ENC[AES256_GCM,data:cBHPHsscUgu6RKP9cX3wcdCp1CmkDdOGvqI8pkigqfMypQO9J1KcBaPAT9cRqNrVt2QiBNtm0y87pRZz,iv:4THhdRdpNM7oXuMgOkoqO5vSWs6ie2VAhIrl6C6u02s=,tag:X2ym5nZRp10sQZsxXmcM+g==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": null,
+		"lastmodified": "2024-06-28T21:34:08Z",
+		"mac": "ENC[AES256_GCM,data:D0ZGXwKiwA+7rjWvk0Y6A8M7O7bDw4hNldaR8Y+yNUqm9nYYCi86rTHvQFOJDSf4zcBCh3nj8Gu1US+LnY4/BTAg0iahn7AgUd7UHn14uLesBK6j7qS4FtmHsMBAtb+gztio3mMX6Nssfa8MxUsqsucLSv1EwHGLsxBbp2qtJ74=,iv:aT9MfggQl//HKaaxbBUmfZZls5FLRrSbvwSpLVow32Q=,tag:Y3xkgrkLKIDi31J6cunhkA==,type:str]",
+		"pgp": [
+			{
+				"created_at": "2024-06-28T21:45:22Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4D6MHlIv4I/7ASAQdAIAKZnS1Xkhbi4pFH6aBJFJsksurWBMBp0hxivQp3OwQw\nz1QsoSdegtthdD0r/fgh7OZwAxWcgrp8Zvw+ulEE749f5H10xCW07xKwyTbh3hhO\n0l4B4bqoJYT36J/M+jPizG6yQNcKWmlVrWsrF64s/C85bXzuOFQGWEfjqlM8r7sq\nkmCL2uwbXwpV4I49CbY7M4fowxy3AAIyRJ9nihZNRr663KsZSBp0esrDoGYBZ5io\n=9Ab0\n-----END PGP MESSAGE-----",
+				"fp": "BC82DF237610AE9113EB075900E944BFBE99ADB5"
+			},
+			{
+				"created_at": "2024-06-28T21:45:22Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA+Wu2Xdd0hVDARAAyMpe5tOhKKiV1MyRC4JSJna5yHkECo7hIcjCtflxLR75\na/BLTrVxbyf/8Bfv2Uz+Uz0yzk3ojd5TYhmozqRVP9glCaexWKEY4hOGdE1BnaDl\nQn23Ezk2ib5VGtRchUCNqWHfIRACDRlJRagEZaBPS+4zl37ixq6/aCoBVdjlEZiM\nN9LmDl5jf+1XTSIBjhtivc8KyxSbRVop0gOgFp7DkBMho+WZAeKd7kvYZCpYuoWG\nfLawwRHDiDjDKTiH1QGf5ZhwwC3cTD1rAkLV2djGavuHvzhQ5ZPcUkh2QdVzqbLo\nqklvhKaYDKYaUkyWb7euqMDC/JXry6PUfoHF4JuO9Rk9uXgcH7QyfjdRLP92Zr+F\nazZu5xWnEkLF1WHPrsiZBSsLYIVgMt05XBzYor7ukLyMyP8HN1f2QvofNmQLAM5H\n2Va+mJnMd1x7dg8wkzJUWkO+IkUyNWz7pr0g1UwTk6JS7xDpOVEe+siNzx+Lywt5\ngFyo0Ez1TsDKwAXxhjXRkcw5RI2x3eOacD/9pCOjoX3yaqZw2ynTkIKJG57aKx+M\nv9IcCIXmuedhLdjl6TATRyEs1VmGB2dw+XTfBxBEC251aLnY5bZ0Iuq7kcVcZAMp\n7J36yrVbSdoDnmJJtD01dsvAr31j0x+HxvaIeq2yVxGosUsNLileAI5hFqY4phLS\nWAGFdnM4pldAJ8cmnoG4gwfU54S1OD8VKdKejK+FljSy3lTF1baSsUI/9/3GnZKU\nwfXdiNbc9gRvMeSL+rgnDXlESbqkNesGRtM3j/TA/HxL54IsHijDc/0=\n=APQj\n-----END PGP MESSAGE-----",
+				"fp": "B5237D6B63AB2E13FDA07170E5AED9775DD21543"
+			},
+			{
+				"created_at": "2024-06-28T21:45:22Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMA0V5hlydTOZ+AQ/+OEL5Kzf3Kaz/JBRYfrOfSTBcSoNg9P4v5lioELh+zHa1\nEzOPzTuudYrhJ05LJIBrEmuSF3kqDwzO0rUs/wOHijSA01W2WbjQ45XJY1SzEnTD\nBeRh3citrVX94Tlp0DfCLD0G8K9DqeJ4c2is4/f/D5ibTBas0Hc028sNwjmshq3l\nJjDVWsFGEAOggkqo2Mrxhj8FFeh/gPxbc3nSx5A582RjBoIzNCI5w9hGQsQ7+kaI\n8qCWJ6N/AyJAFG/xJRterfgIrVr/5KMHFV/AuO4DLBEsEMIfzcXRqlBbUbWgfsjj\nm+/0+nb0paX1rWSPXk7qVVGN6Q8U4EuLwnCCuLR2qscGCq72bpJ9SHewTuCzkcQn\nwWRXSi7V8k7WnjYOOkzH5UBrtPDvhRl6vA2U9MoB4xZIfswP3vtxEVL8B6wfaogU\nJLs3AIyU7g/FA46WL0d4ta5E8Ki3cmc4+/y0Ezp4m0T/I3bvowSYd0FMtgG53AsG\nhmdd41tT0BPD2EugqwcoAaPxaPquMQemPaoyazHVHjKQzoDUf/jviF7+fDnJahgx\nMKg/l7oC2btrLLoyrr3xFrSldjTnRBgae9bv+WrzmQ1z+K89f5wSTX0qCbzqa1h/\nHCRSJsnofnTyVBWoJwE8wXh/S6Yi3jqh6haXGXCnHdqW14Yckg9iB1ZGmjxCF6nS\nWAGYzKnYhpmDTfDyr30q6JRX305KqNoNjEr2VVIHtazmKs+bPSpz2I8PoJbCVv6Z\nyttlazXnFYyTzwAt0yHi3JPQXoYQRtdISUR3NUL1uqJtZ950XPHVAg8=\n=Ar37\n-----END PGP MESSAGE-----",
+				"fp": "58BF6324CE6D45E156490D0F4579865C9D4CE67E"
+			}
+		],
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.8.1"
+	}
+}
\ No newline at end of file
diff --git a/systems/x86_64-linux/ocicat/yubikey/default.nix b/systems/x86_64-linux/ocicat/yubikey/default.nix
new file mode 100644
index 0000000..5194cd7
--- /dev/null
+++ b/systems/x86_64-linux/ocicat/yubikey/default.nix
@@ -0,0 +1,5 @@
+{ config, lib, pkgs, ... }:
+
+{
+  chimera.yubikey.enable = true;
+}