diff --git a/Justfile b/Justfile index a88d6a32..0219d873 100644 --- a/Justfile +++ b/Justfile @@ -151,6 +151,15 @@ fe mode="default": darwin-build "fern" {{mode}}; darwin-switch "fern" {{mode}} +# Depoly to frieren(macOS host) +[macos] +[group('desktop')] +fr mode="default": + #!/usr/bin/env nu + use {{utils_nu}} *; + darwin-build "frieren" {{mode}}; + darwin-switch "frieren" {{mode}} + # Reset launchpad to force it to reindex Applications [macos] [group('desktop')] diff --git a/flake.lock b/flake.lock index 9828fa8a..e807825b 100644 --- a/flake.lock +++ b/flake.lock @@ -811,10 +811,10 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1745976528, - "narHash": "sha256-sSZody5LjLOpZtz2dECYkk84CRJTjZ+JoayRU/18McQ=", + "lastModified": 1747114916, + "narHash": "sha256-xrrY4XKcKO6QNISJ5BWJvHZ+Rwc5NZah+Nyie9yjuaE=", "ref": "refs/heads/main", - "rev": "5e2286ac731d7ae29f804e7ba7153d9419d48a84", + "rev": "cf42f385cfcdded990749c7e1c95368a2a166f81", "shallow": true, "type": "git", "url": "ssh://git@github.com/ryan4yin/nix-secrets.git" diff --git a/home/base/tui/editors/neovim/nvim/lazy-lock.json b/home/base/tui/editors/neovim/nvim/lazy-lock.json index a1216de9..a1b1278f 100644 --- a/home/base/tui/editors/neovim/nvim/lazy-lock.json +++ b/home/base/tui/editors/neovim/nvim/lazy-lock.json @@ -1,141 +1,105 @@ { "AstroNvim": { "branch": "main", "commit": "c5e610f614e74c9dd9bf11760c4d0ad2c98c0abe" }, "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "SchemaStore.nvim": { "branch": "main", "commit": "992285058ce208825eb1b9ac82fa6be7d76ffcc1" }, + "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, + "SchemaStore.nvim": { "branch": "main", "commit": "df87d16fc4ea7c2c67cfc00b513861738693fe07" }, "aerial.nvim": { "branch": "master", "commit": "3284a2cb858ba009c79da87d5e010ccee3c99c4d" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "astrocommunity": { "branch": "main", "commit": "36bf02cccc208c677e2f70ca53c9a0db7c8dfd77" }, + "astrocommunity": { "branch": "main", "commit": "e56d7b3c52cb496780a901123705d7824914642b" }, "astrocore": { "branch": "main", "commit": "44a3dc0bf1591022b2a6bc89dccdfac1be17bec9" }, "astrolsp": { "branch": "main", "commit": "909fbe64f3f87d089ff3777751261544557117cc" }, "astrotheme": { "branch": "main", "commit": "f12dcf64b1f9a05839c3ac2146f550f43bae9dab" }, "astroui": { "branch": "main", "commit": "e923a84c488d879a260fc9cfb2dc27dd870fb6ac" }, "autosave.nvim": { "branch": "main", "commit": "348f72cf0241e3e736e3396c4834def2f8ef8d10" }, - "avante.nvim": { "branch": "main", "commit": "54a1df28b67a97e0f05ad33808bea6c1abae7ea9" }, - "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, - "clangd_extensions.nvim": { - "branch": "main", - "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" - }, - "cmake-tools.nvim": { "branch": "master", "commit": "a5d5bf0a93bb96085502334a5036fc054ad9cf33" }, + "avante.nvim": { "branch": "main", "commit": "aae4cc4014149e544fb00e78687bcdef8335dd10" }, + "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" }, + "cmake-tools.nvim": { "branch": "master", "commit": "1ee065c33ca777c0e03cd7c358010202ee70bb88" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" }, "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conjure": { "branch": "main", "commit": "980452d93fd6165d3f268f50a181ad7ca4c7b990" }, - "crates.nvim": { "branch": "main", "commit": "73d2c590c74a0c582144987a4decb4a642755859" }, + "conjure": { "branch": "main", "commit": "9fad07b07c41f77c5cc8b5659101eca091d5aefa" }, + "crates.nvim": { "branch": "main", "commit": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397" }, "deno-nvim": { "branch": "master", "commit": "5a2f9205df5539c4a0696e73893bf8d1b0cae406" }, "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "b62a34f5e4fbf36dd4c6d29920a61451eecd04ed" }, + "fzf-lua": { "branch": "main", "commit": "b45881a2043d96506ba628f3bc65a4594b179c4e" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, "gopher.nvim": { "branch": "main", "commit": "9db5931af1293ae52500921d92c02145d86df02c" }, "goto-preview": { "branch": "main", "commit": "d1faf6ea992b5bcaaaf2c682e1aba3131a01143e" }, "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" }, "heirline.nvim": { "branch": "master", "commit": "cc359b628266cb9a84b2d71c883f2b99e16473a0" }, "img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" }, - "indent-blankline.nvim": { - "branch": "master", - "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" - }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, - "leap.nvim": { "branch": "main", "commit": "8a0efa79133fee211017d769c8031512192008b3" }, - "lsp_signature.nvim": { - "branch": "master", - "commit": "15bb33cdb47e85278e168cad11acb1b6fa9c6488" - }, + "leap.nvim": { "branch": "main", "commit": "2b68ddc0802bd295e64c9e2e75f18f755e50dbcc" }, + "lsp_signature.nvim": { "branch": "master", "commit": "a4e3c15dfdce8783c074539b1835edae75fa63d5" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, - "markdown-preview.nvim": { - "branch": "main", - "commit": "462ce41af003f5cdadab856f3a42dc27e39b89c8" - }, - "mason-lspconfig.nvim": { - "branch": "main", - "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" - }, + "markdown-preview.nvim": { "branch": "main", "commit": "462ce41af003f5cdadab856f3a42dc27e39b89c8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" }, "mini.bufremove": { "branch": "main", "commit": "285bdac9596ee7375db50c0f76ed04336dcd2685" }, "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, - "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, + "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, "neoconf.nvim": { "branch": "main", "commit": "f630568a4d04154803886f21ca60923f12709f0f" }, - "nfnl": { "branch": "main", "commit": "c0e153c8c63926647a70b90cc2c98897278f53c8" }, + "nfnl": { "branch": "main", "commit": "6bcfdc4ab9f23c381590d78fa55ee79abebbe9c5" }, "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, - "nvim-colorizer.lua": { - "branch": "master", - "commit": "517df88cf2afb36652830df2c655df2da416a0ae" - }, + "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" }, "nvim-dap": { "branch": "master", "commit": "6a5bba0ddea5d419a783e170c20988046376090d" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, - "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, + "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, - "nvim-jdtls": { "branch": "master", "commit": "7223b812dde98f4260084fe9303c8301b9831a58" }, - "nvim-lsp-file-operations": { - "branch": "master", - "commit": "9744b738183a5adca0f916527922078a965515ed" - }, + "nvim-jdtls": { "branch": "master", "commit": "c23f200fee469a415c77265ca55b496feb646992" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, "nvim-lspconfig": { "branch": "master", "commit": "185b2af444b27d6541c02d662b5b68190e5cf0c4" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" }, "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" }, - "nvim-spectre": { "branch": "master", "commit": "ddd7383e856a7c939cb4f5143278fe041bbb8cb9" }, - "nvim-spider": { "branch": "main", "commit": "be2ad4067bff11cd4b00be89d7034d5fd85aa96d" }, + "nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" }, + "nvim-spider": { "branch": "main", "commit": "9228ef94ca4e754ec90bcdeb8a5f552fa15ba8dc" }, "nvim-treesitter": { "branch": "master", "commit": "f8aaf5ce4e27cd20de917946b2ae5c968a2c2858" }, - "nvim-treesitter-textobjects": { - "branch": "master", - "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" - }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-ts-context-commentstring": { - "branch": "main", - "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" - }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "nvim-ufo": { "branch": "main", "commit": "61463090a4f55f5d080236ea62f09d1cd8976ff3" }, - "nvim-vtsls": { "branch": "main", "commit": "b1f2dfc1ed21d741ebbc211fe02f830ea4545f09" }, + "nvim-vtsls": { "branch": "main", "commit": "60b493e641d3674c030c660cabe7a2a3f7a914be" }, "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, - "orgmode": { "branch": "master", "commit": "e66a64183e211842c195f34fd6dcb97d7b534812" }, - "package-info.nvim": { "branch": "master", "commit": "3e8914a77668c780fc5ef8b0fbcf3747dfcf6ec5" }, + "orgmode": { "branch": "master", "commit": "8ff03c75f3d808e3ea1765b7aba0fb4783a5a83f" }, + "package-info.nvim": { "branch": "master", "commit": "4f1b8287dde221153ec9f2acd46e8237d2d0881e" }, "parinfer-rust": { "branch": "master", "commit": "55bec1e3d4f127527c5c2e507fac96cc934aed6e" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "refactoring.nvim": { "branch": "master", "commit": "2be7ea3f10b7e59658f5abf6dffc50b5d61964d6" }, - "render-markdown.nvim": { - "branch": "main", - "commit": "a2c2493c21cf61e5554ee8bc83da75bd695921da" - }, + "render-markdown.nvim": { "branch": "main", "commit": "a1b0988f5ab26698afb56b9c2f0525a4de1195c1" }, "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" }, - "rustaceanvim": { "branch": "master", "commit": "3f327d15a3c1ed48b1e1087e16873a28a39768c2" }, + "rustaceanvim": { "branch": "master", "commit": "01b28c60abde5cb79c0129e66c465699e78b0e6d" }, "sentiment.nvim": { "branch": "main", "commit": "54a6db15b630eccfa98c32a76baf90f21c6f1e40" }, "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" }, - "telescope-fzf-native.nvim": { - "branch": "main", - "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" - }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a17d611a0e111836a1db5295f04945df407c5135" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tree-sitter-nu": { "branch": "main", "commit": "d5c71a10b4d1b02e38967b05f8de70e847448dd1" }, - "treesj": { "branch": "main", "commit": "f4049f8ba2177e7c5c03fb9e34d4e039c685d744" }, + "treesj": { "branch": "main", "commit": "3b4a2bc42738a63de17e7485d4cc5e49970ddbcc" }, "tsc.nvim": { "branch": "main", "commit": "5bd25bb5c399b6dc5c00392ade6ac6198534b53a" }, - "venv-selector.nvim": { - "branch": "regexp", - "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" - }, + "venv-selector.nvim": { "branch": "regexp", "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" }, "vim-illuminate": { "branch": "master", "commit": "19cb21f513fc2b02f0c66be70107741e837516a1" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, - "vim-wakatime": { "branch": "master", "commit": "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d" }, + "vim-wakatime": { "branch": "master", "commit": "7b53ba7882ba28b91b571fa4ffb2755378086837" }, "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }, "yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" } } diff --git a/home/darwin/aerospace/aerospace.toml b/home/darwin/aerospace/aerospace.toml index a1fefe8d..232f0013 100644 --- a/home/darwin/aerospace/aerospace.toml +++ b/home/darwin/aerospace/aerospace.toml @@ -203,8 +203,19 @@ run = 'move-node-to-workspace 1Kitty' if.app-id = 'org.alacritty' run = 'move-node-to-workspace 2Alacritty' + +# [[on-window-detected]] +# if.app-id = 'com.tencent.WeWorkMac' +# run = 'move-node-to-workspace 3Work' + [[on-window-detected]] -if.app-id = 'com.tencent.WeWorkMac' +# if.app-id = 'com.tencent.WeWorkMac' +if.app-id = 'com.tinyspeck.slackmacgap' +run = 'move-node-to-workspace 3Work' + + +[[on-window-detected]] +if.app-id = 'us.zoom.xos' run = 'move-node-to-workspace 3Work' [[on-window-detected]] @@ -267,13 +278,13 @@ run = ['layout floating', 'move-node-to-workspace 0Other'] # ================================================================= [workspace-to-monitor-force-assignment] -1Kitty = 'secondary' # Non-main monitor in case when there are only two monitors' +1Kitty = 'main' # Non-main monitor in case when there are only two monitors' 2Alacritty = 'main' # "Main" monitor ("main" as in System Settings → Displays → Use as) -3Work = 'main' +3Work = ['secondary', 'main'] 4Firefox = 'main' -5Chrome = 'secondary' -6Chat = 'main' -7Music = 'main' +5Chrome = 'main' +6Chat = ['secondary', 'main'] +7Music = ['secondary', 'main'] 8Mail = 'main' 9File = 'main' 0Other = 'main' diff --git a/hosts/darwin-fern/default.nix b/hosts/darwin-fern/default.nix index 5f5b423b..fd6293b9 100644 --- a/hosts/darwin-fern/default.nix +++ b/hosts/darwin-fern/default.nix @@ -1,7 +1,7 @@ _: ############################################################# # -# Fern - MacBook Pro 2022 13-inch M2 16G, mainly for business. +# Fern - MacBook Pro 2022 13-inch M2 16G. # ############################################################# let diff --git a/hosts/darwin-frieren/default.nix b/hosts/darwin-frieren/default.nix new file mode 100644 index 00000000..5569e240 --- /dev/null +++ b/hosts/darwin-frieren/default.nix @@ -0,0 +1,13 @@ +_: +############################################################# +# +# Fern - MacBook Pro 2024 14-inch M4 Pro 48G, mainly for business. +# +############################################################# +let + hostname = "frieren"; +in { + networking.hostName = hostname; + networking.computerName = hostname; + system.defaults.smb.NetBIOSName = hostname; +} diff --git a/hosts/darwin-frieren/home.nix b/hosts/darwin-frieren/home.nix new file mode 100644 index 00000000..fd84ef99 --- /dev/null +++ b/hosts/darwin-frieren/home.nix @@ -0,0 +1,14 @@ +{ + programs.ssh = { + enable = true; + extraConfig = '' + Host github.com + Hostname github.com + # github is controlled by frieren~ + IdentityFile ~/.ssh/frieren + # Specifies that ssh should only use the identity file explicitly configured above + # required to prevent sending default identity files first. + IdentitiesOnly yes + ''; + }; +} diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix index 88c9ec5d..9f549a35 100644 --- a/modules/darwin/apps.nix +++ b/modules/darwin/apps.nix @@ -109,15 +109,9 @@ in { masApps = { # Xcode = 497799835; Wechat = 836500024; - QQ = 451108668; - # WeCom = 1189898970; # Wechat for Work - TecentMeeting = 1484048379; - QQMusic = 595615424; }; taps = [ - "homebrew/services" - "hashicorp/tap" "nikitabobko/tap" # aerospace - an i3-like tiling window manager for macOS "FelixKratz/formulae" # janky borders - highlight active window borders @@ -157,8 +151,8 @@ in { "firefox" "google-chrome" "visual-studio-code" - "zed" # zed editor - "cursor" # an AI code editor + # "zed" # zed editor + # "cursor" # an AI code editor "aerospace" # an i3-like tiling window manager for macOS "ghostty" # terminal emulator @@ -167,20 +161,23 @@ in { # IM & audio & remote desktop & meeting "telegram" + "qq" + "qqmusic" # "discord" # update too frequently, use the web version instead "microsoft-remote-desktop" - "moonlight" # remote desktop client - "rustdesk" # meeting + # "moonlight" # remote desktop client + # "rustdesk" # meeting + # "tencent-meeting" "zoom" # meeting # Misc # "shadowsocksx-ng" # proxy tool "iina" # video player - "raycast" # (HotKey: alt/option + space)search, calculate and run scripts(with many plugins) + # "raycast" # (HotKey: alt/option + space)search, calculate and run scripts(with many plugins) "stats" # beautiful system status monitor in menu bar # "reaper" # audio editor - "sonic-pi" # music programming - "tencent-lemon" # macOS cleaner + # "sonic-pi" # music programming + # "tencent-lemon" # macOS cleaner "neteasemusic" # music "blender@lts" # 3D creation suite "mihomo-party" # transparent proxy tool diff --git a/modules/darwin/nix-core.nix b/modules/darwin/nix-core.nix index 0ff35ac5..0b12ea73 100644 --- a/modules/darwin/nix-core.nix +++ b/modules/darwin/nix-core.nix @@ -12,6 +12,10 @@ # ################################################################################### + # Determinate uses its own daemon to manage the Nix installation that + # conflicts with nix-darwin's native Nix management. so we should disable this option. + nix.enable = false; + # Disable auto-optimise-store because of this issue: # https://github.com/NixOS/nix/issues/7273 # "error: cannot link '/nix/store/.tmp-link-xxxxx-xxxxx' to '/nix/store/.links/xxxx': File exists" diff --git a/outputs/aarch64-darwin/src/frieren.nix b/outputs/aarch64-darwin/src/frieren.nix new file mode 100644 index 00000000..e3d844a4 --- /dev/null +++ b/outputs/aarch64-darwin/src/frieren.nix @@ -0,0 +1,35 @@ +{ + # NOTE: the args not used in this file CAN NOT be removed! + # because haumea pass argument lazily, + # and these arguments are used in the functions like `mylib.nixosSystem`, `mylib.colmenaSystem`, etc. + inputs, + lib, + mylib, + myvars, + system, + genSpecialArgs, + ... +} @ args: let + name = "frieren"; + + modules = { + darwin-modules = + (map mylib.relativeToRoot [ + # common + "secrets/darwin.nix" + "modules/darwin" + # host specific + "hosts/darwin-${name}" + ]) + ++ []; + home-modules = map mylib.relativeToRoot [ + "hosts/darwin-${name}/home.nix" + "home/darwin" + ]; + }; + + systemArgs = modules // args; +in { + # macOS's configuration + darwinConfigurations.${name} = mylib.macosSystem systemArgs; +} diff --git a/secrets/README.md b/secrets/README.md index 909cde75..bc28f589 100644 --- a/secrets/README.md +++ b/secrets/README.md @@ -56,7 +56,6 @@ let # If you do not have this file, you can generate all the host keys by command: # sudo ssh-keygen -A idol_ai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINHZtzeaQyXwuRMLzoOAuTu8P9bu5yc5MBwo5LI3iWBV root@ai"; - harmonica = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINT7Pgy/Yl+t6UkHp5+8zfeyJqeJ8EndyR1Vjf/XBe5f root@harmonica"; fern = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMokXUYcUy7tysH4tRR6pevFjyOP4cXMjpBSgBZggm9X root@fern"; # A key for recovery purpose, generated by `ssh-keygen -t ed25519 -a 256 -C "ryan@agenix-recovery"` with a strong passphrase @@ -64,7 +63,6 @@ let recovery_key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHnIGH+653Oe+GQaA8zjjj7HWMWp7bWXed4q5KqY4nqG ryan@agenix-recovery"; systems = [ idol_ai - harmonica fern recovery_key diff --git a/vars/default.nix b/vars/default.nix index af1f85dc..272676ca 100644 --- a/vars/default.nix +++ b/vars/default.nix @@ -20,6 +20,6 @@ sshAuthorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIKlN+Q/GxvwxDX/OAjJHaNFEznEN4Tw4E4TwqQu/eD6 ryan@idols-ai" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFIznBmtZlMcVUL+uPFltLTNa8Y1J0aT1E36AXQV07su ryan@fern" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPwZ9MdotnyhxIJrI4gmVshExHiZOx+FGFhcW7BaYkfR ryan@harmonica" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc1PNTXzzvd93E+e9LXvnEzqgUI5gMTEF/IitvzgmL+ ryan@frieren" ]; }