From f249b85edd1e7328fe5d153505e2cd53c7d8c61e Mon Sep 17 00:00:00 2001
From: takeokunn <bararararatty@gmail.com>
Date: Sun, 26 May 2024 22:48:23 +0900
Subject: [PATCH] update

---
 README.org                        |  6 ++---
 home-manager/default.nix          |  4 ++--
 systems/OPPO-A79/home.nix         |  9 +++++++
 systems/OPPO-A79/nix-on-droid.nix | 40 +++++++------------------------
 4 files changed, 22 insertions(+), 37 deletions(-)
 create mode 100644 systems/OPPO-A79/home.nix

diff --git a/README.org b/README.org
index 71ec3e1..e6d6663 100644
--- a/README.org
+++ b/README.org
@@ -4,15 +4,15 @@
 ** for OPL2212-2
 #+begin_src shell
   nix flake update ~/ghq/github.com/takeokunn/nixos-configuration
-  nix run nix-darwin -- switch --flake ~/ghq/github.com/takeokunn/nixos-configuration#OPL2212-2
+  nix run nix-darwin -- switch --flake ~/ghq/github.com/takeokunn/nixos-configuration#OPL2212-2  --show-trace
 #+end_src
 ** for X13Gen2
 #+begin_src shell
   nix flake update --flake ~/ghq/github.com/takeokunn/nixos-configuration
-  sudo nixos-rebuild switch --flake ~/ghq/github.com/takeokunn/nixos-configuration#X13Gen2
+  sudo nixos-rebuild switch --flake ~/ghq/github.com/takeokunn/nixos-configuration#X13Gen2  --show-trace
 #+end_src
 ** for OPPO-A79
 #+begin_src shell
   nix flake update --flake ~/ghq/github.com/takeokunn/nixos-configuration
-  nix-on-droid switch --flake ~/ghq/github.com/takeokunn/nixos-configuration#OPPO-A79
+  nix-on-droid switch --flake ~/ghq/github.com/takeokunn/nixos-configuration#OPPO-A79 --show-trace
 #+end_src
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 2bd241f..d7da911 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -13,6 +13,6 @@ let
 in {
   home.stateVersion = "23.11";
   home.packages = basicPkgs
-                  ++ lib.optionals pkgs.stdenv.isDarwin lib.mkMerge [utilsPkgs darwinPkgs]
-                  ++ lib.optionals pkgs.stdenv.isLinux lib.mkMerge [ utilsPkgs nixosPkgs]
+    ++ lib.optionals pkgs.stdenv.isDarwin lib.mkMerge [ utilsPkgs darwinPkgs ]
+    ++ lib.optionals pkgs.stdenv.isLinux lib.mkMerge [ utilsPkgs nixosPkgs ];
 }
diff --git a/systems/OPPO-A79/home.nix b/systems/OPPO-A79/home.nix
new file mode 100644
index 0000000..7ed35d2
--- /dev/null
+++ b/systems/OPPO-A79/home.nix
@@ -0,0 +1,9 @@
+{ pkgs }: {
+  # Read the changelog before changing this value
+  home.stateVersion = "23.11";
+
+  # insert home-manager config
+
+  home.packages =
+    import ../../home-manager/packages/basic.nix { inherit pkgs; };
+}
diff --git a/systems/OPPO-A79/nix-on-droid.nix b/systems/OPPO-A79/nix-on-droid.nix
index 70d9f55..636c613 100644
--- a/systems/OPPO-A79/nix-on-droid.nix
+++ b/systems/OPPO-A79/nix-on-droid.nix
@@ -1,41 +1,17 @@
-{ config, lib, pkgs, ... }: {
-  # Simply install just the packages
-  environment.packages = with pkgs; [
-    # User-facing stuff that you really really want to have
-    vim # or some other editor, e.g. nano or neovim
-    git
-    hostname
-
-    # Some common stuff that people expect to have
-    #procps
-    #killall
-    #diffutils
-    #findutils
-    #utillinux
-    #tzdata
-    #man
-    #gnugrep
-    #gnupg
-    #gnused
-    #gnutar
-    #bzip2
-    #gzip
-    #xz
-    #zip
-    #unzip
-  ];
-
-  # Backup etc files instead of failing to activate generation if a file already exists in /etc
+{ config, lib, pkgs }: {
   environment.etcBackupExtension = ".bak";
 
-  # Read the changelog before changing this value
   system.stateVersion = "23.11";
 
-  # Set up nix for flakes
   nix.extraOptions = ''
     experimental-features = nix-command flakes
   '';
 
-  # Set your time zone
-  #time.timeZone = "Europe/Berlin";
+  time.timeZone = "Asia/Tokyo";
+
+  home-manager = {
+    config = ./home.nix;
+    backupFileExtension = "hm-bak";
+    useGlobalPkgs = true;
+  };
 }