From c7b743e91cc97c52747ebe725fc846713167ec84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 9 May 2022 21:50:08 +0200 Subject: [PATCH] :rocket: add comma --- flake.lock | 111 ++++++++++++++++++++++++++++++++++++---- flake.nix | 2 + modules/cli/default.nix | 2 + overlays/default.nix | 1 + 4 files changed, 106 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 95e0c59..2f94c74 100644 --- a/flake.lock +++ b/flake.lock @@ -71,6 +71,27 @@ "type": "github" } }, + "comma": { + "inputs": { + "flake-compat": "flake-compat", + "naersk": "naersk", + "nixpkgs": "nixpkgs_2", + "utils": "utils" + }, + "locked": { + "lastModified": 1650481854, + "narHash": "sha256-CZQLigKovJbMoTbPuWT3SBSMymjD58m72O/oy+HilQg=", + "owner": "nix-community", + "repo": "comma", + "rev": "034a9ca440370fc1eccbed43ff345fb6ea1f0d27", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "comma", + "type": "github" + } + }, "dracula-fish": { "flake": false, "locked": { @@ -125,6 +146,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1641205782, @@ -209,7 +246,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1650478719, @@ -241,6 +278,28 @@ } }, "naersk": { + "inputs": { + "nixpkgs": [ + "comma", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1650101877, + "narHash": "sha256-IYxYc5Z1ZHQDTQbTWsOZ9HlZepsVjgV5oZwmbKzxSJs=", + "owner": "nix-community", + "repo": "naersk", + "rev": "8cc379478819e6a22ce7595a761fe1e17c8d7458", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "naersk", + "type": "github" + } + }, + "naersk_2": { "inputs": { "nixpkgs": [ "nixpkgs-review-checks", @@ -279,7 +338,7 @@ }, "nixpkgs-hammering": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "naersk": [ "nixpkgs-review-checks", "naersk" @@ -310,8 +369,8 @@ "nixpkgs-review-checks": { "inputs": { "flake-utils": "flake-utils", - "naersk": "naersk", - "nixpkgs": "nixpkgs_4", + "naersk": "naersk_2", + "nixpkgs": "nixpkgs_5", "nixpkgs-hammering": "nixpkgs-hammering" }, "locked": { @@ -329,6 +388,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1650109093, + "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "faad370edcb37162401be50d45526f52bb16a713", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1650647760, "narHash": "sha256-Ng8CGYLSTxeI+oEux0x+tSRA6K7ydoyfJNQf56ld+Uo=", @@ -342,7 +417,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1650647760, "narHash": "sha256-Ng8CGYLSTxeI+oEux0x+tSRA6K7ydoyfJNQf56ld+Uo=", @@ -358,7 +433,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1650760898, "narHash": "sha256-r1rzTgwi1FKx5t3KKi7Xt4hyGdOnTD0RSTpbNls09KU=", @@ -373,7 +448,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1645013224, "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=", @@ -410,17 +485,18 @@ "arkenfox-userjs": "arkenfox-userjs", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", "base16": "base16", + "comma": "comma", "dracula-fish": "dracula-fish", "emacs-overlay": "emacs-overlay", "forgit-git": "forgit-git", "home-manager": "home-manager", "master": "master", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-review-checks": "nixpkgs-review-checks", "nur": "nur", "stable": "stable", "statix": "statix", - "utils": "utils" + "utils": "utils_2" } }, "rust-analyzer-src": { @@ -460,7 +536,7 @@ "inputs": { "fenix": "fenix", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1645337357, @@ -477,6 +553,21 @@ } }, "utils": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { "inputs": { "flake-utils": "flake-utils_2" }, diff --git a/flake.nix b/flake.nix index 0bbe326..e8fbdff 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,8 @@ nixpkgs-review-checks.url = "github:SuperSandro2000/nixpkgs-review-checks"; + comma.url = "github:nix-community/comma"; + # Fish specific dracula-fish = { url = "github:dracula/fish"; diff --git a/modules/cli/default.nix b/modules/cli/default.nix index 7343523..073ba9d 100644 --- a/modules/cli/default.nix +++ b/modules/cli/default.nix @@ -83,6 +83,8 @@ # utility cht-sh nixpkgs-review + comma + nix-index ]; programs = { bat.enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index f255f22..84398ee 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,6 +4,7 @@ final: prev: { python-dev = import ./python.nix final prev; nixpkgs-review = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; agenix = inputs.agenix.defaultPackage."${prev.system}"; + comma = inputs.comma.packages."${prev.system}".comma; master = import inputs.master { inherit (prev) system; config.allowUnfree = true;