From d1c61fcdfccfd0c2c048ef0dc3dd4e17b0fa35fe Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 24 Jun 2023 11:34:40 -0400 Subject: [PATCH] add nixid (now works on macos) --- flake.lock | 112 +++++++++++++++++++++++++++++++++++++--------- flake.nix | 3 ++ home/terminal.nix | 6 ++- 3 files changed, 100 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 5e0c3cd..ccfb60f 100644 --- a/flake.lock +++ b/flake.lock @@ -451,6 +451,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_5" }, + "locked": { + "lastModified": 1685662779, + "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_6": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_6" + }, "locked": { "lastModified": 1672877861, "narHash": "sha256-ROnSmsk5grROL6gnHBnSdqlPPBrBJMApCeB7xzY567M=", @@ -859,13 +877,32 @@ "type": "github" } }, + "nixd": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1687572024, + "narHash": "sha256-FLzcdNXEqwyAYhbr3lucklj+s5JUvjgZg1uJ7ZWVANw=", + "owner": "nix-community", + "repo": "nixd", + "rev": "3dbe1eb6bde1949b510e19a2d1863a2f4d2329a6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixd", + "type": "github" + } + }, "nixos-flake": { "locked": { - "lastModified": 1679328115, - "narHash": "sha256-LHd+h6YY7ftxn8DpTjHLfsjh477KiGsD6ddulUpTvNQ=", + "lastModified": 1685736878, + "narHash": "sha256-skzcEJej52RsFYa0FaJnten+SsBzlmWTtQpzZhuN+B4=", "owner": "srid", "repo": "nixos-flake", - "rev": "fab75907cfc0c4e48ceab7a7194f019b55828895", + "rev": "71e8cce206161412a0b00dbb34a778500451deb8", "type": "github" }, "original": { @@ -891,7 +928,7 @@ }, "nixos-shell": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1646257415, @@ -910,7 +947,7 @@ "nixos-vscode-server": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1684517665, @@ -1015,6 +1052,24 @@ } }, "nixpkgs-lib_5": { + "locked": { + "dir": "lib", + "lastModified": 1685564631, + "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_6": { "locked": { "dir": "lib", "lastModified": 1672350804, @@ -1034,8 +1089,8 @@ }, "nixpkgs-match": { "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_12" + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1672924430, @@ -1084,6 +1139,21 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1628465643, + "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6ef4f522d63f22b40004319778761040d3197390", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1096,7 +1166,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1686592866, "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", @@ -1112,7 +1182,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1672756850, "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", @@ -1128,7 +1198,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1679793451, "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", @@ -1142,7 +1212,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1683475240, "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=", @@ -1269,17 +1339,18 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1628465643, - "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", + "lastModified": 1686398752, + "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ef4f522d63f22b40004319778761040d3197390", + "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nose": { @@ -1319,7 +1390,7 @@ }, "nuenv_2": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1468,11 +1539,12 @@ "nix-darwin": "nix-darwin_2", "nix-doom-emacs": "nix-doom-emacs", "nix-serve-ng": "nix-serve-ng", + "nixd": "nixd", "nixos-flake": "nixos-flake", "nixos-hardware": "nixos-hardware", "nixos-shell": "nixos-shell", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nixpkgs-match": "nixpkgs-match", "nuenv": "nuenv_2", "sops-nix": "sops-nix", @@ -1559,7 +1631,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { diff --git a/flake.nix b/flake.nix index f45d65b..2d9932c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,7 @@ nuenv.url = "github:DeterminateSystems/nuenv"; devour-flake.url = "github:srid/devour-flake"; devour-flake.flake = false; + nixd.url = "github:nix-community/nixd"; # Emacs emacs-overlay.url = "github:nix-community/emacs-overlay"; @@ -89,6 +90,8 @@ inherit system; overlays = [ inputs.jenkins-nix-ci.overlay + inputs.nixd.overlays.default + inputs.nuenv.overlays.default ]; }; packages.default = self'.packages.activate; diff --git a/home/terminal.nix b/home/terminal.nix index e6ae67f..3bd02e8 100644 --- a/home/terminal.nix +++ b/home/terminal.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ flake, pkgs, lib, ... }: # Platform-independent terminal setup { @@ -11,6 +11,10 @@ nix-output-monitor devour-flake nil + # nixd FIXME: why does this not work? + flake.inputs.nixd.packages.${pkgs.system}.nixd + + # nixd nixpkgs-fmt shfmt ];