diff --git a/README.org b/README.org index 2570456..4e38bb1 100644 --- a/README.org +++ b/README.org @@ -7,7 +7,7 @@ |-----------+---------+----------------+--------| | OPL2212-2 | mac | aarch64-darwin | ○ | | X13Gen2 | nixos | x86_64-linux | × | -| OPPO-A79 | android | - | × | +| OPPO-A79 | android | - | ○ | ** Usage *** for OPL2212-2 @@ -18,7 +18,7 @@ *** 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 --show-trace + sudo nixos-rebuild switch --flake ~/ghq/github.com/takeokunn/nixos-configuration#X13Gen2 --show-trace #+end_src *** for OPPO-A79 #+begin_src shell diff --git a/devbox.lock b/devbox.lock index 054920a..e929a6e 100644 --- a/devbox.lock +++ b/devbox.lock @@ -2,8 +2,8 @@ "lockfile_version": "1", "packages": { "nil@latest": { - "last_modified": "2024-05-29T10:04:41Z", - "resolved": "github:NixOS/nixpkgs/ac82a513e55582291805d6f09d35b6d8b60637a1#nil", + "last_modified": "2024-06-18T11:39:17Z", + "resolved": "github:NixOS/nixpkgs/56fc115880db6498245adecda277ccdb33025bc2#nil", "source": "devbox-search", "version": "2023-08-09", "systems": { @@ -11,47 +11,47 @@ "outputs": [ { "name": "out", - "path": "/nix/store/gq3pvgyffnfnv0ipjwk3ss02pzlv8ipb-nil-2023-08-09", + "path": "/nix/store/63h9529c6z5zc5njqncjahh3ffx5hv1b-nil-2023-08-09", "default": true } ], - "store_path": "/nix/store/gq3pvgyffnfnv0ipjwk3ss02pzlv8ipb-nil-2023-08-09" + "store_path": "/nix/store/63h9529c6z5zc5njqncjahh3ffx5hv1b-nil-2023-08-09" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/84lcpsj6zm2mdhcri2m34mvi9kmqbi40-nil-2023-08-09", + "path": "/nix/store/as0si2prwjl53sk9clijjqm9iybqs9fm-nil-2023-08-09", "default": true } ], - "store_path": "/nix/store/84lcpsj6zm2mdhcri2m34mvi9kmqbi40-nil-2023-08-09" + "store_path": "/nix/store/as0si2prwjl53sk9clijjqm9iybqs9fm-nil-2023-08-09" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/idwwvvdb24bb54lcrxga6m7ahqrxnnxp-nil-2023-08-09", + "path": "/nix/store/xvl82yv9lyp2hw29h48dasmjzx7rlbwv-nil-2023-08-09", "default": true } ], - "store_path": "/nix/store/idwwvvdb24bb54lcrxga6m7ahqrxnnxp-nil-2023-08-09" + "store_path": "/nix/store/xvl82yv9lyp2hw29h48dasmjzx7rlbwv-nil-2023-08-09" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/wk1jkbg8dhzpw6gqsxvv8w37c13az49m-nil-2023-08-09", + "path": "/nix/store/xdbvh3rkrm92dzzhixmhrrvmfrbmiaj6-nil-2023-08-09", "default": true } ], - "store_path": "/nix/store/wk1jkbg8dhzpw6gqsxvv8w37c13az49m-nil-2023-08-09" + "store_path": "/nix/store/xdbvh3rkrm92dzzhixmhrrvmfrbmiaj6-nil-2023-08-09" } } }, "nixfmt-classic@latest": { - "last_modified": "2024-06-07T15:28:25Z", - "resolved": "github:NixOS/nixpkgs/d226935fd75012939397c83f6c385e4d6d832288#nixfmt-classic", + "last_modified": "2024-06-17T06:49:48Z", + "resolved": "github:NixOS/nixpkgs/38d3352a65ac9d621b0cd3074d3bef27199ff78f#nixfmt-classic", "source": "devbox-search", "version": "0.6.0", "systems": { @@ -59,138 +59,138 @@ "outputs": [ { "name": "bin", - "path": "/nix/store/k29p7m4ibybna5wmnxp0j1cqj56xiaff-nixfmt-0.6.0-bin", + "path": "/nix/store/zh034p61nk98dz6v2926lsks0qvppnqm-nixfmt-0.6.0-bin", "default": true }, { "name": "doc", - "path": "/nix/store/190ylg8xx8avkbb861ff19xa0kd2h97q-nixfmt-0.6.0-doc" + "path": "/nix/store/dk83whw4xnaiygbx8v91s4x2fsmks1md-nixfmt-0.6.0-doc" }, { "name": "out", - "path": "/nix/store/zndcqls2sld7az3a7gggiy2w8kcf2h77-nixfmt-0.6.0" + "path": "/nix/store/d072kw5r4p6b1rinjqqcfxjmad9fp65a-nixfmt-0.6.0" } ], - "store_path": "/nix/store/k29p7m4ibybna5wmnxp0j1cqj56xiaff-nixfmt-0.6.0-bin" + "store_path": "/nix/store/zh034p61nk98dz6v2926lsks0qvppnqm-nixfmt-0.6.0-bin" }, "aarch64-linux": { "outputs": [ { "name": "bin", - "path": "/nix/store/27sj8cscjwqv3pqa1jbsash9ppz095i3-nixfmt-0.6.0-bin", + "path": "/nix/store/v60smixzlbdysjsj3vjsw5gb4b2h6604-nixfmt-0.6.0-bin", "default": true }, { "name": "doc", - "path": "/nix/store/3k4d8w9yrnf8826iy1n6h6gqjr9zksph-nixfmt-0.6.0-doc" + "path": "/nix/store/42z8llxzqilr1adgi3zfahzdyz5yl526-nixfmt-0.6.0-doc" }, { "name": "out", - "path": "/nix/store/h2d7c441sxya4k0v5xlar74b66ssw9lz-nixfmt-0.6.0" + "path": "/nix/store/1djcnyplpfgbcz6hbx8wsjy2apkzlmps-nixfmt-0.6.0" } ], - "store_path": "/nix/store/27sj8cscjwqv3pqa1jbsash9ppz095i3-nixfmt-0.6.0-bin" + "store_path": "/nix/store/v60smixzlbdysjsj3vjsw5gb4b2h6604-nixfmt-0.6.0-bin" }, "x86_64-darwin": { "outputs": [ { "name": "bin", - "path": "/nix/store/p348jq73lnig5kkhayvsknz0svdnl54f-nixfmt-0.6.0-bin", + "path": "/nix/store/2l2llpvsabj5imdk3qn40qmyay82b6n6-nixfmt-0.6.0-bin", "default": true }, { "name": "doc", - "path": "/nix/store/5g0vpqjbapz6bwsp8s12nr1v1m72rq8r-nixfmt-0.6.0-doc" + "path": "/nix/store/s1sfkmjcm9hx7hfj0k4vlcgszfh1j9l1-nixfmt-0.6.0-doc" }, { "name": "out", - "path": "/nix/store/h21a39za77xcdyyvjb6rqcii6v3b2c3d-nixfmt-0.6.0" + "path": "/nix/store/5lbfakir32y91jv5dcjs79fd7sjnyjp2-nixfmt-0.6.0" } ], - "store_path": "/nix/store/p348jq73lnig5kkhayvsknz0svdnl54f-nixfmt-0.6.0-bin" + "store_path": "/nix/store/2l2llpvsabj5imdk3qn40qmyay82b6n6-nixfmt-0.6.0-bin" }, "x86_64-linux": { "outputs": [ { "name": "bin", - "path": "/nix/store/yw7xxl0kgha3f9gk4yn9sf0k9v45l26q-nixfmt-0.6.0-bin", + "path": "/nix/store/q89ix1xlmk94is3z81gvh8skfdh8kr0s-nixfmt-0.6.0-bin", "default": true }, { "name": "doc", - "path": "/nix/store/lpwpc0l6h5yl9xnppv4iibmpqch0w4nf-nixfmt-0.6.0-doc" + "path": "/nix/store/0v0axqfdisjsifzhavd9j4sn0pwnnynf-nixfmt-0.6.0-doc" }, { "name": "out", - "path": "/nix/store/qy77vfjf03rdw3vvb6h2pcz0nw54r1g2-nixfmt-0.6.0" + "path": "/nix/store/zs62cn4vvln3qgaw8cmjjli1861hqjzq-nixfmt-0.6.0" } ], - "store_path": "/nix/store/yw7xxl0kgha3f9gk4yn9sf0k9v45l26q-nixfmt-0.6.0-bin" + "store_path": "/nix/store/q89ix1xlmk94is3z81gvh8skfdh8kr0s-nixfmt-0.6.0-bin" } } }, "nodejs@latest": { - "last_modified": "2024-05-22T06:18:38Z", + "last_modified": "2024-06-18T11:39:17Z", "plugin_version": "0.0.2", - "resolved": "github:NixOS/nixpkgs/3f316d2a50699a78afe5e77ca486ad553169061e#nodejs_22", + "resolved": "github:NixOS/nixpkgs/56fc115880db6498245adecda277ccdb33025bc2#nodejs_22", "source": "devbox-search", - "version": "22.2.0", + "version": "22.3.0", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/rz5da1id31jgyax1yb6dms0mzpxkywds-nodejs-22.2.0", + "path": "/nix/store/ig6c5qlywzk9f4zwf4hdpnyyx91vyqyc-nodejs-22.3.0", "default": true }, { "name": "libv8", - "path": "/nix/store/5pa8xjwgg12gh137n51hg90fsh9m0dab-nodejs-22.2.0-libv8" + "path": "/nix/store/zg4vwp25r1v52vm2mxd6v64c1gr3jbj9-nodejs-22.3.0-libv8" } ], - "store_path": "/nix/store/rz5da1id31jgyax1yb6dms0mzpxkywds-nodejs-22.2.0" + "store_path": "/nix/store/ig6c5qlywzk9f4zwf4hdpnyyx91vyqyc-nodejs-22.3.0" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/dkg3sm7j61sfkpvg0bpi0hbjcccbg2wy-nodejs-22.2.0", + "path": "/nix/store/j2pwm80va47mfz7r5w1640rm6b9sp269-nodejs-22.3.0", "default": true }, { "name": "libv8", - "path": "/nix/store/xy685pkgmwsd5wkdzvsd56ip9kb66g68-nodejs-22.2.0-libv8" + "path": "/nix/store/j2lx401mqs3w7swg713irnnsfn88f8sx-nodejs-22.3.0-libv8" } ], - "store_path": "/nix/store/dkg3sm7j61sfkpvg0bpi0hbjcccbg2wy-nodejs-22.2.0" + "store_path": "/nix/store/j2pwm80va47mfz7r5w1640rm6b9sp269-nodejs-22.3.0" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/y8ns070yvn6ffbwzhmvk03lw7lh4ly02-nodejs-22.2.0", + "path": "/nix/store/3cqbw1xcmc0xml8s3ys7jviaxvqyjldy-nodejs-22.3.0", "default": true }, { "name": "libv8", - "path": "/nix/store/9z2a94v29m4jmq4b899i9mqgswizb7lx-nodejs-22.2.0-libv8" + "path": "/nix/store/zk7izr97gl525arvyi4mfwxnhx5wl7hx-nodejs-22.3.0-libv8" } ], - "store_path": "/nix/store/y8ns070yvn6ffbwzhmvk03lw7lh4ly02-nodejs-22.2.0" + "store_path": "/nix/store/3cqbw1xcmc0xml8s3ys7jviaxvqyjldy-nodejs-22.3.0" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/72m3szv59j74b12dmicmayvvlikh65qc-nodejs-22.2.0", + "path": "/nix/store/zklzfb51mxs8pqdpwh6h51jkir50hq54-nodejs-22.3.0", "default": true }, { "name": "libv8", - "path": "/nix/store/cwmjcfmrp2ry6d7xmm6zxcrc9qhbi22k-nodejs-22.2.0-libv8" + "path": "/nix/store/5dmd41abvjrw0chbz9m2yk27h61vpva9-nodejs-22.3.0-libv8" } ], - "store_path": "/nix/store/72m3szv59j74b12dmicmayvvlikh65qc-nodejs-22.2.0" + "store_path": "/nix/store/zklzfb51mxs8pqdpwh6h51jkir50hq54-nodejs-22.3.0" } } } diff --git a/flake.lock b/flake.lock index 95b9fd2..bb42ae9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1718183320, - "narHash": "sha256-L0b6hyf9EWeWKhmUwTQvbLtBtLBblyYJ3llOTsLIr0s=", + "lastModified": 1720746377, + "narHash": "sha256-9gcE46/YrNegm8VAwsDUvFEeEP56v4MudDy43IWz59Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7aa1c14402a09fc043110d6477aa5cc90e60e409", + "rev": "35f368cd5675e3b1ecdbf1f3f12e69bac9672bbb", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1720599442, + "narHash": "sha256-jdm+sKVbBXoyrxcHbVaV0htlpq2iFR+eJw3Xe/DPcDo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "cf297a8d248db6a455b60133f6c0029c04ebe50e", "type": "github" }, "original": { @@ -151,11 +151,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718207430, - "narHash": "sha256-/eO2NTRvrrdYWMI06plS8ANDGOhTZBA+C3H3KwbBI1w=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9e848e173ca83adf884815c66edc08652ef9ade8", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -215,27 +215,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718060059, - "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", + "lastModified": 1720553833, + "narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", + "rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1718149104, - "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", + "lastModified": 1720657034, + "narHash": "sha256-nPhbeFdyN8yn+EXmnPcBWisoypndtQbNIhSKmAinv3E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", + "rev": "212defe037698e18fc9521dfe451779a8979844c", "type": "github" }, "original": { diff --git a/home-manager/default.nix b/home-manager/default.nix index 792f839..b053d57 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -7,10 +7,12 @@ let overlays = import ./overlay.nix { inherit emacs-overlay; }; }; basicPkgs = import ./packages/basic.nix { inherit pkgs; }; + advancedPkgs = import ./packages/advanced.nix { inherit pkgs; }; darwinPkgs = import ./packages/darwin { inherit pkgs; }; nixosPkgs = import ./packages/nixos { inherit pkgs; }; in { home.stateVersion = "24.11"; - home.packages = basicPkgs ++ lib.optionals pkgs.stdenv.isDarwin darwinPkgs + home.packages = basicPkgs ++ advancedPkgs + ++ lib.optionals pkgs.stdenv.isDarwin darwinPkgs ++ lib.optionals pkgs.stdenv.isLinux nixosPkgs; } diff --git a/home-manager/minimum.nix b/home-manager/minimum.nix new file mode 100644 index 0000000..ed34ae1 --- /dev/null +++ b/home-manager/minimum.nix @@ -0,0 +1,3 @@ +{ pkgs }: +let basicPkgs = import ./packages/basic.nix { inherit pkgs; }; +in basicPkgs diff --git a/home-manager/packages/advanced.nix b/home-manager/packages/advanced.nix new file mode 100644 index 0000000..4b32322 --- /dev/null +++ b/home-manager/packages/advanced.nix @@ -0,0 +1,25 @@ +{ pkgs }: +with pkgs; [ + # for cloud tools + awscli + + # for network tools + speedtest-cli + + # for password tools + pwgen + (pass.withExtensions (extensions: with extensions; [ pass-otp ])) + + # for DB + mysql + + # for jokes + asciiquarium + cmatrix + fastfetch + genact + sl + + # for ai + ollama +] diff --git a/home-manager/packages/basic.nix b/home-manager/packages/basic.nix index 5d8b243..2b1dcee 100644 --- a/home-manager/packages/basic.nix +++ b/home-manager/packages/basic.nix @@ -10,6 +10,7 @@ with pkgs; [ eza fd gnupg + lnav nkf offlineimap openssl @@ -33,12 +34,6 @@ with pkgs; [ git tig - # for cloud tools - awscli - - # for network tools - speedtest-cli - # for password tools pwgen (pass.withExtensions (extensions: with extensions; [ pass-otp ])) @@ -51,17 +46,4 @@ with pkgs; [ # for shell fish - - # for DB - mysql - - # for jokes - asciiquarium - cmatrix - fastfetch - genact - sl - - # for ai - ollama ] diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix index de2cefa..58031a9 100644 --- a/nix-darwin/default.nix +++ b/nix-darwin/default.nix @@ -14,8 +14,7 @@ services.nix-daemon.enable = true; fonts = { - fontDir.enable = true; - fonts = with pkgs; [ + packages = with pkgs; [ noto-fonts noto-fonts-lgc-plus noto-fonts-cjk-sans @@ -58,16 +57,15 @@ }; casks = [ "aquaskk" + "discord" "drawio" - "docker" "google-chrome" "keycastr" + "orbstack" "raycast" "sequel-ace" - "sublime-text" - "discord" - "raycast" "slack" + "sublime-text" ]; masApps = { Xcode = 497799835; diff --git a/nix-on-droid/default.nix b/nix-on-droid/default.nix index 4378b74..986ce89 100644 --- a/nix-on-droid/default.nix +++ b/nix-on-droid/default.nix @@ -1,71 +1,8 @@ -{ config, lib, pkgs, ... }: { +{ pkgs, ... }: +let minimum = import ../home-manager/minimum.nix { inherit pkgs; }; +in { environment = { - packages = with pkgs; [ - # for terminal tools - bat - bottom - devbox - direnv - du-dust - extract_url - eza - fd - gnupg - nkf - offlineimap - openssl - peco - pv - ripgrep - rlwrap - tmux - tree - unixtools.procps - unixtools.watch - wget - - # for query - csvq - jq - yq - - # for git - ghq - git - tig - - # for cloud tools - awscli - - # for network tools - speedtest-cli - - # for password tools - pwgen - (pass.withExtensions (extensions: with extensions; [ pass-otp ])) - - # for editor - editorconfig-core-c - tree-sitter - (tree-sitter.withPlugins (p: builtins.attrValues p)) - neovim - - # for shell - fish - - # for DB - mysql - - # for jokes - asciiquarium - cmatrix - fastfetch - genact - sl - - # for ai - ollama - ]; + packages = minimum; etcBackupExtension = ".bak"; };