Update

flake.nix

@@ -12,12 +12,15 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ self, nixpkgs, nix-darwin, home-manager, emacs-overlay }: {
+  outputs = inputs@{ self, nixpkgs, nix-darwin, home-manager, emacs-overlay, nixos-hardware }: {
     darwinConfigurations = (import ./systems/OPL2212-2 {
       inherit self nixpkgs nix-darwin home-manager emacs-overlay;
     });
-    # nixosConfigurations = (import ./systems/)
+    nixosConfigurations = (import ./systems/X13Gen2 {
+      inherit self nixpkgs home-manager emacs-overlay nixos-hardware;
+    });
   };
 }

home-manager/package.nix

@@ -1,9 +1,9 @@
 { pkgs }:
 let
-  ecspresso = pkgs.callPackage ./pkgs/ecspresso { };
-  isucrud = pkgs.callPackage ./pkgs/isucrud { };
-  mitamae = pkgs.callPackage ./pkgs/mitamae { };
-  # tmux-sixel = pkgs.callPackage ./pkgs/tmux-sixel { };
+  ecspresso = pkgs.callPackage ./nixpkgs/ecspresso { };
+  isucrud = pkgs.callPackage ./nixpkgs/isucrud { };
+  # mitamae = pkgs.callPackage ./pkgs/mitamae { };
+  tmux-sixel = pkgs.callPackage ./nixpkgs/tmux-sixel { };
 in with pkgs; [
   # for language specific
   gopls
@@ -27,7 +27,8 @@ in with pkgs; [
   yaml-language-server
 
   # for gnupg
-  pinentry_mac
+  # pinentry_mac
+  # pinentry-curses
   pinentry-emacs
   gnupg
 
@@ -53,9 +54,9 @@ in with pkgs; [
   pv
   ripgrep
   rlwrap
-  terminal-notifier
+  # terminal-notifier
   tig
-  tmux # or tmux-sixel
+  tmux-sixel
   tokei
   tree
   unixtools.procps
@@ -71,7 +72,7 @@ in with pkgs; [
   iftop
   imagemagick
   isucrud
-  mitamae
+  # mitamae
   ncurses
   neofetch
   offlineimap
@@ -84,7 +85,7 @@ in with pkgs; [
 
   # for editor
   cmigemo
-  emacs-git
+  emacs
   editorconfig-core-c
   nano
   neovim

systems/X13Gen2/configuration.nix

@@ -5,11 +5,6 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -51,9 +46,9 @@
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "jp";
-    xkbVariant = "";
-    xkbOptions = "ctrl:swapcaps";
+    xkb.layout = "jp";
+    xkb.variant = "";
+    xkb.options = "ctrl:swapcaps";
   };
 
   # Configure console keymap
@@ -87,29 +82,30 @@
     isNormalUser = true;
     description = "take";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      firefox
-      #  thunderbird
-    ];
+    packages = with pkgs;
+      [
+        firefox
+        #  thunderbird
+      ];
   };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    emacs29
-    git
-    ghq
-    gnumake
-    gnupg
-    pinentry-curses
-    tmux
-    fish
-    peco
-  ];
+  # environment.systemPackages = with pkgs; [
+  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #   emacs29
+  #   git
+  #   ghq
+  #   gnumake
+  #   gnupg
+  #   pinentry-curses
+  #   tmux
+  #   fish
+  #   peco
+  # ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

systems/X13Gen2/default.nix

@@ -1,14 +1,15 @@
-{ self, nixpkgs, home-manager, emacs-overlay, ... }:
+{ self, nixpkgs, home-manager, emacs-overlay, nixos-hardware, ... }:
 let
-  system = "aarch64-linux";
   username = "take";
-in {
+  system = "x86_64-linux";
+in
+{
   X13Gen2 = nixpkgs.lib.nixosSystem {
     inherit system;
-
     modules = [
       ./configuration.nix
-      home-manager.darwinModules.home-manager
+      ./hardware-configuration.nix
+      home-manager.nixosModules.home-manager
       {
         home-manager.useUserPackages = true;
         home-manager.users."${username}" =