From 8156d70097a7621621dd3c24ac2500bf0fb8045e Mon Sep 17 00:00:00 2001 From: mat ess Date: Wed, 7 Jun 2023 16:14:01 -0400 Subject: [PATCH] Housekeeping --- flake.lock | 166 ++++++++++++++++++++++++++++------------------ flake.nix | 1 - home/helix.nix | 9 +++ home/programs.nix | 2 + pkgs/default.nix | 9 --- 5 files changed, 111 insertions(+), 76 deletions(-) diff --git a/flake.lock b/flake.lock index dd856e9..cff6aae 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,16 @@ "crane": { "flake": false, "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "lastModified": 1681175776, + "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=", "owner": "ipetkov", "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "rev": "445a3d222947632b5593112bb817850e8a9cf737", "type": "github" }, "original": { "owner": "ipetkov", + "ref": "v0.12.1", "repo": "crane", "type": "github" } @@ -39,11 +40,11 @@ ] }, "locked": { - "lastModified": 1680266963, - "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", + "lastModified": 1684343812, + "narHash": "sha256-ZTEjiC8PDKeP8JRchuwcFXUNlMcyQ4U+DpyVZ3pB6Q4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "99d4187d11be86b49baa3a1aec0530004072374f", + "rev": "dfbdabbb3e797334172094d4f6c0ffca8c791281", "type": "github" }, "original": { @@ -111,11 +112,11 @@ ] }, "locked": { - "lastModified": 1680258209, - "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=", + "lastModified": 1683212002, + "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=", "owner": "nix-community", "repo": "dream2nix", - "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35", + "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096", "type": "github" }, "original": { @@ -146,11 +147,11 @@ ] }, "locked": { - "lastModified": 1680172861, - "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=", + "lastModified": 1680698112, + "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=", "owner": "davhau", "repo": "drv-parts", - "rev": "ced8a52f62b0a94244713df2225c05c85b416110", + "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201", "type": "github" }, "original": { @@ -162,11 +163,11 @@ "fisher-src": { "flake": false, "locked": { - "lastModified": 1678437028, - "narHash": "sha256-rtWPiEalxUhZQMZ8Ydk3E4wKke+Pdl7WaM4iOEKYuvM=", + "lastModified": 1682856574, + "narHash": "sha256-uWtEDpOrfQNGpS56WdoV13ggt4ESdsdM4gtPCcDpJyM=", "owner": "jorgebucaran", "repo": "fisher", - "rev": "67bec738dbec2442d05d09ef72b2be82acb1d774", + "rev": "dc543b2a658837b9447daec30258e44643571bb9", "type": "github" }, "original": { @@ -208,12 +209,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1680946745, - "narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "946da791763db1c306b86a8bd3828bf5814a1247", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -223,12 +227,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -268,11 +275,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1680958354, - "narHash": "sha256-lU5r4RgrRmlqiRsefZFahvD/bsnKJbVHNRwRjBXg3fY=", + "lastModified": 1684543135, + "narHash": "sha256-MQCw6PDfUO5s9z6i2QvPZ7ePXsycQFBjISUsT+leThY=", "owner": "helix-editor", "repo": "helix", - "rev": "58e457a4e1037caf43c17dea93c5321c1ae74103", + "rev": "d3cca0f3571fd30f4d7067a82c02753686297a67", "type": "github" }, "original": { @@ -285,17 +292,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": [ - "flake-utils" ] }, "locked": { - "lastModified": 1680667162, - "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", + "lastModified": 1684596126, + "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=", "owner": "nix-community", "repo": "home-manager", - "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", + "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d", "type": "github" }, "original": { @@ -354,11 +358,11 @@ "kitty-themes": { "flake": false, "locked": { - "lastModified": 1678282211, - "narHash": "sha256-heJayOz/2Bey/zAwL2PR1OsfGyCPqMyxT1XzwHLhQ0w=", + "lastModified": 1683176328, + "narHash": "sha256-xAXE6n16ro5QbnJ4ZsiQck47rJWfx2CEn0Gb5qu5CLs=", "owner": "kovidgoyal", "repo": "kitty-themes", - "rev": "c01fcbd694353507c3cc7f657179bad1f32140a7", + "rev": "8ab617fa7b5d226fc447aa83fe11d3f48c0c35b9", "type": "github" }, "original": { @@ -370,11 +374,11 @@ "mk-naked-shell": { "flake": false, "locked": { - "lastModified": 1676572903, - "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", + "lastModified": 1681286841, + "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", "owner": "yusdacra", "repo": "mk-naked-shell", - "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", + "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", "type": "github" }, "original": { @@ -398,11 +402,11 @@ ] }, "locked": { - "lastModified": 1680329418, - "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=", + "lastModified": 1683699050, + "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540", + "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac", "type": "github" }, "original": { @@ -413,11 +417,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680942619, - "narHash": "sha256-kpCW1IegAZfEjCVJW7IPN/hEtRL/9dxaFFYiHS5qVAk=", + "lastModified": 1684585791, + "narHash": "sha256-lYPboblKrchmbkGMoAcAivomiOscZCjtGxxTSCY51SM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f95dd4fd050daf017cae2dfeb1cea1ec0e4c1a1", + "rev": "eea79d584eff53bf7a76aeb63f8845da6d386129", "type": "github" }, "original": { @@ -430,11 +434,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1678375444, - "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", "type": "github" }, "original": { @@ -447,11 +451,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1680977908, - "narHash": "sha256-0Ehcgswo51+dx+QH5sZBqUOZh4JeTgrnxGTACSn8ZkA=", + "lastModified": 1684636767, + "narHash": "sha256-dSdyRzWCO5nmMw805CcfWo5kLMeZHcZtAt1j+SGB/NY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54731a8cea6d8b9d4fcb9ca7cbfc75ae1e07a171", + "rev": "5662ae22b715e580a813accf5ff740967bb94528", "type": "github" }, "original": { @@ -463,11 +467,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1680899675, - "narHash": "sha256-3ogGOPFcSuhf7NrPNREFApkGkLBR2og5lyBJY7+mbig=", + "lastModified": 1684522302, + "narHash": "sha256-L7nUSrOYTWvXmIQ8NtVU2/AAah/ouJpf9DDVSt0s9+I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d426ae4241ef89fcbd646cd796abd3e83167f54d", + "rev": "c555a28f2436be370c40df70f4cd6c25fceff7af", "type": "github" }, "original": { @@ -501,11 +505,11 @@ ] }, "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", "type": "github" }, "original": { @@ -519,11 +523,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1679737941, - "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=", + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", "type": "github" }, "original": { @@ -547,11 +551,11 @@ ] }, "locked": { - "lastModified": 1680948944, - "narHash": "sha256-GYVDP6QHkHfj6FEgVny78BjwpNfPgoU8NE3oFt//DFY=", + "lastModified": 1684195081, + "narHash": "sha256-IKnQUSBhQTChFERxW2AzuauVpY1HRgeVzAjNMAA4B6I=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b718acb57c432afe527f89672d00542fcd59fd68", + "rev": "96eabec58248ed8f4b0ad59e7ce9398018684fdc", "type": "github" }, "original": { @@ -588,11 +592,11 @@ ] }, "locked": { - "lastModified": 1680315536, - "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=", + "lastModified": 1683771545, + "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5c8c151bdd639074a0051325c16df1a64ee23497", + "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed", "type": "github" }, "original": { @@ -604,11 +608,11 @@ "starship-src": { "flake": false, "locked": { - "lastModified": 1681432161, - "narHash": "sha256-Jj5kiT+9R4w2lhmtkwEqsF34MOw63MM/SRCRA5FQ1PY=", + "lastModified": 1684525470, + "narHash": "sha256-vNlfAEsQakAXUbRuHx6I3OHkSxP784InMK7Gb0OBYms=", "owner": "starship", "repo": "starship", - "rev": "ce7f984932a97b4ad3cd6e6ece8e1c3b6022ba99", + "rev": "4b3bcaee4e9c9ad34fb64b77707eecc7479227e1", "type": "github" }, "original": { @@ -616,6 +620,36 @@ "repo": "starship", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7d9a4ce..6f5b9e8 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,6 @@ darwin.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.inputs.utils.follows = "flake-utils"; # Config "flag" for disabling homebrew homebrew-enabled.url = "github:boolean-option/true"; diff --git a/home/helix.nix b/home/helix.nix index 3950efe..b76f480 100644 --- a/home/helix.nix +++ b/home/helix.nix @@ -9,6 +9,7 @@ editor.indent-guides.render = true; editor.indent-guides.skip-levels = 1; editor.line-number = "relative"; + editor.soft-wrap.enable = true; editor.whitespace.render = { space = "none"; tab = "all"; @@ -16,6 +17,14 @@ }; }; + # programs.helix.grammars = [{ + # name = "lalrpop"; + # source = { + # git = "https://github.com/traxys/tree-sitter-lalrpop"; + # rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e"; + # }; + # }]; + programs.helix.extras.autoTheme = { enable = true; light = "rose_pine_dawn"; diff --git a/home/programs.nix b/home/programs.nix index 7975b1b..750f9ff 100644 --- a/home/programs.nix +++ b/home/programs.nix @@ -94,6 +94,8 @@ hyperfine # json processor jq + # task runner + just # alternative to `git` pijul # better version of `grep` diff --git a/pkgs/default.nix b/pkgs/default.nix index 9e6b29c..e6d2cd1 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,15 +8,6 @@ _: prev: { }; }; helix = inputs.helix.packages.${prev.stdenv.system}.default; - starship = prev.starship.overrideDerivation (drv: { - patches = (drv.patches or [ ]) ++ [ - (builtins.fetchurl { - name = "nushell.patch"; - url = "https://github.com/starship/starship/commit/041a51835371d3738cc7b597b4a506a5dc4341c9.diff"; - sha256 = "sha256:0az1jjb24mngzybgv7kavdj1bhfdm0cqnci3gz6zkgpaxqvw7vnz"; - }) - ]; - }); } // builtins.mapAttrs (name: extras: prev.callPackage