From 8b5b1ae1f987e600a40302e82942883ce75f2bbf Mon Sep 17 00:00:00 2001 From: mat ess Date: Mon, 6 Mar 2023 19:52:51 -0500 Subject: [PATCH] Updates --- darwin/homebrew.nix | 4 +- flake.lock | 167 ++++++++++++++++++++++++++------------------ home/programs.nix | 1 - 3 files changed, 102 insertions(+), 70 deletions(-) diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix index 789a17d..31a1958 100644 --- a/darwin/homebrew.nix +++ b/darwin/homebrew.nix @@ -23,7 +23,9 @@ in homebrew.enable = pkgs.lib.homebrew-enabled; homebrew.onActivation.autoUpdate = true; homebrew.onActivation.upgrade = true; - homebrew.onActivation.cleanup = "zap"; + # TODO: open an issue to have this make backup folders? + # homebrew.onActivation.cleanup = "zap"; + homebrew.onActivation.cleanup = "uninstall"; homebrew.global.brewfile = true; homebrew.taps = [ diff --git a/flake.lock b/flake.lock index b4b5268..712281a 100644 --- a/flake.lock +++ b/flake.lock @@ -53,22 +53,6 @@ "type": "github" } }, - "devshell": { - "flake": false, - "locked": { - "lastModified": 1667210711, - "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", - "owner": "numtide", - "repo": "devshell", - "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { "alejandra": [ @@ -82,10 +66,13 @@ "crane": "crane", "devshell": [ "helix", - "nci", - "devshell" + "nci" + ], + "flake-parts": [ + "helix", + "nci", + "parts" ], - "flake-parts": "flake-parts", "flake-utils-pre-commit": [ "helix", "nci" @@ -118,14 +105,18 @@ "pre-commit-hooks": [ "helix", "nci" + ], + "pruned-racket-catalog": [ + "helix", + "nci" ] }, "locked": { - "lastModified": 1671323629, - "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=", + "lastModified": 1677289985, + "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=", "owner": "nix-community", "repo": "dream2nix", - "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e", + "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889", "type": "github" }, "original": { @@ -166,24 +157,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1668450977, - "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1676283394, @@ -241,14 +214,15 @@ "nixpkgs": [ "nixpkgs" ], + "parts": "parts_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1676938964, - "narHash": "sha256-MgHBzvniNbX3nbLu2jjsNaMTHIR+ZqEsoGWyBZTK5B4=", + "lastModified": 1678148451, + "narHash": "sha256-wUrIZHhLmj5HENyA20ErHFHfJpzi+5XhUMI7B6cv5jY=", "owner": "helix-editor", "repo": "helix", - "rev": "1a87d14439bc940d9bf3e66359a612b345aa363f", + "rev": "53c8dcea5bc2e77706a1272cf0562121005bf54f", "type": "github" }, "original": { @@ -267,11 +241,11 @@ ] }, "locked": { - "lastModified": 1676933022, - "narHash": "sha256-gLghsEHOy2W2ZmSwqNOyj2mSHe9SMpdcbqnoySlZnmY=", + "lastModified": 1678109311, + "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=", "owner": "nix-community", "repo": "home-manager", - "rev": "5e889b385c43a8a72ada5ebc4888bbebb129b438", + "rev": "04d6cad67557512452decbfe888c68fa11338a96", "type": "github" }, "original": { @@ -343,25 +317,42 @@ "type": "github" } }, + "mk-naked-shell": { + "flake": false, + "locked": { + "lastModified": 1676572903, + "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=", + "owner": "yusdacra", + "repo": "mk-naked-shell", + "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "mk-naked-shell", + "type": "github" + } + }, "nci": { "inputs": { - "devshell": "devshell", "dream2nix": "dream2nix", + "mk-naked-shell": "mk-naked-shell", "nixpkgs": [ "helix", "nixpkgs" ], + "parts": "parts", "rust-overlay": [ "helix", "rust-overlay" ] }, "locked": { - "lastModified": 1671430291, - "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=", + "lastModified": 1677297103, + "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c", + "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2", "type": "github" }, "original": { @@ -372,11 +363,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676899837, - "narHash": "sha256-4eToXII90JdIVLk+H33vmPaYs/lIZacc80cN+oOYOf4=", + "lastModified": 1678086707, + "narHash": "sha256-y1uXdxzinIne4FW3TF7DCtxEB9gAbQ4qnbpYzhvkFm8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70414d340baab99231000e4af02ec812e7d0c17b", + "rev": "21eda9bc80bef824a037582b1e5a43ba74e92daa", "type": "github" }, "original": { @@ -389,11 +380,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", "type": "github" }, "original": { @@ -406,11 +397,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1676947002, - "narHash": "sha256-swZnrsFnGxBW5CnTqQIsD2pgFWVh817r4kDtbP8Pu38=", + "lastModified": 1678144297, + "narHash": "sha256-JhyIRENtFteoDctaGh3INI1RmDPKY++x0z7gml74tCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1970c010db531ccc21b742079d7dff5d4fb1842", + "rev": "33c9fd85e52f925e05f4a6bd69811f97e5ccdc15", "type": "github" }, "original": { @@ -422,11 +413,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1676817468, - "narHash": "sha256-ovuJ1jQOC2/EEibufBkXmSN/O9mLx80Wh7aDmHmHAhA=", + "lastModified": 1678101631, + "narHash": "sha256-vuuvWBNGhNSPPbFCjp2XZmBqJOvsFF1T0hyleRnHZlc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cf4274b5d06325bd16dbf879a30981bc283e58a", + "rev": "934e613c31cf7af0624dcf088b9e2d9b802d0717", "type": "github" }, "original": { @@ -436,6 +427,46 @@ "type": "github" } }, + "parts": { + "inputs": { + "nixpkgs-lib": [ + "helix", + "nci", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675933616, + "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1675933616, + "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat", @@ -451,11 +482,11 @@ ] }, "locked": { - "lastModified": 1676879534, - "narHash": "sha256-HU4RXcwsAX1u7AUbGOBDxkYQkeODcn+HZjXqKa1y/hk=", + "lastModified": 1677832802, + "narHash": "sha256-XQf+k6mBYTiQUjWRf/0fozy5InAs03O1b30adCpWeXs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c9495f017f67a11e9c9909b032dc7762dfc853cf", + "rev": "382bee738397ca005206eefa36922cc10df8a21c", "type": "github" }, "original": { @@ -491,11 +522,11 @@ ] }, "locked": { - "lastModified": 1671416426, - "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=", + "lastModified": 1677292251, + "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d", + "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc", "type": "github" }, "original": { diff --git a/home/programs.nix b/home/programs.nix index 4e66585..7df42e1 100644 --- a/home/programs.nix +++ b/home/programs.nix @@ -42,7 +42,6 @@ # Other packages ----------------------------------------------------------------------------- {{{ home.packages = builtins.attrValues ({ - coreutils = pkgs.coreutils.override { withPrefix = true; singleBinary = "shebangs"; }; inherit (pkgs) # GUI apps discord-ptb