update

README.org

@@ -14,5 +14,5 @@
 ** for OPPO-A79
 #+begin_src shell
   nix flake update --flake ~/ghq/github.com/takeokunn/nixos-configuration
-  nix flake .
+  nix run "~/ghq/github.com/takeokunn/nixos-configuration#OPL2212-2#OPPO-A79"
 #+end_src

home-manager/default.nix

@@ -6,11 +6,13 @@ let
     config.allowUnfree = true;
     overlays = import ./overlay.nix { inherit emacs-overlay; };
   };
-  basePkgs = import ./packages/base.nix { inherit pkgs; };
-  darwinPkgs = import ./packages/darwin.nix { inherit pkgs; };
-  nixosPkgs = import ./packages/nixos.nix { inherit pkgs; };
+  basicPkgs = import ./packages/basic.nix { inherit pkgs; };
+  utilsPkgs = import ./packages/utils.nix { inherit pkgs; };
+  darwinPkgs = import ./packages/darwin { inherit pkgs; };
+  nixosPkgs = import ./packages/nixos { inherit pkgs; };
 in {
   home.stateVersion = "23.11";
-  home.packages = basePkgs ++ lib.optionals pkgs.stdenv.isDarwin darwinPkgs
-    ++ lib.optionals pkgs.stdenv.isLinux nixosPkgs;
+  home.packages = basicPkgs
+                  ++ lib.optionals pkgs.stdenv.isDarwin lib.mkMerge [utilsPkgs darwinPkgs]
+                  ++ lib.optionals pkgs.stdenv.isLinux lib.mkMerge [ utilsPkgs nixosPkgs]
 }

home-manager/packages/base.nix → home-manager/packages/basic.nix

@@ -1,9 +1,5 @@
 { pkgs }:
-let
-  # ecspresso = pkgs.callPackage ../nixpkgs/ecspresso { };
-  # isucrud = pkgs.callPackage ../nixpkgs/isucrud { };
-  # mitamae = pkgs.callPackage ../pkgs/mitamae { };
-  tmux-sixel = pkgs.callPackage ../nixpkgs/tmux-sixel { };
+let tmux-sixel = pkgs.callPackage ../nixpkgs/tmux-sixel { };
 in with pkgs; [
   # for language specific
   gopls
@@ -62,55 +58,14 @@ in with pkgs; [
   unixtools.watch
   wget
   yq
-  # for util tools
-  awscli
-  # ecspresso
-  ffmpeg
-  gibo
-  graphviz
-  iftop
-  imagemagick
-  # isucrud
-  # mitamae
-  ncurses
-  neofetch
-  offlineimap
-  speedtest-cli
-  tcpdump
 
   # for pass
   pwgen
   (pass.withExtensions (extensions: with extensions; [ pass-otp ]))
 
   # for editor
-  cmigemo
-  editorconfig-core-c
-  nano
   neovim
-  tree-sitter
-  (tree-sitter.withPlugins (p: builtins.attrValues p))
 
   # for shell
   fish
-  zx
-
-  # for DB
-  redis
-  mysql
-  sqlite
-  sqldef
-
-  # for jokes
-  asciiquarium
-  cmatrix
-  sl
-  silicon
-  genact
-
-  # for ai
-  ollama
-
-  # for emacs
-  mu
-  emacsPackages.mu4e
 ]

home-manager/packages/utils.nix

@@ -0,0 +1,52 @@
+{ pkgs }:
+let
+  ecspresso = pkgs.callPackage ../nixpkgs/ecspresso { };
+  isucrud = pkgs.callPackage ../nixpkgs/isucrud { };
+  mitamae = pkgs.callPackage ../pkgs/mitamae { };
+in with pkgs; [
+  # for util tools
+  awscli
+  ecspresso
+  ffmpeg
+  gibo
+  graphviz
+  iftop
+  imagemagick
+  isucrud
+  mitamae
+  ncurses
+  neofetch
+  offlineimap
+  speedtest-cli
+  tcpdump
+
+  # for editor
+  cmigemo
+  editorconfig-core-c
+  nano
+  tree-sitter
+  (tree-sitter.withPlugins (p: builtins.attrValues p))
+
+  # for shell
+  zx
+
+  # for DB
+  redis
+  mysql
+  sqlite
+  sqldef
+
+  # for jokes
+  asciiquarium
+  cmatrix
+  sl
+  silicon
+  genact
+
+  # for ai
+  ollama
+
+  # for emacs
+  mu
+  emacsPackages.mu4e
+]

systems/OPPO-A79/default.nix

@@ -1,5 +1,10 @@
 { self, nixpkgs, home-manager, emacs-overlay, nix-on-droid }: {
   OPPO-A79 = nix-on-droid.lib.nixOnDroidConfiguration {
     modules = [ ./nix-on-droid.nix ];
+
+    # home-manager.config = { pkgs }:
+    #   {
+
+    #   };
   };
 }

systems/OPPO-A79/nix-on-droid.nix

@@ -1,41 +1,16 @@
 { 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
-
-      # Some common stuff that people expect to have
-      #procps
-      #killall
-      #diffutils
-      #findutils
-      #utillinux
-      #tzdata
-      #hostname
-      #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
   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-manager;
+  #   backupFileExtension = "hm-bak";
+  #   useGlobalPkgs = true;
+  # };
 }