diff --git a/flake.lock b/flake.lock index 3f1ef71..12af0a8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,89 @@ { "nodes": { + "cachix": { + "inputs": { + "devenv": [ + "silicate", + "devenv" + ], + "flake-compat": [ + "silicate", + "devenv", + "flake-compat" + ], + "git-hooks": [ + "silicate", + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "silicate", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1777487137, + "narHash": "sha256-TuvKVBX60mqyMT6OB5JqVEh1YIWtFMR/igLCaCdC9tw=", + "owner": "cachix", + "repo": "cachix", + "rev": "a66a440c321d35f7193472c317f42a55ccd1cb93", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, + "crate2nix": { + "flake": false, + "locked": { + "lastModified": 1772186516, + "narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=", + "owner": "rossng", + "repo": "crate2nix", + "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", + "type": "github" + }, + "original": { + "owner": "rossng", + "repo": "crate2nix", + "rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e", + "type": "github" + } + }, + "devenv": { + "inputs": { + "cachix": "cachix", + "crate2nix": "crate2nix", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "ghostty": "ghostty", + "git-hooks": "git-hooks", + "nix": "nix", + "nixd": "nixd", + "nixpkgs": [ + "silicate", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1783109842, + "narHash": "sha256-Fi7lW+sg1ChduOOQRBCK5JeA1cw4x5wSjIJcppRGGqQ=", + "owner": "cachix", + "repo": "devenv", + "rev": "e30eb49258bee68353bd9c619823f635f4afa86c", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -20,6 +104,110 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "silicate", + "naersk", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1752475459, + "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "silicate", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "ghostty": { + "flake": false, + "locked": { + "lastModified": 1782866021, + "narHash": "sha256-BOLtzL5iAHmtCOg9/DXtcfw+K86QWol088K72chJB04=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "e1d31deaaed21aa9225afca78d778fb373c95852", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "silicate", + "devenv", + "flake-compat" + ], + "nixpkgs": [ + "silicate", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782908218, + "narHash": "sha256-wLMOrPgVyeF3XmP+qfYcLqnVdTxikdcSvbIY7rA9jTA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "9f7e99119ece7705299595299f3b031f39356de1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -40,6 +228,99 @@ "type": "github" } }, + "naersk": { + "inputs": { + "fenix": "fenix", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1782220280, + "narHash": "sha256-thLTFbp9D5Qknmh8q/v4FRpLGphUSijT3E86cbLYTXo=", + "owner": "nix-community", + "repo": "naersk", + "rev": "9aa07bb0256d300219b30622d2454e85f7f3667e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": [ + "silicate", + "devenv", + "flake-compat" + ], + "flake-parts": [ + "silicate", + "devenv", + "flake-parts" + ], + "git-hooks-nix": [ + "silicate", + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "silicate", + "devenv", + "nixpkgs" + ], + "nixpkgs-23-11": [ + "silicate", + "devenv" + ], + "nixpkgs-regression": [ + "silicate", + "devenv" + ] + }, + "locked": { + "lastModified": 1782407171, + "narHash": "sha256-xem+4ncdQCTFJsQ4PrVuyVmi3j4w/Yqg298hBUzVejA=", + "owner": "cachix", + "repo": "nix", + "rev": "782ac1b155679b065ec945ae50d0fa1d495883b7", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "devenv-2.34", + "repo": "nix", + "type": "github" + } + }, + "nixd": { + "inputs": { + "flake-parts": [ + "silicate", + "devenv", + "flake-parts" + ], + "nixpkgs": [ + "silicate", + "devenv", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1780381423, + "narHash": "sha256-S1BIJiQF4lRtJUKak0e97JwNvbe69/LW78YJJuB18Qk=", + "owner": "nix-community", + "repo": "nixd", + "rev": "0e07c08c448a2995e7793d1098437b29bbe80b02", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1781577229, @@ -55,6 +336,22 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "quickshell": { "inputs": { "nixpkgs": [ @@ -80,7 +377,92 @@ "disko": "disko", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "quickshell": "quickshell" + "quickshell": "quickshell", + "silicate": "silicate" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1752428706, + "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "silicate", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782875958, + "narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "13139aefa973f3d96c60c0fbab801de058ae25ca", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "silicate": { + "inputs": { + "devenv": "devenv", + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783205610, + "narHash": "sha256-ZJjRXIyDNuK5pVOvBAb3Mwq/ydfLhue1OZMCJOJX8JU=", + "ref": "refs/heads/main", + "rev": "3f0f75ba3548711c8c0ec47edc8d4856f3abc36e", + "revCount": 63, + "type": "git", + "url": "https://github.com/pure-sagacity/silicate" + }, + "original": { + "type": "git", + "url": "https://github.com/pure-sagacity/silicate" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "silicate", + "devenv", + "nixd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index d269fc5..9228b1c 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + + silicate = { + url = "git+https://github.com/pure-sagacity/silicate"; + + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/modules/core/default.nix b/modules/core/default.nix index 27dbb39..9f37c0d 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; @@ -36,6 +36,7 @@ git-credential-manager gnupg yazi + inputs.silicate.packages.${pkgs.system}.default ]; nix = {