treewide: sorting

.sops.yaml

@@ -8,7 +8,7 @@ keys:
   - &hosts:
     - &aristotle age1hm6pkvt4d640wmjhxg5wxfwkp9zhcqre9klr4zg5kx2qx7vyhuuqlytmnp
 creation_rules:
-  - path_regex: users/guanranwang/secrets.yaml$
+  - path_regex: secrets.yaml$
     key_groups:
       - age:
           - *guanranwang

darwin/hosts/Plato/default.nix

@@ -2,9 +2,7 @@
 {...}: {
   imports = [
     ../../profiles/desktop
-
-    ../../../users/guanranwang/darwin/profiles/desktop
-    ../../../users/guanranwang/darwin/profiles/common/opt-in/clash-meta-client.nix
+    ../../profiles/common/opt-in/clash-meta-client.nix
 
     ./hardware-configuration.nix
   ];

darwin/profiles/common/core/default.nix

@@ -1,4 +1,11 @@
-{inputs, ...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  ### Options
+  home-manager.users.guanranwang = import ./home;
+
   imports = [
     ./nix
     ./anti-features.nix
@@ -8,6 +15,17 @@
     inputs.home-manager.darwinModules.home-manager
   ];
 
+  users = {
+    knownUsers = ["guanranwang"];
+    users."guanranwang" = {
+      createHome = true;
+      description = "Guanran Wang";
+      home = "/Users/guanranwang";
+      shell = pkgs.fish;
+      uid = 501;
+    };
+  };
+
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;

darwin/profiles/common/core/home/default.nix

@@ -1,6 +1,6 @@
 {...}: {
   imports = [
-    ../../../../../home-manager
+    ../../../../../home
   ];
 
   # https://github.com/mathiasbynens/dotfiles/blob/main/.macos

darwin/profiles/common/opt-in/gaming.nix

@@ -1,5 +0,0 @@
-{
-  homebrew.casks = [
-    "steam"
-  ];
-}

darwin/profiles/common/opt-in/gaming/default.nix

@@ -1,7 +1,8 @@
 {
-  imports = [
-    ../common/core
-  ];
   ### home-manager
   home-manager.users.guanranwang = import ./home;
+
+  homebrew.casks = [
+    "steam"
+  ];
 }

darwin/profiles/common/opt-in/gaming/home/default.nix

@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ../../../../../home/applications/prismlauncher
+  ];
+}