diff options
| author | Fuwn <[email protected]> | 2024-12-11 15:58:04 -0800 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2024-12-11 16:11:45 -0800 |
| commit | 8fc491a1919c152cad9f17c14647c170daf93b9f (patch) | |
| tree | a7b37c845bcce87fda90e55ed88c6c8fc2440428 | |
| parent | lock: tsutsumi (diff) | |
| download | nixos-config-8fc491a1919c152cad9f17c14647c170daf93b9f.tar.xz nixos-config-8fc491a1919c152cad9f17c14647c170daf93b9f.zip | |
host: nara
| -rw-r--r-- | flake.lock | 522 | ||||
| -rw-r--r-- | flake.nix | 105 | ||||
| -rw-r--r-- | hosts/default.nix | 1 | ||||
| -rw-r--r-- | hosts/nara/default.nix | 51 |
4 files changed, 600 insertions, 79 deletions
@@ -84,6 +84,23 @@ "type": "github" } }, + "brew-src": { + "flake": false, + "locked": { + "lastModified": 1731323744, + "narHash": "sha256-SxUQm4cTHcaoPQHoXe26ZV8cZiMWBGow8MjE4L+MckM=", + "owner": "Homebrew", + "repo": "brew", + "rev": "254bf3fe9d8fa2e1b2fb55dbcf535b2d870180c4", + "type": "github" + }, + "original": { + "owner": "Homebrew", + "ref": "4.4.5", + "repo": "brew", + "type": "github" + } + }, "cachix": { "inputs": { "devenv": [ @@ -207,6 +224,67 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1733950326, + "narHash": "sha256-nUTutqzg/Z0eEXrC1ACTa4a9Ik5Iyxgqo8uL9DYib7I=", + "rev": "657395244a854da1bc71e38454958ecd57c0e241", + "revCount": 165, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.165%2Brev-657395244a854da1bc71e38454958ecd57c0e241/0193b781-6c27-7703-bca6-fc9648fca81d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/0.1" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-I03XaJRNQHh/N3ea2qpMU78DahTm7tSfF+urRABhKiQ=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-yxF7hyInOc+S1BEaxjLBLHUFjSAjC0bRKh0glUt4ilo=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-/LPSCwR/ueorahCcyUSVym3y3lnRXkc6pqWwW2T/yT8=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/x86_64-linux" + } + }, "devenv": { "inputs": { "cachix": [ @@ -215,7 +293,7 @@ "flake-compat": [ "flake-compat" ], - "nix": "nix", + "nix": "nix_3", "nixpkgs": [ "nixpkgs" ], @@ -312,9 +390,48 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ "devenv", "nix", "nixpkgs" @@ -334,7 +451,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -434,6 +551,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gigi": { "inputs": { "flake-utils": [ @@ -460,6 +595,45 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "determinate", + "nix", + "nix" + ], + "gitignore": [ + "determinate", + "nix", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -500,6 +674,54 @@ "type": "github" } }, + "homebrew-bundle": { + "flake": false, + "locked": { + "lastModified": 1733909155, + "narHash": "sha256-9S9OSUGdKY4zcmtEq4QMo+B/D3Y4JfYddHHR1yYsmWU=", + "owner": "homebrew", + "repo": "homebrew-bundle", + "rev": "fbce9c2f3a2b2fa54ce37a597af2d6340ec6fafc", + "type": "github" + }, + "original": { + "owner": "homebrew", + "repo": "homebrew-bundle", + "type": "github" + } + }, + "homebrew-cask": { + "flake": false, + "locked": { + "lastModified": 1733957808, + "narHash": "sha256-2q/hN4o8NyUzczoVEdnYJiHjXWnT/YdaanKAq00qPpY=", + "owner": "homebrew", + "repo": "homebrew-cask", + "rev": "10d7eea90ab8f3f9f115389807faca57a0f29c10", + "type": "github" + }, + "original": { + "owner": "homebrew", + "repo": "homebrew-cask", + "type": "github" + } + }, + "homebrew-core": { + "flake": false, + "locked": { + "lastModified": 1733956954, + "narHash": "sha256-P/I1edNfl33kvm5+UWzjrEZ0klifZHBLwH7LDQKcBrs=", + "owner": "homebrew", + "repo": "homebrew-core", + "rev": "42d7eee15349a9b5423e01d45a4c26788858f399", + "type": "github" + }, + "original": { + "owner": "homebrew", + "repo": "homebrew-core", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -792,6 +1014,23 @@ "libgit2": { "flake": false, "locked": { + "lastModified": 1715853528, + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.8.1", + "repo": "libgit2", + "type": "github" + } + }, + "libgit2_2": { + "flake": false, + "locked": { "lastModified": 1697646580, "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", "owner": "libgit2", @@ -822,32 +1061,38 @@ "type": "github" } }, + "nikitabobko-homebrew-tap": { + "flake": false, + "locked": { + "lastModified": 1733437300, + "narHash": "sha256-r0gkdyPodHNid+bcAbVtSgtUR0BkyWa0mpTJkpaq8sw=", + "owner": "nikitabobko", + "repo": "homebrew-tap", + "rev": "64d46a5546d3fe6f7ab368f5a3df0984adfe7087", + "type": "github" + }, + "original": { + "owner": "nikitabobko", + "repo": "homebrew-tap", + "type": "github" + } + }, "nix": { "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "flake-parts": "flake-parts", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": "pre-commit-hooks" + "nix": "nix_2", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" + "lastModified": 1733248733, + "narHash": "sha256-rOFE8TSwWoup+LPNbmtTs6oLy7lYZ12L9GN+aZuQQaA=", + "rev": "98bbabc68ac8c897c2ad873c3557125691c45120", + "revCount": 108, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.25.3/01939864-5191-788c-b898-163d916a3333/source.tar.gz" }, "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix/2.0" } }, "nix-alien": { @@ -882,6 +1127,44 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-darwin_2": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1716329735, + "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-filter": { "locked": { "lastModified": 1730207686, @@ -959,6 +1242,29 @@ "type": "github" } }, + "nix-homebrew": { + "inputs": { + "brew-src": "brew-src", + "flake-utils": "flake-utils_3", + "nix-darwin": "nix-darwin_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732145543, + "narHash": "sha256-VRQh/lvCSko9YV7haXyPt7DSp+EkgjjBv/9U4cY9c50=", + "owner": "zhaofengli-wip", + "repo": "nix-homebrew", + "rev": "ac3945ee614f69ab89c6935b3f0567028de5f012", + "type": "github" + }, + "original": { + "owner": "zhaofengli-wip", + "repo": "nix-homebrew", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1128,6 +1434,57 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1732881227, + "narHash": "sha256-T+wFMm3cj8pGJSwXmPuxG5pz+1gRDJoToF9OBxtzocA=", + "rev": "218cd6c16c0981cc32a45e3a15be1d3c1a68eb85", + "revCount": 18724, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.25.3/01938786-bc70-79e3-b7ee-bb61f8e7f238/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nix/%3D2.25.3" + } + }, + "nix_3": { + "inputs": { + "flake-compat": [ + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_2", + "libgit2": "libgit2_2", + "nixpkgs": "nixpkgs_5", + "nixpkgs-23-11": "nixpkgs-23-11_2", + "nixpkgs-regression": "nixpkgs-regression_2", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1730200266, @@ -1160,6 +1517,22 @@ "type": "github" } }, + "nixpkgs-23-11_2": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -1176,6 +1549,22 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1717179513, @@ -1194,6 +1583,50 @@ }, "nixpkgs_2": { "locked": { + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "revCount": 710194, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.710194%2Brev-f9f0d5c5380be0a599b1fb54641fa99af8281539/01938be8-64ce-75c6-94d4-dbc2e4d547fe/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1733686850, + "narHash": "sha256-NQEO/nZWWGTGlkBWtCs/1iF1yl2lmQ1oY/8YZrumn3I=", + "rev": "dd51f52372a20a93c219e8216fe528a648ffcbf4", + "revCount": 719099, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.719099%2Brev-dd51f52372a20a93c219e8216fe528a648ffcbf4/0193af12-b91a-77b9-9c72-3172a023752d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1.tar.gz" + } + }, + "nixpkgs_5": { + "locked": { "lastModified": 1717432640, "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "owner": "NixOS", @@ -1208,7 +1641,20 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_6": { + "locked": { + "lastModified": 1687274257, + "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", + "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", + "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1730272153, "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", @@ -1462,11 +1908,12 @@ "cachix": "cachix", "chaotic": "chaotic", "cider": "cider", + "determinate": "determinate", "devenv": "devenv", "disko": "disko", "fenix": "fenix", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_3", "flake-registry": "flake-registry", "flake-root": "flake-root", "flake-schemas": "flake-schemas", @@ -1474,21 +1921,27 @@ "gigi": "gigi", "gitignore": "gitignore", "home-manager": "home-manager", + "homebrew-bundle": "homebrew-bundle", + "homebrew-cask": "homebrew-cask", + "homebrew-core": "homebrew-core", "hyprfocus": "hyprfocus", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "jovian": "jovian", "just-flake": "just-flake", + "nikitabobko-homebrew-tap": "nikitabobko-homebrew-tap", "nix-alien": "nix-alien", + "nix-darwin": "nix-darwin", "nix-filter": "nix-filter", "nix-gaming": "nix-gaming", "nix-github-actions": "nix-github-actions", + "nix-homebrew": "nix-homebrew", "nix-index-database": "nix-index-database", "nix-microchip": "nix-microchip", "nix-prettier": "nix-prettier", "nix-search": "nix-search", "nix-thorium": "nix-thorium", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable", "notion-repackaged": "notion-repackaged", "nur": "nur", @@ -1501,7 +1954,7 @@ "rust-analyzer-src": "rust-analyzer-src", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", - "systems": "systems", + "systems": "systems_2", "tailray": "tailray", "tsutsumi": "tsutsumi", "umu": "umu" @@ -1807,6 +2260,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tailray": { "inputs": { "nixpkgs": [ @@ -1,31 +1,16 @@ { - outputs = - { - devenv, - flake-root, - flake-parts, - home-manager, - just-flake, - nixpkgs, - pre-commit-hooks, - self, - ... - }@inputs: + outputs = { devenv, flake-root, flake-parts, home-manager, just-flake, nixpkgs + , pre-commit-hooks, self, ... }@inputs: let lib = nixpkgs.lib // home-manager.lib; - secrets = builtins.fromTOML (builtins.readFile "${self}/secrets/secrets.toml"); + secrets = + builtins.fromTOML (builtins.readFile "${self}/secrets/secrets.toml"); systemsAttributes = lib.genAttrs lib.systems.flakeExposed; kansaiPkgs = import "${self}/lib/kansai-pkgs.nix" { - inherit - systemsAttributes - nixpkgs - self - inputs - ; + inherit systemsAttributes nixpkgs self inputs; }; - in - flake-parts.lib.mkFlake { inherit inputs; } { + in flake-parts.lib.mkFlake { inherit inputs; } { systems = builtins.attrNames (systemsAttributes (system: system)); imports = [ @@ -34,45 +19,27 @@ just-flake.flakeModule (import ./home { - inherit - kansaiPkgs - self - lib - inputs - secrets - ; + inherit kansaiPkgs self lib inputs secrets; inherit (self) outputs; }) (import ./hosts { - inherit - kansaiPkgs - self - lib - inputs - secrets - ; + inherit kansaiPkgs self lib inputs secrets; inherit (self) outputs; }) ]; - perSystem = - { system, config, ... }: - let - pkgs = (kansaiPkgs { })."${system}"; - in - { - imports = - let - parts = "${self}/parts"; - in - [ - "${parts}/just.nix" - (import "${parts}/checks.nix" { inherit pre-commit-hooks system; }) - (import "${parts}/devenv.nix" { inherit config lib pkgs; }) - ]; + perSystem = { system, config, ... }: + let pkgs = (kansaiPkgs { })."${system}"; + in { + imports = let parts = "${self}/parts"; + in [ + "${parts}/just.nix" + (import "${parts}/checks.nix" { inherit pre-commit-hooks system; }) + (import "${parts}/devenv.nix" { inherit config lib pkgs; }) + ]; packages.default = home-manager.defaultPackage."${system}"; formatter = pkgs.nixfmt-rfc-style; @@ -80,8 +47,11 @@ }; inputs = { + determinate.url = + "https://flakehub.com/f/DeterminateSystems/determinate/0.1"; flake-root.url = "github:srid/flake-root"; - flake-schemas.url = "https://flakehub.com/f/DeterminateSystems/flake-schemas/=0.1.5.tar.gz"; + flake-schemas.url = + "https://flakehub.com/f/DeterminateSystems/flake-schemas/=0.1.5.tar.gz"; just-flake.url = "github:juspay/just-flake"; nix-filter.url = "github:numtide/nix-filter"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; @@ -207,6 +177,21 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + homebrew-bundle = { + url = "github:homebrew/homebrew-bundle"; + flake = false; + }; + + homebrew-cask = { + url = "github:homebrew/homebrew-cask"; + flake = false; + }; + + homebrew-core = { + url = "github:homebrew/homebrew-core"; + flake = false; + }; + hyprfocus = { url = "github:pyt0xic/hyprfocus"; @@ -249,6 +234,11 @@ }; }; + nikitabobko-homebrew-tap = { + url = "github:nikitabobko/homebrew-tap"; + flake = false; + }; + nix-alien = { url = "github:thiagokokada/nix-alien"; @@ -261,6 +251,11 @@ }; }; + nix-darwin = { + url = "github:LnL7/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-gaming = { url = "github:fufexan/nix-gaming"; @@ -276,6 +271,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-homebrew = { + url = "github:zhaofengli-wip/nix-homebrew"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-index-database = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; @@ -422,7 +422,8 @@ }; umu = { - url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; + url = + "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/hosts/default.nix b/hosts/default.nix index e377cb4..6d61e10 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -49,5 +49,6 @@ (import ./hoka minimalOptions) (import ./kansai pcOptions) (import ./kioku minimalOptions) + (import ./nara { inherit inputs kansaiPkgs; }) ]; } diff --git a/hosts/nara/default.nix b/hosts/nara/default.nix new file mode 100644 index 0000000..c972d31 --- /dev/null +++ b/hosts/nara/default.nix @@ -0,0 +1,51 @@ +{ inputs, kansaiPkgs }: +let + configuration = + { pkgs, ... }: + { + system.stateVersion = 5; + + environment.systemPackages = with pkgs; [ + nixd + nixfmt-rfc-style + nil + just + ]; + + homebrew = { + enable = true; + brews = [ "swiftlint" "gpg" "pinentry-mac" ]; + + casks = [ + "alt-tab" + "iina" + "aerospace" + ]; + }; + + nix-homebrew = { + enable = true; + enableRosetta = true; + user = "ebisu"; + mutableTaps = false; + + taps = with inputs; { + "homebrew/homebrew-core" = homebrew-core; + "homebrew/homebrew-cask" = homebrew-cask; + "homebrew/homebrew-bundle" = homebrew-bundle; + "nikitabobko/homebrew-tap" = nikitabobko-homebrew-tap; + }; + }; + }; +in +{ + flake.darwinConfigurations.nara = inputs.nix-darwin.lib.darwinSystem { + pkgs = (kansaiPkgs { })."aarch64-darwin"; + + modules = [ + configuration + inputs.determinate.darwinModules.default + inputs.nix-homebrew.darwinModules.nix-homebrew + ]; + }; +} |