began reorganising

flake.lock

@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1678109311,
+        "lastModified": 1679480702,
-        "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=",
+        "narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "04d6cad67557512452decbfe888c68fa11338a96",
+        "rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1678116888,
+        "lastModified": 1679614379,
-        "narHash": "sha256-/Y4RTkPq+RVJjkoM/mYyCREFLZhvtISc/rLcgM1vLvo=",
+        "narHash": "sha256-2KddLHHmcIlJu0PuS/vISLKxihTyICUwKWGn0R//028=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "49596eb4e50b18337aad3b73317371bcd4e3b047",
+        "rev": "994e2ef9e9c70b4dd7257f73452a94e871723685",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,26 +9,36 @@
 
   outputs = { self, nixpkgs, home-manager }:
     let
-      username = "spy";
+      username = "maddie";
-      system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; config.allowUnfree = true; overlays = import ./overlays.nix; };
       utils = import ./utils pkgs;
       specialArgs = { inherit username; inherit pkgs; };
     in
     {
-      packages.${system} = {
+      nixosConfigurations.luna = nixpkgs.lib.nixosSystem {
-        nixosConfigurations.luna = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
-          inherit system;
+        inherit pkgs;
-          inherit pkgs;
+        inherit specialArgs;
-          inherit specialArgs;
+        modules = [
-          modules = [
+          home-manager.nixosModules.home-manager
-            home-manager.nixosModules.home-manager
+          {
-            {
+            home-manager.users.${username}.imports = utils.nixFilesIn ./maddie;
-              home-manager.users.${username}.imports = utils.nixFilesIn ./maddie;
+            home-manager.extraSpecialArgs = specialArgs;
-              home-manager.extraSpecialArgs = specialArgs;
+          }
-            }
+        ] ++ utils.nixFilesIn ./systems/desktop;
-          ] ++ utils.nixFilesIn ./system;
+      };
-        };
+
+      darwinConfigurations."MMacBookPro" = inputs.darwin.lib.darwinSystem {
+        inherit pkgs;
+        inherit specialArgs;
+        system = "aarch64-darwin",
+        modules = [
+          home-manager.darwinModules.home-manager
+          {
+            home-manager.users.${username}.imports = utils.nixFilesIn ./maddie;
+            home-manager.extraSpecialArgs = specialArgs;
+          }
+        ] ++ utils.nixFilesIn ./systems/macbookpro;
       };
 
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt;

maddie/git.nix

@@ -18,7 +18,7 @@
     userName = "Madeleine";
     userEmail = "maddie@spyhoodle.me";
     signing = {
-      key = "467EFD918D5E770AD1EE2CE699CD1AB536E1C7AD";
+      key = "FA50688B9EB6D8AA070C8241C296DE8C9053683F";
       signByDefault = true;
       gpgPath = "gpg2";
     };

maddie/messaging.nix

@@ -2,9 +2,9 @@
 
 {
   home.packages = with pkgs; [
+    element-desktop # Matrix client
     signal-desktop # Signal client
     discord-canary # Discord client
     ripcord # Better discord client
-    element # Matrix client
   ];
 }

maddie/passwords.nix

@@ -11,4 +11,9 @@
   home.sessionVariables = {
     PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store";
   };
+
+  services.pass-secret-service = {
+    enable = true;
+    storePath = "${config.xdg.dataHome}/password-store";
+  };
 }

systems/desktop/yubikey.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  services.pcscd.enable = false;
+  services.pcscd.enable = true;
   services.udev.packages = [ pkgs.yubikey-personalization pkgs.android-udev-rules ];
   security.pam = {
     services = {