From e8f4ee52c367dca707c97c453ca26438339a7818 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:25:30 -0400 Subject: [PATCH] update lockfile, linux 6.3 also pin nil version maybe it fixed sleep issues as well? --- flake.lock | 99 +++++++++++++------------------- flake.nix | 2 +- modules/nixos/hardware/sleep.nix | 1 - 3 files changed, 42 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 8a45701..f980f93 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "Comment-nvim-src": { "flake": false, "locked": { - "lastModified": 1681289112, - "narHash": "sha256-Zrxf50YlAaCERZFAbg4Ece+wI4buHl+K2IIw0qpASGA=", + "lastModified": 1682659841, + "narHash": "sha256-5Zu3y0v4O2EZk1zV4jcBJs2cZ3q6B4iypUR4YhATKrQ=", "owner": "numToStr", "repo": "Comment.nvim", - "rev": "a89339ffbee677ab0521a483b6dac7e2e67c907e", + "rev": "38d3b7eb553872d8866f14a0dd4fe84126068fce", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1682009832, - "narHash": "sha256-QdNOeFE7sI+0ddqVfn9vQDCUs7OdxhJ7evo9sdyP82Y=", + "lastModified": 1682773107, + "narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a1ee4d333b092bc055655fb06229eb3013755812", + "rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1682299489, - "narHash": "sha256-bqHo0/82KB+IyBMyjBd6QdyZWJl/YZeGggjBsAgRFlY=", + "lastModified": 1682802069, + "narHash": "sha256-hctikxnF3AvHckQqzNa/4YLHbNNrdC733VsTZPWeyTo=", "owner": "nix-community", "repo": "disko", - "rev": "8ab9e5609929379ab15f03fd3bdc1f85419e5a3a", + "rev": "c917cb9cdb621f3b60a7ccc77729cab52250da81", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1682556573, - "narHash": "sha256-n0My2cA3nsP4Df8Bnje1SJyQfm3ZXLQZltRZXdXvHmc=", + "lastModified": 1682729071, + "narHash": "sha256-N0oJwtZPEo+2waAZtsdxMGOkyGfiPldmHdP0t+vi0pk=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "c36e24b480db582477e9a355a1fc115acbc35aa1", + "rev": "04b4ccccef58d9fc3f18192b6edc4b3c5decb3cf", "type": "github" }, "original": { @@ -124,15 +124,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -143,7 +140,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -181,11 +178,11 @@ ] }, "locked": { - "lastModified": 1682535786, - "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=", + "lastModified": 1682779989, + "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d82c9af8175878a461a0fdf914e67cc446664570", + "rev": "3144311f31194b537808ae6848f86f3dbf977d59", "type": "github" }, "original": { @@ -202,15 +199,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1681412802, - "narHash": "sha256-IcEala6vFQ7SFNOPCeXBh9Jbl8nL2QOtLmO7RbDsBbo=", + "lastModified": 1680544266, + "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=", "owner": "oxalica", "repo": "nil", - "rev": "1d5bc81023c21b22cfbea06a8b4b82963c01b941", + "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362", "type": "github" }, "original": { "owner": "oxalica", + "ref": "2023-04-03", "repo": "nil", "type": "github" } @@ -290,11 +288,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1682018913, - "narHash": "sha256-Eo2ZkWB8+qy8fnmxtJUNJl6HHYYAgXDR29+OwDIzm1Q=", + "lastModified": 1680487167, + "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7048a48bc79b4361f77740420000d2b5454b0df7", + "rev": "53dad94e874c9586e71decf82d972dfb640ef044", "type": "github" }, "original": { @@ -306,11 +304,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1682453498, - "narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", + "lastModified": 1682692304, + "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", + "rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37", "type": "github" }, "original": { @@ -354,11 +352,11 @@ }, "nur": { "locked": { - "lastModified": 1682558081, - "narHash": "sha256-dzez8eBDMVs9GhC5bAKm6avCxWRZmXLzHuv1U8nNVJQ=", + "lastModified": 1682797522, + "narHash": "sha256-Bxcihc9Li1jUdsTu9ZLgOFqvOaV9ljONwPqU1n250p8=", "owner": "nix-community", "repo": "nur", - "rev": "4ac53a1d6c73f1b326256da444bfbac53c317d76", + "rev": "8e50ef5a62e678cb98f1df3e53b7fbd79200578c", "type": "github" }, "original": { @@ -386,11 +384,11 @@ "nvim-tree-lua-src": { "flake": false, "locked": { - "lastModified": 1682305439, - "narHash": "sha256-vSe1QUwfI+GbOsnY31PywsePuxvfK7sNR4BERKo8+iI=", + "lastModified": 1682751800, + "narHash": "sha256-vV6Xmrp5FcVV8osHdFzFbtVk9bC83EZVNdUSFtyeR28=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "bb375fb20327c49920c41d2b51c1ce2f4fe7deb3", + "rev": "d8b154c5f0981886fc2b0f1e52d6172e7fdd13e4", "type": "github" }, "original": { @@ -453,11 +451,11 @@ ] }, "locked": { - "lastModified": 1682043560, - "narHash": "sha256-ZsF4Yee9pQbvLtwSVGgYux+az4yFSLXrxPyGHm3ptJM=", + "lastModified": 1680488274, + "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "48037a6f8faeee138ede96bf607bc95c9dab9aec", + "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8", "type": "github" }, "original": { @@ -481,21 +479,6 @@ "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" - } - }, "telescope-nvim-src": { "flake": false, "locked": { @@ -515,11 +498,11 @@ "telescope-project-nvim-src": { "flake": false, "locked": { - "lastModified": 1679587563, - "narHash": "sha256-E8ZpI/B9B8nC7laq7lK1sGcd4I89YFIV6nBowfPE+C4=", + "lastModified": 1682606566, + "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=", "owner": "nvim-telescope", "repo": "telescope-project.nvim", - "rev": "fa081e35ba7397e5147a51ece693aa3afda167fc", + "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cd9aff9..e3df0ee 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ }; # Nix language server - nil.url = "github:oxalica/nil"; + nil.url = "github:oxalica/nil/2023-04-03"; # Neovim plugins nvim-lspconfig-src = { diff --git a/modules/nixos/hardware/sleep.nix b/modules/nixos/hardware/sleep.nix index c07343e..b760b72 100644 --- a/modules/nixos/hardware/sleep.nix +++ b/modules/nixos/hardware/sleep.nix @@ -13,7 +13,6 @@ # /r/archlinux/comments/y7b97e/my_computer_wakes_up_immediately_after_i_suspend/isu99sr/ echo GPP0 > /proc/acpi/wakeup - # Possibly need to wait a beat for settings to kick in sleep 2 set -e