From 764fe376ccfa2c38eeae51a7e906d24a6c0d7c22 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:56:29 +0530 Subject: [PATCH] update nixpkgs Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- flake.lock | 408 ++++++++++++++++++++--------------- flake.nix | 18 +- flake/default.nix | 4 +- flake/hosts.nix | 2 +- home-manager/alacritty.nix | 4 +- modules-overlays/default.nix | 1 - pkgs/fhs-shell.nix | 2 +- pkgs/user-packages.nix | 1 + system/boot/lanzaboote.nix | 2 +- system/hardware/graphics.nix | 2 +- system/hyprland/default.nix | 2 +- system/hyprland/session.nix | 2 +- system/nix-settings.nix | 2 +- 13 files changed, 261 insertions(+), 189 deletions(-) diff --git a/flake.lock b/flake.lock index a15fbbd5..aca95a5e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1731959031, - "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=", + "lastModified": 1734400729, + "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52", + "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733158806, - "narHash": "sha256-nRFUS2LR0oWxL14kD8wZ7z/ov5Bh0k6sW1+CSW3uLOc=", + "lastModified": 1734631939, + "narHash": "sha256-ZrvI+3uXL6Y9v1+xyNVPpMav0SYPi2ZwcmkaTyarN0E=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c60cb1640cf0d1e6d573757f0a45f2de6e8badec", + "rev": "5694778dcfd69cc5dab9bd83c9eeb147ed3537e4", "type": "github" }, "original": { @@ -55,6 +55,23 @@ "type": "github" } }, + "cpu-microcodes": { + "flake": false, + "locked": { + "lastModified": 1734191706, + "narHash": "sha256-fdS2hRAgWEukflu2eOpCXe3cVg0L0lcRqdxbLOiMZg0=", + "owner": "platomav", + "repo": "CPUMicrocodes", + "rev": "bebd9ed9a3c3c21996eb77373d3408296b0b9d3d", + "type": "github" + }, + "original": { + "owner": "platomav", + "repo": "CPUMicrocodes", + "rev": "bebd9ed9a3c3c21996eb77373d3408296b0b9d3d", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1730652660, @@ -80,15 +97,17 @@ ], "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", "nix": "nix", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1732231026, - "narHash": "sha256-tuqod7g+1+PvtUXUlLl4MwY9B+gr4rAEOGvhmhtWLbE=", - "rev": "29b7b7dfb1c878267383aa91c357ef464bef0f0d", - "revCount": 159, + "lastModified": 1733950326, + "narHash": "sha256-nUTutqzg/Z0eEXrC1ACTa4a9Ik5Iyxgqo8uL9DYib7I=", + "rev": "657395244a854da1bc71e38454958ecd57c0e241", + "revCount": 165, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.159%2Brev-29b7b7dfb1c878267383aa91c357ef464bef0f0d/01935106-420e-7097-93f6-ef4f1b11ffde/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.165%2Brev-657395244a854da1bc71e38454958ecd57c0e241/0193b781-6c27-7703-bca6-fc9648fca81d/source.tar.gz" }, "original": { "type": "tarball", @@ -98,37 +117,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-6E9DFC4lTpjmErG2TvV7rIS1tiyGZZYg0Kd4pT5GOkU=", + "narHash": "sha256-I03XaJRNQHh/N3ea2qpMU78DahTm7tSfF+urRABhKiQ=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-CnbFYAL7dAl8qBIvAFMVjW4KpQgmWlghnK3qfoLEP8Q=", + "narHash": "sha256-yxF7hyInOc+S1BEaxjLBLHUFjSAjC0bRKh0glUt4ilo=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-0w3gbvncDwukX4PHVWeOZeD6F6vsEuePoNOIlAvdEq0=", + "narHash": "sha256-/LPSCwR/ueorahCcyUSVym3y3lnRXkc6pqWwW2T/yT8=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.6/x86_64-linux" } }, "flake-compat": { @@ -225,11 +244,32 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -361,11 +401,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1734622158, + "narHash": "sha256-h/fdzqlCqSa2ZCIqtDc9kshCJm6kQIoKuO0MSSmAX4A=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "832920a60833533eaabcc93ab729801bf586fa0c", "type": "github" }, "original": { @@ -381,11 +421,11 @@ ] }, "locked": { - "lastModified": 1733133928, - "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -411,11 +451,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1734364709, + "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", "type": "github" }, "original": { @@ -424,25 +464,56 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733684019, + "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1733157082, - "narHash": "sha256-wbfUls7vwEs00xdGbYn1L8ZOrMS4zhisq9XVwjND/fc=", + "lastModified": 1734639812, + "narHash": "sha256-OxrpnYxFcnh7m6oUeD1zJnqTizTBTsPYz6PjiU1/wuk=", "ref": "refs/heads/main", - "rev": "92186898c0ca1b3f72922b72c4af1723f0d9b888", - "revCount": 5509, + "rev": "71dc9f6128b8d2e382b2a574d2d5f15e2d907f3a", + "revCount": 5573, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -478,6 +549,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733940128, + "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -494,11 +594,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1734364628, + "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", "type": "github" }, "original": { @@ -541,11 +641,11 @@ ] }, "locked": { - "lastModified": 1732288281, - "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=", + "lastModified": 1734384247, + "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c", + "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", "type": "github" }, "original": { @@ -566,11 +666,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1734384417, + "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", "type": "github" }, "original": { @@ -588,11 +688,11 @@ ] }, "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", + "lastModified": 1734591594, + "narHash": "sha256-7Q4hXE+b9A4DebZ5Q+q3WStuMiWR5bMW0ltpzbY/zMQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", + "rev": "ce2abe494524cdb389a5d31c11c41834d4362ac5", "type": "github" }, "original": { @@ -651,12 +751,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1730373645, - "narHash": "sha256-y1z53C9+yH1LUCWuouuA0i4vzXEAm8bmK0gyNAY/fyc=", - "rev": "34ca8a4d254e15adfdaaee98aea882511bba01b4", - "revCount": 104, + "lastModified": 1733248733, + "narHash": "sha256-rOFE8TSwWoup+LPNbmtTs6oLy7lYZ12L9GN+aZuQQaA=", + "rev": "98bbabc68ac8c897c2ad873c3557125691c45120", + "revCount": 108, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.10/0192e251-cc5a-7b3c-8339-faf088a24136/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.25.3/01939864-5191-788c-b898-163d916a3333/source.tar.gz" }, "original": { "type": "tarball", @@ -665,16 +765,16 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1711997201, - "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", + "lastModified": 1733228754, + "narHash": "sha256-Jbt4imHmz5Z0jdaW7RrwAO1HYCmPs3XCt4j86jkG0b4=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", + "rev": "2880dc44fc8c450b4ffe1609a4bccd19ef759f5c", "type": "github" }, "original": { "owner": "gmodena", - "ref": "v0.4.1", + "ref": "v0.5.1", "repo": "nix-flatpak", "type": "github" } @@ -711,11 +811,11 @@ ] }, "locked": { - "lastModified": 1733104664, - "narHash": "sha256-UhlyYYO84s36aSj0/xZdclY6CgwJSWPYtTHTOBuHodM=", + "lastModified": 1734659394, + "narHash": "sha256-rI7fcI4+J+iAiCvQ0J3hECJJGD9cAVTAFRTj1xrX6Qo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e3a9b717e8327886d4ab6115f6989f4d1ef44e51", + "rev": "1792f1bbfccbd5ebcb745250e4fc57067c6dfd9c", "type": "github" }, "original": { @@ -735,25 +835,25 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1730321079, - "narHash": "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=", - "rev": "597fcc98e18e3178734d06a9e7306250e8cb8d74", - "revCount": 18185, + "lastModified": 1732881227, + "narHash": "sha256-T+wFMm3cj8pGJSwXmPuxG5pz+1gRDJoToF9OBxtzocA=", + "rev": "218cd6c16c0981cc32a45e3a15be1d3c1a68eb85", + "revCount": 18724, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.24.10/0192e247-90bb-7e27-ba8d-f7ee8344a03e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.25.3/01938786-bc70-79e3-b7ee-bb61f8e7f238/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nix/%3D2.24.10" + "url": "https://flakehub.com/f/NixOS/nix/%3D2.25.3" } }, "nixpkgs": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -779,29 +879,13 @@ "type": "github" } }, - "nixpkgs-cava-fix": { - "locked": { - "lastModified": 1733098789, - "narHash": "sha256-CLxTtcJbS594ITh8wnnnYl4WWrSgNpuC252T9PiYM4I=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4c5b0c01f07e29d88c715c0fbf5fe3087338b615", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "staging-next-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-edge": { "locked": { - "lastModified": 1733132332, - "narHash": "sha256-8DTh3irBPko0ooHaeGJ5kPwBD8mOwiMX4eBjFuicLsA=", + "lastModified": 1734623593, + "narHash": "sha256-iA3kxtbds7yOc77oRBz2On9ZmOVI/1Pic+YQtYUyIsg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9ffe0d2ef589f4d75a62f908f00dfd6344b6b6e", + "rev": "8af52ff6ba2ed83047881e877718db3bb02fad85", "type": "github" }, "original": { @@ -810,28 +894,13 @@ "type": "indirect" } }, - "nixpkgs-libreoffice-pin": { - "locked": { - "lastModified": 1724650834, - "narHash": "sha256-jOKimczSTnZDrq8UhjRIwofmvuGDscUqRaOya8jpTeg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8487207876bffcf99e92aea3b853998bbeb474f0", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "8487207876bffcf99e92aea3b853998bbeb474f0", - "type": "indirect" - } - }, "nixpkgs-master": { "locked": { - "lastModified": 1733161103, - "narHash": "sha256-dccsDGNbUK/PH0av16TjHsNqjAdjowFirZ8SBdwRu3M=", + "lastModified": 1734669812, + "narHash": "sha256-xkB+gQCPLygF1p8IL+E9FQBvDJbY/JMW3HGJ5KH6hrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd519af995cc5fa35c594751a42a02ba6b705ee6", + "rev": "099934f3d7ec89d14fa6a6950205fa7da5b55aba", "type": "github" }, "original": { @@ -906,12 +975,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", - "revCount": 636213, + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "revCount": 710194, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.636213%2Brev-64b80bfb316b57cdb8919a9110ef63393d74382a/0192d84c-b6fc-7e39-a326-c46cc00f5b6a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2411.710194%2Brev-f9f0d5c5380be0a599b1fb54641fa99af8281539/01938be8-64ce-75c6-94d4-dbc2e4d547fe/source.tar.gz" }, "original": { "type": "tarball", @@ -920,25 +989,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", - "rev": "5083ec887760adfe12af64830a66807423a859a7", - "revCount": 709559, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.709559%2Brev-5083ec887760adfe12af64830a66807423a859a7/019342ec-4762-77f2-9a11-86e7601b0be4/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1.tar.gz" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -948,13 +1003,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -963,29 +1018,20 @@ "type": "indirect" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1733156167, - "narHash": "sha256-f8SqvJxn+1JnraMjY8wiH8iEbiDJY5u8mj5RAI21poQ=", + "lastModified": 1734666535, + "narHash": "sha256-4NshlhtbpZJaDlet+J4SfJ9Gh3RA6PlSICeztgAO+zk=", "owner": "nix-community", "repo": "NUR", - "rev": "d16ebc0f37506eb6a382ed415aa91965ad590358", + "rev": "5000f8357f92dbcfb79772b67336123d84c4bf64", "type": "github" }, "original": { @@ -1005,11 +1051,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1734379367, + "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", "type": "github" }, "original": { @@ -1055,10 +1101,8 @@ "lanzaboote": "lanzaboote", "nix-flatpak": "nix-flatpak", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_6", - "nixpkgs-cava-fix": "nixpkgs-cava-fix", + "nixpkgs": "nixpkgs_5", "nixpkgs-edge": "nixpkgs-edge", - "nixpkgs-libreoffice-pin": "nixpkgs-libreoffice-pin", "nixpkgs-master": "nixpkgs-master", "nur": "nur", "rose-pine-hyprcursor": "rose-pine-hyprcursor", @@ -1068,15 +1112,17 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { - "lastModified": 1718180692, - "narHash": "sha256-J5IYvKcdGRL/sBuST5WaoESEIl7KPv8aJK8aLY6C91E=", + "lastModified": 1733265112, + "narHash": "sha256-FdO+2X7TeIAW73hiyFKZbCjlAskb4xMmYYPX97mo9RE=", "owner": "ndom91", "repo": "rose-pine-hyprcursor", - "rev": "40ce26cb29206722ff73839ead0d871d94751e90", + "rev": "89dc9e347ce8da26766ad421b0899536f9f87639", "type": "github" }, "original": { @@ -1166,13 +1212,37 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "ucodenix": { + "inputs": { + "cpu-microcodes": "cpu-microcodes" + }, "locked": { - "lastModified": 1733146393, - "narHash": "sha256-jmZKbnBFrfzFYFVtzeJIdS1XT9mAuxbDT2Y5hfrb0Ks=", + "lastModified": 1734353399, + "narHash": "sha256-d2Pc1JUcwRRI5nt5Jk5+teIjhLhUaq8i4r2FGuE5/bE=", "owner": "e-tho", "repo": "ucodenix", - "rev": "a665cfe1ccd702c3acacc405d64e392b5fdd101b", + "rev": "a70edcafd9a93b8df1d32e664de921669420024e", "type": "github" }, "original": { @@ -1227,11 +1297,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1734422917, + "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 737dcdff..5c5450fd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,11 @@ { - description = "Flake of JohnRTitor (Hyprland, Secure-Boot)"; + description = "NixOS configuration of JohnRTitor (Hyprland, Secure-Boot)"; # Main sources and repositories inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default) nixpkgs-edge.url = "nixpkgs/nixos-unstable-small"; # For latest packages nixpkgs-master.url = "nixpkgs/master"; # Testing branch of nixpkgs - nixpkgs-cava-fix.url = "github:nixos/nixpkgs/staging-next-24.11"; - nixpkgs-libreoffice-pin.url = "nixpkgs/8487207876bffcf99e92aea3b853998bbeb474f0"; flake-parts = { url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management @@ -30,20 +28,26 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; - nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; # Declarative Flatpak support for NixOS + nix-flatpak.url = "github:gmodena/nix-flatpak/v0.5.1"; # Declarative Flatpak support for NixOS ## DESKTOP ENVIRONMENT ## hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # Hyprland, a Wayland WM, use git submodules too - rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; + rose-pine-hyprcursor = { + url = "github:ndom91/rose-pine-hyprcursor"; + inputs.nixpkgs.follows = "nixpkgs"; + }; ## MISC PACKAGES ## ucodenix.url = "github:e-tho/ucodenix"; nix-vscode-extensions = { - url = "github:nix-community/nix-vscode-extensions"; # Grab latest VScode extensions as a package + url = "github:nix-community/nix-vscode-extensions"; # Grab latest VScode extensions as a package; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nur = { + url = "github:nix-community/NUR"; # Nix User Repository, for community packages inputs.nixpkgs.follows = "nixpkgs"; }; - nur.url = "github:nix-community/NUR"; # Nix User Repository, for community packages }; outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} {imports = [./flake];}; diff --git a/flake/default.nix b/flake/default.nix index add456de..3c539372 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -54,9 +54,7 @@ in packages = { fhs-shell = pkgs.callPackage ../pkgs/fhs-shell.nix {}; weather-python-script = pkgs.callPackage ../pkgs/weather-python-script.nix {}; - adminer-pematon-with-adminer-theme = pkgs.callPackage ../pkgs/adminer-pematon-with-adminer-theme { - inherit (pkgs-master) adminer-pematon; - }; + adminer-pematon-with-adminer-theme = pkgs.callPackage ../pkgs/adminer-pematon-with-adminer-theme {}; }; }; } diff --git a/flake/hosts.nix b/flake/hosts.nix index e68d634f..3b04e1a4 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -20,7 +20,7 @@ in { ../default-host/configuration.nix # main nix configuration inputs.determinate.nixosModules.default # new nix by determinant systems inputs.chaotic.nixosModules.default # chaotic nix bleeding edge packages - inputs.nur.nixosModules.nur # NUR - NixOS user repository + inputs.nur.modules.nixos.default # NUR - NixOS user repository inputs.ucodenix.nixosModules.ucodenix # ucodeNix - CPU microcode updates inputs.nix-flatpak.nixosModules.nix-flatpak # nix-flatpak, allows flatpak declaratively diff --git a/home-manager/alacritty.nix b/home-manager/alacritty.nix index d301576b..8cbdad40 100644 --- a/home-manager/alacritty.nix +++ b/home-manager/alacritty.nix @@ -8,7 +8,7 @@ programs.alacritty.enable = true; programs.alacritty.settings = { # SETTINGS START - live_config_reload = true; + general.live_config_reload = true; bell = { animation = "EaseOutExpo"; @@ -96,7 +96,7 @@ semantic_escape_chars = ",│`|:\"' ()[]{}<>"; }; - shell = { + terminal.shell = { program = if (userSettings.shell == "zsh") then "/run/current-system/sw/bin/zsh" diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix index c25690e3..5db2d7a4 100644 --- a/modules-overlays/default.nix +++ b/modules-overlays/default.nix @@ -12,7 +12,6 @@ nixpkgs.overlays = [ (final: prev: { - cava = inputs.nixpkgs-cava-fix.legacyPackages.${pkgs.system}.cava; }) ]; } diff --git a/pkgs/fhs-shell.nix b/pkgs/fhs-shell.nix index 0a4ec027..1446bf4b 100644 --- a/pkgs/fhs-shell.nix +++ b/pkgs/fhs-shell.nix @@ -1,7 +1,7 @@ {pkgs, ...}: let base = pkgs.appimageTools.defaultFhsEnvArgs; in - pkgs.buildFHSUserEnv ( + pkgs.buildFHSEnv ( base // { name = "fhs"; # provides fhs command to enter in a FHS environment diff --git a/pkgs/user-packages.nix b/pkgs/user-packages.nix index 68b68005..1d392231 100644 --- a/pkgs/user-packages.nix +++ b/pkgs/user-packages.nix @@ -89,6 +89,7 @@ "github-copilot" "nixidea" ]) + scilab-bin # whatsapp-for-linux libreoffice-fresh diff --git a/system/boot/lanzaboote.nix b/system/boot/lanzaboote.nix index 3b7c3b35..e645a2ac 100644 --- a/system/boot/lanzaboote.nix +++ b/system/boot/lanzaboote.nix @@ -10,7 +10,7 @@ # lanzaboote for secureboot boot.lanzaboote = { enable = true; - pkiBundle = "/etc/secureboot"; + pkiBundle = "/var/lib/sbctl"; }; # sbctl - a frontend to create, enroll manage keys diff --git a/system/hardware/graphics.nix b/system/hardware/graphics.nix index 6f046996..a976a6e2 100644 --- a/system/hardware/graphics.nix +++ b/system/hardware/graphics.nix @@ -5,7 +5,7 @@ pkgs-edge, ... }: let - nur-amdgpu = config.nur.repos.materus; + nur-amdgpu = pkgs.nur.repos.materus; in { hardware.amdgpu = { initrd.enable = true; diff --git a/system/hyprland/default.nix b/system/hyprland/default.nix index d97182a6..14461065 100644 --- a/system/hyprland/default.nix +++ b/system/hyprland/default.nix @@ -14,7 +14,7 @@ pkgs-hyprland = if hyprlandFlake then inputs.hyprland.packages.${pkgs.system} - else pkgs-edge; + else pkgs; in { imports = [ ./session.nix diff --git a/system/hyprland/session.nix b/system/hyprland/session.nix index 64f74301..08015f80 100644 --- a/system/hyprland/session.nix +++ b/system/hyprland/session.nix @@ -17,7 +17,7 @@ # that properly starts Hyprland compositor with # `graphical-session.target` and necessary services programs.uwsm.enable = true; - programs.uwsm.package = pkgs-edge.uwsm; + programs.uwsm.package = pkgs.uwsm; programs.uwsm.waylandCompositors = { hyprland = { prettyName = "Hyprland"; diff --git a/system/nix-settings.nix b/system/nix-settings.nix index 6bfb4fb2..b9c9a320 100644 --- a/system/nix-settings.nix +++ b/system/nix-settings.nix @@ -6,7 +6,7 @@ ... }: { ## Determinate Nix is configured in ../flake/hosts.nix - # nix.package = pkgs.lix; # pkgs-edge.nixVersions.latest; # Use latest nix + # nix.package = pkgs.lix; # pkgs.nixVersions.latest; # Use latest nix # DONOT DISABLE THIS nix.settings.trusted-users = [userSettings.username]; # FIXME: if someday custom cache works without this