From 947dfe701d73d8b43a11ce8fb14182235e7162c5 Mon Sep 17 00:00:00 2001 From: Joshua Barrett Date: Sun, 19 Jul 2026 20:27:17 -0400 Subject: [PATCH] updated to latest nixpkgs --- flake.lock | 174 +++++++++++++------------ modules/home/profiles/desktop/niri.nix | 21 ++- modules/nixos/profiles/laptop.nix | 4 +- 3 files changed, 109 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index 8d6784c..b9f7175 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783625540, - "narHash": "sha256-Cq+jB2th/kxsNDPs5xZcVXIcsJ3/hIZxfyYNRxE8Ixc=", + "lastModified": 1784591004, + "narHash": "sha256-zqiNxNoxFJ+rMns7IVLOpdJLfY4HZgh2uClGY20119E=", "owner": "emacs-twist", "repo": "emacs-builtins", - "rev": "cfc1c7ffd98e41021ff0dc928c0eb7ca8c1238a9", + "rev": "19aa4903ad45d56bad6c718850ca8af91c53c409", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "epkgs": { "flake": false, "locked": { - "lastModified": 1783877975, - "narHash": "sha256-vrUN9ycv68oh/EpdXMNHfcLldAK0rIWQY0GDlg+ZCA0=", + "lastModified": 1785544613, + "narHash": "sha256-l0E8Ib4pzG+sUJ0NEHyTOxRfpks57o0+i0o76Cou3d8=", "owner": "emacsmirror", "repo": "epkgs", - "rev": "8cf635d43ca0cbc1428be60b8e21d2d61986b152", + "rev": "108b9be80607d8ab0a6c69be048b197a6c53afff", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "lastModified": 1782007937, + "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "rev": "981bd332015397fb1ca033fa982bd61635160c78", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -323,28 +323,30 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "host": "gitlab.gnome.org", + "lastModified": 1776175984, + "narHash": "sha256-RJFlFW8GiMei6oqUGrMkGEvVqOH8U7Q8abc1yK4VKD8=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "rev": "e0fdc4c13250e9a9b8ea9594c83925274f4a5dca", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "50.1", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "gnu-elpa": { "flake": false, "locked": { - "lastModified": 1782568193, - "narHash": "sha256-xmX4v8LmAU6v0cbNx/oA8bci17JCtEreUCMWuJAFxK8=", + "lastModified": 1785533550, + "narHash": "sha256-uKTCPGf3lqRhxRKfXPL8yULOlTgsHPPookEruOsz9VU=", "ref": "main", - "rev": "fcf738c3547216d700e1f67a2e1830ed2acba981", - "revCount": 761, + "rev": "c4164a03fd315afc2db7341e799715bb6f32cb15", + "revCount": 767, "type": "git", "url": "https://git.savannah.gnu.org/git/emacs/elpa.git" }, @@ -361,11 +363,11 @@ ] }, "locked": { - "lastModified": 1783823409, - "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", + "lastModified": 1785531816, + "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", "owner": "nix-community", "repo": "home-manager", - "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", + "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", "type": "github" }, "original": { @@ -380,11 +382,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1783862842, - "narHash": "sha256-ce7YKXi5QtoadOPoWt+nWzxo/+a+OxXuVnzVozKO+Z8=", + "lastModified": 1785072968, + "narHash": "sha256-9kizgOPS7Yn787Ptm6HyjtHSyfB+9LU5AH+UNzZjsXs=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "5d5d26bea1c99929d6d99c9b9ad08813266f770f", + "rev": "9f4190d6e0d6b71146e94867512be193035337b0", "type": "github" }, "original": { @@ -396,11 +398,11 @@ "melpa": { "flake": false, "locked": { - "lastModified": 1783879082, - "narHash": "sha256-WlKaXhzkUWh9gsokAQgIVb3gIMDx+SNvk0eMFoEtzSc=", + "lastModified": 1785427155, + "narHash": "sha256-6z6YOIfeoF2dnRvd56yXXpQACa/buDValgQb0+XbzGI=", "owner": "melpa", "repo": "melpa", - "rev": "5cdf39f996aedcb54ca024b0c62bca0ecb1f8669", + "rev": "fa5bcc94cdf7786e9c675ba308b09d69aa0ce2b3", "type": "github" }, "original": { @@ -419,11 +421,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1783835967, - "narHash": "sha256-lbAgaLDBemsTac7H1HlABcaSKA9xCK5SBzYpEaklY4E=", + "lastModified": 1785494453, + "narHash": "sha256-nK6DCmFpPgaHweU2Y8BMxutfTihwXJ2XkxaoMZPBpMQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3374954b30e9e00637517f973a72ca928384b5f0", + "rev": "68414146fbe13d8fce7748cf2f4e9e46e4834e2e", "type": "github" }, "original": { @@ -452,11 +454,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1783522755, - "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", + "lastModified": 1784570726, + "narHash": "sha256-9EMn69JBcFWFgUM7f0VBAX+jBby5b9H3M59U75+5yI4=", "owner": "YaLTeR", "repo": "niri", - "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", + "rev": "7f26c3ee804fb6ed458ef7fb0e3c794f14e0b3bc", "type": "github" }, "original": { @@ -467,11 +469,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783816212, - "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=", + "lastModified": 1785542685, + "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b32825de172d0bc85664f495edb096b10862524", + "rev": "f8e81fc7eb063db454f563cdd596fb96a5ad1497", "type": "github" }, "original": { @@ -513,11 +515,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1783821755, - "narHash": "sha256-eMPX9S6MKPyUnaOgeRfrG7OKUiAlc1AlcRinMbSB0WA=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "228ab8523d81526e57a6ca342e1a919fb6d246a8", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -565,11 +567,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1783864549, - "narHash": "sha256-vF2WJV1mk+CnCBPYhKqmICVXDsd91pyAlRK7/L7rWf0=", + "lastModified": 1785556992, + "narHash": "sha256-ed/Ma767tHTrtjpAsLfsg0J+DN4q2UuoxgOeC1nM7J4=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "430870e0acf64852270ac9baf4db6f876816e468", + "rev": "a2cdecf4d726ed098a9cb575c599cd4ffba5e5f4", "type": "github" }, "original": { @@ -580,11 +582,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "lastModified": 1785454630, + "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", "type": "github" }, "original": { @@ -596,11 +598,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "lastModified": 1785571196, + "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06", "type": "github" }, "original": { @@ -612,11 +614,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "lastModified": 1785454630, + "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", "type": "github" }, "original": { @@ -633,11 +635,11 @@ ] }, "locked": { - "lastModified": 1783880937, - "narHash": "sha256-SLpEXBMj0/cASkfmyluLICGTHWukVPI63u7meMpRCOM=", + "lastModified": 1785603479, + "narHash": "sha256-BembuDefgisohYMY/RGe1gi1Ldkr0CUjP1TMgLphUI4=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "433a1962975a83348fd744ee66b9adb3993d28f5", + "rev": "73e498510e6f134b038a1c399bfe18e4e807102a", "type": "github" }, "original": { @@ -649,11 +651,11 @@ "nongnu": { "flake": false, "locked": { - "lastModified": 1782554643, - "narHash": "sha256-4cTfnlfiz8O0ii0GWdHVqw1bJUreeCZY/eVhhq3PQGY=", + "lastModified": 1784378203, + "narHash": "sha256-2LHRz//PTwY5kRvdiSNvWhJueG4T4B4zMdgat5DUoBs=", "ref": "main", - "rev": "2e12d173f9e329f1a37c07a4a84fdbaaff12d245", - "revCount": 404, + "rev": "c60c2d7ae50999938338f30a544b412b2153e861", + "revCount": 405, "type": "git", "url": "https://git.savannah.gnu.org/git/emacs/nongnu.git" }, @@ -675,11 +677,11 @@ ] }, "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "lastModified": 1783439237, + "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=", "owner": "nix-community", "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503", "type": "github" }, "original": { @@ -732,11 +734,11 @@ ] }, "locked": { - "lastModified": 1783834461, - "narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=", + "lastModified": 1785562362, + "narHash": "sha256-J15aBa3d6B1SUUAQydQ06wFjPzrrcVceb6jkdfwfGls=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a286e5b998e852297a403786f063fb2c9fe7f57a", + "rev": "5f29c219a7655519f8a9f8c6968064b82c17cc93", "type": "github" }, "original": { @@ -765,11 +767,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1783358511, - "narHash": "sha256-/F85cBWvU8b2hpawuCog464065ZTJtdMgVPWwJ9yHjE=", + "lastModified": 1785518890, + "narHash": "sha256-BeXpCHTPZ+ZlRR12nYe/0JHjfp/fgJVY2YV2xAz8JHs=", "owner": "danth", "repo": "stylix", - "rev": "14814ef555d8148ab82eba5054e654cd9eae3a1f", + "rev": "6316d1d03e7a12cae7cdb007f34d2eaebbfc802a", "type": "github" }, "original": { @@ -827,11 +829,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "lastModified": 1781968807, + "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7", "type": "github" }, "original": { @@ -843,11 +845,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "lastModified": 1782012462, + "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4", "type": "github" }, "original": { @@ -859,11 +861,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "lastModified": 1782009766, + "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1", "type": "github" }, "original": { @@ -877,11 +879,11 @@ "elisp-helpers": "elisp-helpers" }, "locked": { - "lastModified": 1782962225, - "narHash": "sha256-0ehUDDBy44dos6Heq1LatRdD/SM7YMDR3ApbWPGNnYk=", + "lastModified": 1784591000, + "narHash": "sha256-WN1fwSB0X2+PRGlvp1QABWo4NbgeR6MempXH7y0nP8o=", "owner": "emacs-twist", "repo": "twist.nix", - "rev": "267604e48a8a8d528d05682073307c8369eb8a29", + "rev": "cf6d43cac9811c2b3f3de95a79ca351e1bca4e57", "type": "github" }, "original": { @@ -910,11 +912,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1781226823, - "narHash": "sha256-28696iIw8uE0ZUyFTtzhEM8xMh85clCYypMxkvUi+sc=", + "lastModified": 1784679892, + "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8575d0ef55d70f9b4c46b6bffb3accf912217e1e", + "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", "type": "github" }, "original": { diff --git a/modules/home/profiles/desktop/niri.nix b/modules/home/profiles/desktop/niri.nix index 73be4fc..d6a4878 100644 --- a/modules/home/profiles/desktop/niri.nix +++ b/modules/home/profiles/desktop/niri.nix @@ -298,8 +298,25 @@ in ]; }; }; - idle.behavior.lock = { - enabled = true; + idle = { + behavior = { + lock = { + enabled = true; + timeout = 600; + action = "lock"; + }; + screen-off = { + enabled = true; + timeout = 660; + action = "screen_off"; + }; + # TODO: setup a laptop profile on the hm side of things. + # suspend = { + # enabled = config.profiles.laptop.enable; + # timeout = 900; + # action = "lock_and_suspend"; + # }; + }; }; location = { address = "New Haven, CT"; diff --git a/modules/nixos/profiles/laptop.nix b/modules/nixos/profiles/laptop.nix index 2db314d..2de8d13 100644 --- a/modules/nixos/profiles/laptop.nix +++ b/modules/nixos/profiles/laptop.nix @@ -11,7 +11,7 @@ in { suspendThenHibernate = { enable = mkOption { type = types.bool; - default = true; + default = false; description = "Whether to setup suspend then hibernate when closing the lid."; }; delayHours = mkOption { @@ -42,7 +42,7 @@ in { environment.systemPackages = with pkgs; [powertop brightnessctl]; # Setup suspend then hibernate. - services.logind.lidSwitch = + services.logind.settings.Login.HandleLidSwitch = if cfg.suspendThenHibernate.enable then "suspend-then-hibernate" else "suspend"; -- 2.51.2