From 72a136dbd6aaab1936e808c53c2b0b3dfb40c468 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 21 Jul 2024 22:49:20 +0200 Subject: [PATCH] bump inputs --- flake.lock | 174 +++++++++++++++++++++-------------- flake.nix | 1 + flake/pre-commit/default.nix | 13 +++ flake/shell.nix | 9 +- 4 files changed, 126 insertions(+), 71 deletions(-) create mode 100644 flake/pre-commit/default.nix diff --git a/flake.lock b/flake.lock index 2c2172f..573cfee 100644 --- a/flake.lock +++ b/flake.lock @@ -62,6 +62,39 @@ "type": "github" } }, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1721571743, + "narHash": "sha256-hat7wggtDISBJD8kTo5MTrT+IsY/Ha2MwgjmqqijoCA=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "601f6cf95cbe4fef02dc7faf34bba58566c914e9", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -282,11 +315,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1721356739, - "narHash": "sha256-AW30n1Nr8sbgN6vvyfFmgL7Jh9PwDRYDH0HmVIlsvqs=", + "lastModified": 1721500313, + "narHash": "sha256-daS6RuPKwlXKMlbZwx0cbrtf6SmbsFOqgKNpAget5U4=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "36e7aaa619342eff61b1daf3ac664f94d5272db7", + "rev": "d66dd5593afd45ff932d7263ddf6411104acf60e", "type": "github" }, "original": { @@ -302,11 +335,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721466565, - "narHash": "sha256-OKRGw6BP/6+Nr3xi7wooyR8cSgJerE/0oaLUMRcCQXY=", + "lastModified": 1721581856, + "narHash": "sha256-TYs1Ekwwnxvdjamq2XDVlB1s71XBZ31PMKeWiE/WrcQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f5e69f54e55881c07792e278f622f7efb2146ef9", + "rev": "fb91e18dab80d78ccbde35e5fc696f0656cfba0f", "type": "github" }, "original": { @@ -991,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1721135958, - "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "lastModified": 1721534365, + "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", "owner": "nix-community", "repo": "home-manager", - "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", "type": "github" }, "original": { @@ -1083,11 +1116,11 @@ ] }, "locked": { - "lastModified": 1720108799, - "narHash": "sha256-AxRkTJlbB8r7aG6gvc7IaLhc2T9TO4/8uqanKRxukBQ=", + "lastModified": 1721330371, + "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "a5c0d57325c5f0814c39110a70ca19c070ae9486", + "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", "type": "github" }, "original": { @@ -1098,6 +1131,7 @@ }, "hyprland": { "inputs": { + "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprutils": "hyprutils", @@ -1107,11 +1141,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721463092, - "narHash": "sha256-P86aiF7iFAc5sAWL3nXf0XRfhXDAudHpmCh0sW7wrr4=", + "lastModified": 1721592569, + "narHash": "sha256-zvfdcMTg5IMseo3VoIXTU+7VNJK9NaXl+HrCkhY2DGc=", "ref": "refs/heads/main", - "rev": "f642fb97df5c69267a03452533de383ff8023570", - "revCount": 4934, + "rev": "33e933e2a020c874037df568d6c033ae20f30bf7", + "revCount": 4948, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1139,11 +1173,11 @@ ] }, "locked": { - "lastModified": 1721415237, - "narHash": "sha256-wL8dHknJsDLzm0Dg8484kvdXQk2T74X13m69VsR1mZE=", + "lastModified": 1721562040, + "narHash": "sha256-QZLxukJlbHG6lsxF5goaXSPRKStkdrhgPyHy1m8F1Ro=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "f23d3ebd92fdbaac107b71893fab94701c39eeb8", + "rev": "1ce5b7a046a53c06d33dea79ea63c1e1fce377f8", "type": "github" }, "original": { @@ -1195,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1720381373, - "narHash": "sha256-lyC/EZdHULsaAKVryK11lgHY9u6pXr7qR4irnxNWC7k=", + "lastModified": 1721324361, + "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "5df0174fd09de4ac5475233d65ffc703e89b82eb", + "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "type": "github" }, "original": { @@ -1220,11 +1254,11 @@ ] }, "locked": { - "lastModified": 1721071737, - "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=", + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f", + "rev": "962582a090bc233c4de9d9897f46794280288989", "type": "github" }, "original": { @@ -1245,11 +1279,11 @@ ] }, "locked": { - "lastModified": 1720215857, - "narHash": "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=", + "lastModified": 1721324119, + "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "d5fa094ca27e0039be5e94c0a80ae433145af8bb", + "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", "type": "github" }, "original": { @@ -1264,11 +1298,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1720958877, - "narHash": "sha256-ggCV3etL7W1X9kxhLPZP35+BBh1LgQybene+L/aeQaQ=", + "lastModified": 1721563874, + "narHash": "sha256-xsiynNj2qUbssiD5m+8ftWrGQflyOo5C4lPbqragiMc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "6e56a6fd1d993eb02c991d449819f01340888e02", + "rev": "e0ea775feda9f162a153ee1ca8d93367dd0ee028", "type": "github" }, "original": { @@ -1314,11 +1348,11 @@ }, "mnw": { "locked": { - "lastModified": 1720927281, - "narHash": "sha256-4Z2FtCuL0lT+sM2gb1JMcXOUkeYrWeYZjjs1HuVTlOs=", + "lastModified": 1721440413, + "narHash": "sha256-PF/FbgCUZ6mQrKp28G2YoVDlSThBy8AxIT9d2Ju3kTY=", "owner": "Gerg-L", "repo": "mnw", - "rev": "302b18ddb8498aa9a7e0c01f7026e49d545e6898", + "rev": "4ea225024677e7c3a96080af8624fd3aa5dfa1b6", "type": "github" }, "original": { @@ -1463,11 +1497,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1721483756, - "narHash": "sha256-5Q7oj62u+Wtf1Zya/cBhCJMQAeQHLJQuwZHSgT3FlsI=", + "lastModified": 1721576265, + "narHash": "sha256-lhiPcedidJ4NBAupM38602juxWuV8O6Z4esmICD0My4=", "owner": "notashelf", "repo": "nvf", - "rev": "2b8d0af2e6b5a4e52c93ab86875c52eb5376abe4", + "rev": "589b86d3781c2fba8d4d11698d127708aaaa663f", "type": "github" }, "original": { @@ -1486,11 +1520,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1721368131, - "narHash": "sha256-dvDYa+Z2qZHTibmeUbKKIpR2jONO4UPbyHiDgYhgoMQ=", + "lastModified": 1721550147, + "narHash": "sha256-5FrhkqzwXVHRlW+TgRfF1rHieXO9Gx50vt9m3s16fdg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d9fcc47baa026c7df9a9789d5e825b4f13a9239a", + "rev": "bb790de5f0ebe97c40eea21a394da7d179ee18a9", "type": "github" }, "original": { @@ -1502,11 +1536,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1721316387, - "narHash": "sha256-qPgppLqmnd0OnHLMo4cGPZSUyLbcw9nThWO4sJC8bWI=", + "lastModified": 1721473147, + "narHash": "sha256-xi0CIdlh2U0Yi2futkMQCHapH4A/fOJELpNb0AcIwvk=", "owner": "neovim", "repo": "neovim", - "rev": "f61efe3fe77c9a517dccb9fd5ff7f16c0660ced4", + "rev": "5fc25ecc7a383a4bed2199774ed2e26022456ca3", "type": "github" }, "original": { @@ -1570,11 +1604,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720931326, - "narHash": "sha256-QHajV5BjfaMWbiOAJ/MGH+exXo+CjzUpkxxEtz0ZZ2k=", + "lastModified": 1721505437, + "narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "c132534bc68eb48479a59a3116ee7ce0f16ce12b", + "rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f", "type": "github" }, "original": { @@ -1700,11 +1734,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1720918433, - "narHash": "sha256-z3Lp++7k4l/3K4A+7v3cuHBNcm/vntGXgxElLH+INa4=", + "lastModified": 1721523216, + "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3b0b1763c0f0931deaa2980b7b146f8ae7a6a952", + "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", "type": "github" }, "original": { @@ -1733,11 +1767,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "lastModified": 1721409541, + "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d", "type": "github" }, "original": { @@ -1755,11 +1789,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1721432204, - "narHash": "sha256-P+EcNbJfOAfSiTbgv0x3IDx+f0yZYRDAVOQvSeLNuBI=", + "lastModified": 1721566265, + "narHash": "sha256-o1thi0iay9AfkqkopNsPfc70bfHD+NcsKOs3IYwRk/A=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "79fefa5cf958abe84266753de014126afbd33935", + "rev": "6d34f9c34bdab180fd15185c87a44b3bd11cb4c0", "type": "github" }, "original": { @@ -1866,11 +1900,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { @@ -1914,11 +1948,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1721303309, - "narHash": "sha256-/+Yw4tW/mcTRKmkEAO64ObzCQClpSUZpk2flUD9GDHE=", + "lastModified": 1721466660, + "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e2fb8e0eb807e139d42b05bf8e28da122396bed", + "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", "type": "github" }, "original": { @@ -1974,11 +2008,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1721421992, - "narHash": "sha256-4Mu+O2/S5XU1D8HLTU53pv20hEH6aiTkUqjLHowYdY8=", + "lastModified": 1721592379, + "narHash": "sha256-pJzkjy4+sM9+5IfrZMTWAiB0m/m4eiV4fmnqxtVNonI=", "owner": "nix-community", "repo": "nixvim", - "rev": "e80a8874accd45cac90616a7b5faa49c5a68e6b9", + "rev": "d2f733efb4962903b77af330c4c03a63f2f72968", "type": "github" }, "original": { @@ -3762,11 +3796,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1720817247, - "narHash": "sha256-zscGRvhFqTszq5APjt5OAX3sJ+G+EB/J+ciLyrk5Vis=", + "lastModified": 1721499557, + "narHash": "sha256-AqMo60XkIBssn71yN19GiunV8Nr7RqWjfCuXLAr96eg=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "94fe292721447242b7831b3694a198629ff6d174", + "rev": "d6b4d18ed4a54d336b7fea71c2d3f476a41fbd96", "type": "github" }, "original": { @@ -3790,11 +3824,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1721478802, - "narHash": "sha256-+WMQs0fMAmpWPsKNgIFQoKLtvS4qtTj+mC++cD1May4=", + "lastModified": 1721573849, + "narHash": "sha256-pHfzFzjADtCqMswGwrfC5klBWJZ6h94bxVrVObJLrEM=", "owner": "danth", "repo": "stylix", - "rev": "6f36b27afd7b7ac8664bb62b7b27728540972c82", + "rev": "0ef70039a6435446472182c8f8106947abfc523d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d48bc20..176e8ef 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ ]; imports = [ inputs.treefmt-nix.flakeModule + #./flake/pre-commit ./flake/shell.nix ./flake/fmt.nix ]; diff --git a/flake/pre-commit/default.nix b/flake/pre-commit/default.nix new file mode 100644 index 0000000..6c107b4 --- /dev/null +++ b/flake/pre-commit/default.nix @@ -0,0 +1,13 @@ +{ + perSystem = _: { + pre-commit = { + settings = { + excludes = ["flake.lock"]; + hooks = { + alejandra.enable = true; + prettier.enable = true; + }; + }; + }; + }; +} diff --git a/flake/shell.nix b/flake/shell.nix index b89b72c..f49d9f1 100644 --- a/flake/shell.nix +++ b/flake/shell.nix @@ -1,9 +1,16 @@ { - perSystem = {pkgs, ...}: { + perSystem = { + config, + pkgs, + ... + }: { devShells.default = pkgs.mkShellNoCC { name = "nichts"; DIRENV_LOG_FORMAT = ""; + + #inputsFrom = [config.treefmt.build.devShell]; packages = with pkgs; [ + config.treefmt.build.wrapper # treewide formatter nil # nix language server alejandra git # take a guess