From 6f9de6434ce9acd702a7b416a9a367185a3b47df Mon Sep 17 00:00:00 2001
From: Origami404 <Origami404@foxmail.com>
Date: Fri, 28 Jun 2024 03:04:24 +0800
Subject: [PATCH] [home] split out home-manager from configuration

---
 configuration.nix                         |  9 +--------
 flake.nix                                 | 18 ++++++++----------
 {modules => home/modules}/desktop.nix     |  3 +++
 {modules => home/modules}/develop.nix     |  0
 {modules => home/modules}/gnome-dconf.nix |  0
 home/modules/identity.nix                 | 10 ++++++++++
 {modules => home/modules}/shell.nix       |  0
 home.nix => home/um790.nix                |  1 +
 8 files changed, 23 insertions(+), 18 deletions(-)
 rename {modules => home/modules}/desktop.nix (90%)
 rename {modules => home/modules}/develop.nix (100%)
 rename {modules => home/modules}/gnome-dconf.nix (100%)
 create mode 100644 home/modules/identity.nix
 rename {modules => home/modules}/shell.nix (100%)
 rename home.nix => home/um790.nix (91%)

diff --git a/configuration.nix b/configuration.nix
index ed41c07..4e42208 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -73,6 +73,7 @@
     v2raya # Only for Chinese user
 
     # Nix related
+    home-manager
     nix-output-monitor
     nixd
     nixpkgs-fmt
@@ -171,14 +172,6 @@
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
   system.stateVersion = "23.11";
-
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [
-      "vscode"
-      "code"
-      "qq"
-      "feishu"
-    ];
 }
 
 
diff --git a/flake.nix b/flake.nix
index a665d9b..07d91fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,19 +17,17 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.origami = import ./home.nix;
-              extraSpecialArgs = inputs;
-              backupFileExtension = "bak";
-            };
-          }
         ];
       };
     };
+
+    homeConfigurations = {
+      "origami@um790-nix" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        modules = [ ./home/um790.nix ];
+        extraSpecialArgs = { inherit inputs; };
+      };
+    };
   };
 }
 
diff --git a/modules/desktop.nix b/home/modules/desktop.nix
similarity index 90%
rename from modules/desktop.nix
rename to home/modules/desktop.nix
index f613f93..ca96b15 100644
--- a/modules/desktop.nix
+++ b/home/modules/desktop.nix
@@ -1,10 +1,13 @@
 { pkgs, lib, config, ... }:
 {
   home.packages = with pkgs; [
+    desktop-file-utils
+
     telegram-desktop
     qq
     mpv
     feishu
+    moonlight-qt
   ];
 
   # An Apple Music client, only can be downloaded after purchasing
diff --git a/modules/develop.nix b/home/modules/develop.nix
similarity index 100%
rename from modules/develop.nix
rename to home/modules/develop.nix
diff --git a/modules/gnome-dconf.nix b/home/modules/gnome-dconf.nix
similarity index 100%
rename from modules/gnome-dconf.nix
rename to home/modules/gnome-dconf.nix
diff --git a/home/modules/identity.nix b/home/modules/identity.nix
new file mode 100644
index 0000000..d5ce20d
--- /dev/null
+++ b/home/modules/identity.nix
@@ -0,0 +1,10 @@
+{ pkgs, lib, config, ... }:
+{
+  programs.gnupg = {
+    enable = true;
+    agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/shell.nix b/home/modules/shell.nix
similarity index 100%
rename from modules/shell.nix
rename to home/modules/shell.nix
diff --git a/home.nix b/home/um790.nix
similarity index 91%
rename from home.nix
rename to home/um790.nix
index dc41807..71040bc 100644
--- a/home.nix
+++ b/home/um790.nix
@@ -13,6 +13,7 @@
     (import ./modules/gnome-dconf.nix)
   ];
 
+  nixpkgs.config.allowUnfreePredicate = _: true;
   home.packages = with pkgs;[
     # system call monitoring
     strace # system call monitoring