diff --git a/flake.lock b/flake.lock index bb45dee..1967d27 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "comma": { + "inputs": { + "flake-compat": "flake-compat", + "naersk": "naersk", + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1656989878, + "narHash": "sha256-SvK+H9M62lhPvVRWfl7HGG0oRO90r1E8ju3PPp6A6N8=", + "owner": "nix-community", + "repo": "comma", + "rev": "f5732a6e8871348bafa3139a2f0d9bb7bc34c076", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "comma", + "type": "github" + } + }, "dotacat": { "flake": false, "locked": { @@ -32,6 +53,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1656928814, @@ -112,7 +149,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": "utils_2" }, "locked": { "lastModified": 1657887110, @@ -146,25 +183,29 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "comma", + "nixpkgs" + ] }, "locked": { - "lastModified": 1655042882, - "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "lastModified": 1653413650, + "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", "owner": "nix-community", "repo": "naersk", - "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", "type": "github" }, "original": { "owner": "nix-community", + "ref": "master", "repo": "naersk", "type": "github" } }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1655042882, @@ -182,7 +223,25 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1655042882, + "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "owner": "nix-community", + "repo": "naersk", + "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_4": { + "inputs": { + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1650265945, @@ -225,7 +284,7 @@ "nix-alien": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "poetry2nix": "poetry2nix" }, "locked": { @@ -244,8 +303,8 @@ }, "nix-ld": { "inputs": { - "nixpkgs": "nixpkgs_3", - "utils": "utils_2" + "nixpkgs": "nixpkgs_4", + "utils": "utils_3" }, "locked": { "lastModified": 1652641841, @@ -263,6 +322,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1654398695, + "narHash": "sha256-Kw/KeoFXszNsF5mORP45mrxCP+k9Aq03hWcuWCL9sdI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1657975505, "narHash": "sha256-juMbw+GY2ycTrg3QbdFfEQs6P3FJeoYEv8aMVl2EZsg=", @@ -276,7 +351,7 @@ "type": "indirect" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1657828896, "narHash": "sha256-yxK3kRjSpKlrnR4kmqe2uwpys9LRc/Fckb4Ydwzomw4=", @@ -292,7 +367,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1652536154, "narHash": "sha256-d+y62beDhz2/l65SBAkxwtvTBzw3hgU1kECogyncKYM=", @@ -307,7 +382,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1657802959, "narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=", @@ -323,7 +398,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1656338871, "narHash": "sha256-+LOvZFt3MpWtrxXLH4igQtRVzyD43VnuTJjDVbt7phY=", @@ -337,7 +412,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1656401090, "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", @@ -353,7 +428,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1650647760, "narHash": "sha256-Ng8CGYLSTxeI+oEux0x+tSRA6K7ydoyfJNQf56ld+Uo=", @@ -367,7 +442,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1650161686, "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", @@ -386,7 +461,7 @@ "nvim-traxys": { "inputs": { "flake-utils": "flake-utils_2", - "naersk": "naersk_2", + "naersk": "naersk_3", "neovim-flake": "neovim-flake", "nixpkgs": [ "nixpkgs" @@ -1113,12 +1188,13 @@ }, "root": { "inputs": { + "comma": "comma", "home-manager": "home-manager", "kabalist": "kabalist", - "naersk": "naersk", + "naersk": "naersk_2", "nix-alien": "nix-alien", "nix-ld": "nix-ld", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvim-traxys": "nvim-traxys", "rust-overlay": "rust-overlay", "xdg-ninja": "xdg-ninja", @@ -1128,7 +1204,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1658026364, @@ -1176,6 +1252,21 @@ } }, "utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { "locked": { "lastModified": 1652372896, "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", @@ -1227,8 +1318,8 @@ "dotacat": "dotacat", "fast-syntax-highlighting": "fast-syntax-highlighting", "flake-utils": "flake-utils_5", - "naersk": "naersk_3", - "nixpkgs": "nixpkgs_8", + "naersk": "naersk_4", + "nixpkgs": "nixpkgs_9", "powerlevel10k": "powerlevel10k", "zsh-nix-shell": "zsh-nix-shell" }, diff --git a/flake.nix b/flake.nix index efcd5ef..35e4ae6 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ url = "github:traxys/kabalist"; flake = false; }; + comma.url = "github:nix-community/comma"; }; outputs = { @@ -42,6 +43,7 @@ inputs.rust-overlay.overlays.default inputs.nvim-traxys.overlay."${system}" inputs.nix-alien.overlay + inputs.comma.overlays.default (final: prev: { xdg-ninja = with pkgs; stdenv.mkDerivation rec { diff --git a/home.nix b/home.nix index ff54063..71bea95 100644 --- a/home.nix +++ b/home.nix @@ -33,9 +33,10 @@ in { tokei gcc11 nix-alien - xdg-ninja + xdg-ninja bc kabalist_cli + comma ]; services = {