From efd7b1e8101951a85bac7b55d082aa17e9f760a3 Mon Sep 17 00:00:00 2001 From: Poby <87608318+smg1024@users.noreply.github.com> Date: Mon, 11 May 2026 20:59:04 +0900 Subject: [PATCH] fix: remove mise as package manager natively install node, bun, uv --- flake.lock | 109 ++++++++----------------- flake.nix | 16 +--- modules/aspects/_cli-tools/bun.nix | 3 + modules/aspects/_cli-tools/default.nix | 6 +- modules/aspects/_cli-tools/mise.nix | 17 ---- modules/aspects/_cli-tools/npm.nix | 15 ++++ modules/aspects/_cli-tools/uv.nix | 3 + modules/aspects/_shell/zsh.nix | 1 - modules/aspects/desktop.nix | 3 +- modules/aspects/fenrir.nix | 2 +- modules/aspects/homebrew.nix | 29 +++---- 11 files changed, 79 insertions(+), 125 deletions(-) create mode 100644 modules/aspects/_cli-tools/bun.nix delete mode 100644 modules/aspects/_cli-tools/mise.nix create mode 100644 modules/aspects/_cli-tools/npm.nix create mode 100644 modules/aspects/_cli-tools/uv.nix diff --git a/flake.lock b/flake.lock index 8aa3ac1..6304df3 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1774235677, - "narHash": "sha256-0ryNYmzDAeRlrzPTAgmzGH/Cgc8iv/LBN6jWGUANvIk=", + "lastModified": 1778146321, + "narHash": "sha256-HeBwuJmuBioZHyZqDOcf7W/xsMFupSD583v6I5Cl7a8=", "owner": "Homebrew", "repo": "brew", - "rev": "894a3d23ac0c8aaf561b9874b528b9cb2e839201", + "rev": "af835384ac574f76025adb38b292b04cecee1f1f", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "5.1.1", + "ref": "5.1.10", "repo": "brew", "type": "github" } @@ -24,16 +24,15 @@ ] }, "locked": { - "lastModified": 1772129556, - "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=", + "lastModified": 1777780666, + "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "ebec37af18215214173c98cf6356d0aca24a2585", + "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777", "type": "github" }, "original": { "owner": "nix-darwin", - "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } @@ -59,11 +58,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -100,52 +99,19 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1778444552, + "narHash": "sha256-f18pIiR9q/p1vHY93gmAum7aHhQOG49oGvAB9+lptRo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "dcebe66f958673729896eec2de4abfd86ef22d21", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, - "homebrew-cask": { - "flake": false, - "locked": { - "lastModified": 1776349441, - "narHash": "sha256-sPW2azc9C0OVmljFhq7fD9U3VEleGpDDp5kLoeXeb98=", - "owner": "homebrew", - "repo": "homebrew-cask", - "rev": "b72ceb562b44d72ccdf03cb7f3880e8d12612fd2", - "type": "github" - }, - "original": { - "owner": "homebrew", - "repo": "homebrew-cask", - "type": "github" - } - }, - "homebrew-core": { - "flake": false, - "locked": { - "lastModified": 1776347370, - "narHash": "sha256-L7aOcWUBn4Jh67nPGMXKbwY0gZva9gj85ge4Rgp4F38=", - "owner": "homebrew", - "repo": "homebrew-core", - "rev": "78157d31ba2c8d2319fd6ca1cebde6c3018fa06c", - "type": "github" - }, - "original": { - "owner": "homebrew", - "repo": "homebrew-core", - "type": "github" - } - }, "import-tree": { "locked": { "lastModified": 1773693634, @@ -163,11 +129,11 @@ }, "mnw": { "locked": { - "lastModified": 1770419553, - "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", + "lastModified": 1777828893, + "narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=", "owner": "Gerg-L", "repo": "mnw", - "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", + "rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b", "type": "github" }, "original": { @@ -184,11 +150,11 @@ ] }, "locked": { - "lastModified": 1768214250, - "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "lastModified": 1776882296, + "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=", "owner": "feel-co", "repo": "ndg", - "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", + "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e", "type": "github" }, "original": { @@ -203,11 +169,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1774720267, - "narHash": "sha256-YYftFe8jyfpQI649yfr0E+dqEXE2jznZNcYvy/lKV1U=", + "lastModified": 1778332591, + "narHash": "sha256-ctJ3ADtugrnbMfMBobA645gCqXVIyHnsCNMkVaIuSiM=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "a7760a3a83f7609f742861afb5732210fdc437ed", + "rev": "7d0038b5bb60568ec41f5f4ef5067cd221ca7c0d", "type": "github" }, "original": { @@ -218,27 +184,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776237196, - "narHash": "sha256-ZsBow5uHrhwW2UhqiVlO0DW3P07TtCy786mZvwzQj4M=", + "lastModified": 1778458615, + "narHash": "sha256-cY07EsdhBJ8tFXPzDYevgqxRev9ZLxFonuq9wmq5kwg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "817d1a3f570e604a3cad52c27eabc92af705db60", + "rev": "c6e5ca3c836a5f4dd9af9f2c1fc1c38f0fac988a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-25.11-darwin", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -259,11 +225,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1776331518, - "narHash": "sha256-Hj6Rqmyv7f2CkQN4f3NLnK0VUJM/ypfHIrkGckA4WQA=", + "lastModified": 1778408907, + "narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=", "owner": "notashelf", "repo": "nvf", - "rev": "39416a521dbbc3b722de1bb3607cddaa1e698f4a", + "rev": "e86a92e4b29b499e5f1285b737b7612115103da9", "type": "github" }, "original": { @@ -277,14 +243,9 @@ "darwin": "darwin", "flake-parts": "flake-parts", "home-manager": "home-manager", - "homebrew-cask": "homebrew-cask", - "homebrew-core": "homebrew-core", "import-tree": "import-tree", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs", - "nixpkgs-darwin": [ - "nixpkgs" - ], "nvf": "nvf", "sops-nix": "sops-nix" } @@ -296,11 +257,11 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 78386be..cecad8e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,33 +2,23 @@ description = "Nix for Poby's MacOS"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-25.11-darwin"; - nixpkgs-darwin.follows = "nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; + url = "github:nix-darwin/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-homebrew.url = "github:zhaofengli/nix-homebrew"; - homebrew-core = { - url = "github:homebrew/homebrew-core"; - flake = false; - }; - homebrew-cask = { - url = "github:homebrew/homebrew-cask"; - flake = false; - }; - nvf = { url = "github:notashelf/nvf"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/aspects/_cli-tools/bun.nix b/modules/aspects/_cli-tools/bun.nix new file mode 100644 index 0000000..71c28a4 --- /dev/null +++ b/modules/aspects/_cli-tools/bun.nix @@ -0,0 +1,3 @@ +{ + programs.bun.enable = true; +} diff --git a/modules/aspects/_cli-tools/default.nix b/modules/aspects/_cli-tools/default.nix index 981d339..b437889 100644 --- a/modules/aspects/_cli-tools/default.nix +++ b/modules/aspects/_cli-tools/default.nix @@ -1,13 +1,15 @@ {...}: { imports = [ - ./zoxide.nix ./bat.nix + ./bun.nix ./eza.nix ./fd.nix ./fzf.nix ./jq.nix ./lazygit.nix - ./mise.nix + ./npm.nix ./ripgrep.nix + ./uv.nix + ./zoxide.nix ]; } diff --git a/modules/aspects/_cli-tools/mise.nix b/modules/aspects/_cli-tools/mise.nix deleted file mode 100644 index d5fa8ce..0000000 --- a/modules/aspects/_cli-tools/mise.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - programs.mise = { - enable = true; - - globalConfig = { - tools = { - node = "lts"; - uv = "latest"; - python = "3.13"; - }; - settings = { - experimental = true; - env_file = ".env"; - }; - }; - }; -} diff --git a/modules/aspects/_cli-tools/npm.nix b/modules/aspects/_cli-tools/npm.nix new file mode 100644 index 0000000..0815ece --- /dev/null +++ b/modules/aspects/_cli-tools/npm.nix @@ -0,0 +1,15 @@ +{ + config, + pkgs, + ... +}: { + programs.npm = { + enable = true; + package = pkgs.nodejs_24; + settings.prefix = "${config.home.homeDirectory}/.npm"; + }; + + home.sessionPath = [ + "${config.home.homeDirectory}/.npm/bin" + ]; +} diff --git a/modules/aspects/_cli-tools/uv.nix b/modules/aspects/_cli-tools/uv.nix new file mode 100644 index 0000000..076beb0 --- /dev/null +++ b/modules/aspects/_cli-tools/uv.nix @@ -0,0 +1,3 @@ +{ + programs.uv.enable = true; +} diff --git a/modules/aspects/_shell/zsh.nix b/modules/aspects/_shell/zsh.nix index 2a5dc0a..0de6c05 100755 --- a/modules/aspects/_shell/zsh.nix +++ b/modules/aspects/_shell/zsh.nix @@ -42,7 +42,6 @@ "vi-mode" "zoxide" "eza" - "mise" ]; }; }; diff --git a/modules/aspects/desktop.nix b/modules/aspects/desktop.nix index 0ebe2e6..13d7900 100644 --- a/modules/aspects/desktop.nix +++ b/modules/aspects/desktop.nix @@ -2,7 +2,8 @@ repo.homeModules.desktop = { programs.aerospace = { enable = true; - userSettings = { + launchd.enable = true; + settings = { start-at-login = true; accordion-padding = 10; default-root-container-layout = "tiles"; diff --git a/modules/aspects/fenrir.nix b/modules/aspects/fenrir.nix index 5585365..f1ebea2 100644 --- a/modules/aspects/fenrir.nix +++ b/modules/aspects/fenrir.nix @@ -1,7 +1,7 @@ {...}: { repo.homeModules.fenrir = { programs = { - aerospace.userSettings.workspace-to-monitor-force-assignment = { + aerospace.settings.workspace-to-monitor-force-assignment = { "1" = ["secondary" "main"]; "2" = ["secondary" "main"]; "3" = ["secondary" "main"]; diff --git a/modules/aspects/homebrew.nix b/modules/aspects/homebrew.nix index 8f2b98e..502b60b 100644 --- a/modules/aspects/homebrew.nix +++ b/modules/aspects/homebrew.nix @@ -1,22 +1,21 @@ -{inputs, ...}: { +{...}: { flake.modules.darwin.homebrew = {config, ...}: { nix-homebrew = { enable = true; enableRosetta = true; user = config.repo.user.name; - taps = { - "homebrew/homebrew-core" = inputs.homebrew-core; - "homebrew/homebrew-cask" = inputs.homebrew-cask; - }; - mutableTaps = false; + mutableTaps = true; }; homebrew = { enable = true; onActivation = { - autoUpdate = true; + autoUpdate = false; cleanup = "zap"; + extraFlags = [ + "--verbose" + ]; }; masApps = { @@ -25,26 +24,24 @@ Bitwarden = 1352778147; }; - taps = builtins.attrNames config.nix-homebrew.taps; - brews = [ "gemini-cli" ]; casks = [ - "batfi" - "hammerspoon" - "shottr" "arc" + "batfi" + "claude-code@latest" "codex" - "claude-code" - "telegram" - "raycast" + "hammerspoon" + "iina" "jordanbaird-ice" "keka" "kekaexternalhelper" + "raycast" + "shottr" "stats" - "iina" + "telegram" "utm" ]; };