diff --git a/flake.lock b/flake.lock index 3f5dab4..2c7c302 100644 --- a/flake.lock +++ b/flake.lock @@ -32,16 +32,49 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1714606777, + "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-root": { + "locked": { + "lastModified": 1713493429, + "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "owner": "srid", + "repo": "flake-root", + "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -72,11 +105,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -145,11 +178,11 @@ ] }, "locked": { - "lastModified": 1731153869, - "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", + "lastModified": 1731768170, + "narHash": "sha256-9Zj2baKY3KaKzs5+nqZgIwr/o/iibhENFxjOnpU+IOU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5c74ab862c8070cbf6400128a1b56abb213656da", + "rev": "2bcef10f4319f34ddebadb5f37eaa81ca2510730", "type": "github" }, "original": { @@ -171,11 +204,11 @@ ] }, "locked": { - "lastModified": 1731203492, - "narHash": "sha256-K9h4TxgwY3QV5Vaqokd6ygJTGr/dTPt4lVyvuYGpWKU=", + "lastModified": 1731721953, + "narHash": "sha256-Wh+SleqO6vQc4M6UI90zbm3al2Hq3OLbMupJmrTIdq8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "85caf0185a4bf8fc2161c33a6d6d328052d7da44", + "rev": "32e3b124252161fcd7e0623c6e6faf9d535c1a3f", "type": "github" }, "original": { @@ -184,13 +217,37 @@ "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": "flake-parts", + "flake-root": "flake-root", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1731726311, + "narHash": "sha256-5+ul4PxMgPkmGLB8CYpJcIcRDY/pJgByvjIHDA1Gs5A=", + "owner": "nix-community", + "repo": "nixd", + "rev": "1de61e7fc174688888c5e2c95d0af56dc4b26cac", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "2.5.1", + "repo": "nixd", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", "type": "github" }, "original": { @@ -200,6 +257,24 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1730891215, @@ -226,6 +301,7 @@ "monaspace-font": "monaspace-font", "nix-darwin": "nix-darwin", "nix-vscode-extensions": "nix-vscode-extensions", + "nixd": "nixd", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" } @@ -244,6 +320,27 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ee4e122..a916b53 100644 --- a/flake.nix +++ b/flake.nix @@ -14,9 +14,15 @@ }; nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-compat.follows = "flake-compat"; + flake-utils.follows = "flake-utils"; + }; + }; + nixd = { + url = "github:nix-community/nixd/2.5.1"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-compat.follows = "flake-compat"; - inputs.flake-utils.follows = "flake-utils"; }; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1.tar.gz"; @@ -81,6 +87,7 @@ home-manager.users.abhinav = import ./home.nix; home-manager.extraSpecialArgs = { inherit inputs pkgs-stable; + nixd = inputs.nixd.packages.${system}.nixd; }; } ]; diff --git a/programs/default.nix b/programs/default.nix index afa72f9..6b4fa33 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -2,7 +2,7 @@ inputs, config, pkgs, - pkgs-stable, + nixd, ... }: @@ -28,15 +28,13 @@ let cachix nix-output-monitor ]; - networkingPackages = - with pkgs; - [ - curl - dig - httpie - openssh - ] - ++ [ pkgs-stable.mosh ]; + networkingPackages = with pkgs; [ + curl + dig + httpie + openssh + mosh + ]; cmdLineUtilPackages = with pkgs; [ bash broot