diff --git a/flake.lock b/flake.lock index 5c9f2984..f6a93662 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1729527199, - "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", + "lastModified": 1730968822, + "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", + "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1730767100, - "narHash": "sha256-SGkgP2H+i1jewNFBuAs4+grutNrfm5by+JUERUdXIRo=", + "lastModified": 1731000594, + "narHash": "sha256-Fl0SrKBg1aH1d/z4hflP54Htdw8P8KHfgXzipUnAVhQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f8969fe1947ed81785a9e52f62622c03d3e58971", + "rev": "95b190eebfa073bc748bf52dc874f69a5d22b8ef", "type": "github" }, "original": { @@ -70,6 +70,67 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1730754837, + "narHash": "sha256-09/CM5Bwx06/emGO6qFvhTsQB2lQNzURk/SjQ8nbQIo=", + "rev": "61819e490d85ff68680def6f2b0d7ee602857078", + "revCount": 150, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.150%2Brev-61819e490d85ff68680def6f2b0d7ee602857078/0192f90a-ec21-7c78-a3a3-7ddf7abdc50e/source.tar.gz?rev=61819e490d85ff68680def6f2b0d7ee602857078&revCount=150" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A.tar.gz" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-OhG8joS/uN3Kdw4h9w8F/6ZIVTFZ8J9Fb4NGn/KK5/s=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-AGcHQSIdb+KEJlhJzMB4YyFxbjdLZEDDf6bv6Zi3wqM=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-kU4dqHoYe3sFf4LDAUj4fyl9uGV8IHtE22+DdMeRN0s=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/rev/51ecec5a3148baef87c2015536aa12dd18e4c4ad/x86_64-linux" + } + }, "flake-compat": { "flake": false, "locked": { @@ -118,7 +179,46 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -170,6 +270,45 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "determinate", + "nix", + "nix" + ], + "gitignore": [ + "determinate", + "nix", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "determinate", + "nix", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -222,11 +361,11 @@ ] }, "locked": { - "lastModified": 1730633670, - "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -242,11 +381,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -293,17 +432,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1730830488, - "narHash": "sha256-a5VCm6ylWMtRiominRJhP+Plo8urEIba3v3vfWcDIG4=", + "lastModified": 1731254055, + "narHash": "sha256-JJ0xZCm8NTNAtTRH0+E1UvxE6mzJXKi0beKEulV+cj0=", "ref": "refs/heads/main", - "rev": "3bf6f78dad5f78dd8f4f519ceaa5a98671c90b14", - "revCount": 5418, + "rev": "9e628067fc54851dc9138c2882abb21f72c5a5a6", + "revCount": 5437, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -402,11 +541,11 @@ ] }, "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "lastModified": 1731163338, + "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", "type": "github" }, "original": { @@ -449,11 +588,11 @@ ] }, "locked": { - "lastModified": 1730625581, - "narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=", + "lastModified": 1730962714, + "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d", + "rev": "93b525229c99fec0016db72a174f43b9d6237714", "type": "github" }, "original": { @@ -465,7 +604,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": [ "flake-parts" ], @@ -489,6 +628,41 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1715853528, + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.8.1", + "repo": "libgit2", + "type": "github" + } + }, + "nix": { + "inputs": { + "nix": "nix_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1730373645, + "narHash": "sha256-y1z53C9+yH1LUCWuouuA0i4vzXEAm8bmK0gyNAY/fyc=", + "rev": "34ca8a4d254e15adfdaaee98aea882511bba01b4", + "revCount": 104, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix/2.24.10/0192e251-cc5a-7b3c-8339-faf088a24136/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix/2.0" + } + }, "nix-flatpak": { "locked": { "lastModified": 1711997201, @@ -530,18 +704,18 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1730857608, - "narHash": "sha256-94IqaCMuMtLcdPabzzwyDOCEebt9LFqvgznDnVtsq7c=", + "lastModified": 1731203492, + "narHash": "sha256-K9h4TxgwY3QV5Vaqokd6ygJTGr/dTPt4lVyvuYGpWKU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b3690ec13c5fe8dba550b1f6f4c3f0acc0f86cee", + "rev": "85caf0185a4bf8fc2161c33a6d6d328052d7da44", "type": "github" }, "original": { @@ -550,13 +724,36 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1730321079, + "narHash": "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=", + "rev": "597fcc98e18e3178734d06a9e7306250e8cb8d74", + "revCount": 18185, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.24.10/0192e247-90bb-7e27-ba8d-f7ee8344a03e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nix/%3D2.24.10" + } + }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -566,13 +763,29 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-edge": { "locked": { - "lastModified": 1730858696, - "narHash": "sha256-us4xhqqW6OkjCihXYuFArhwx91cTzns8FEY8lE4v7JQ=", + "lastModified": 1731215597, + "narHash": "sha256-9jLhAo5x2AixqITmqt0mR72OXdT3sCt8gIbiMrfHY/E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8541b4db5adb9dd835ed5d0023dec229987b7391", + "rev": "343b0a2225308ff6b8f2a1638f8664bc4bc7037b", "type": "github" }, "original": { @@ -583,11 +796,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1730885313, - "narHash": "sha256-A/1ubU29D11H0pmVHo79A40kg/39gVVLIatum96jeYQ=", + "lastModified": 1731265036, + "narHash": "sha256-e5I+glVZwQvLT6WIeMFi0Mk+N/jkYauZ31ir2NRZcf8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0fc421dfda271da2444f0efd37da1622b27d47cb", + "rev": "8aed22ecd71e5b67e5299efae8b9dc580dec711c", "type": "github" }, "original": { @@ -596,13 +809,29 @@ "type": "indirect" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-scx-test": { "locked": { - "lastModified": 1730873178, - "narHash": "sha256-HqEm61mbthNLhYVz86fjz3vasx2NbImmZPukGkrLoes=", + "lastModified": 1731262485, + "narHash": "sha256-AaLbBwCtRMAgcYtwg1y47bAxAr1U4HZcPfKWNz51bTg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7eeacb08dd477ed5b7ea92e329ba938712c2b975", + "rev": "51b1b7cb984394ad83dba44d5e4dbf4713a78a4e", "type": "github" }, "original": { @@ -614,11 +843,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -646,21 +875,49 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { + "locked": { + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "revCount": 636213, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2405.636213%2Brev-64b80bfb316b57cdb8919a9110ef63393d74382a/0192d84c-b6fc-7e39-a326-c46cc00f5b6a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1729980323, + "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", + "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", + "revCount": 697431, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.697431%2Brev-86e78d3d2084ff87688da662cf78c2af085d8e73/0192d6c6-ebf3-7285-bc0c-0fb71cc054e0/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1.tar.gz" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1730785428, "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", @@ -669,13 +926,29 @@ "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "type": "github" + }, "original": { "id": "nixpkgs", "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_7": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -693,11 +966,11 @@ }, "nur": { "locked": { - "lastModified": 1730885145, - "narHash": "sha256-UPrBEY0No1O3ULb67xYjRh2r3u7MnZovfo1oYSPCIxI=", + "lastModified": 1731264423, + "narHash": "sha256-DTWprnE/7Oud9JpJL1LOGVJP9CFod7YeArsb0U3yXWo=", "owner": "nix-community", "repo": "NUR", - "rev": "c0d8828600ef47d475e6ec33513bf9af6eb6b991", + "rev": "00516a12c8792c11daa0982b8285b54c9a4e3c5e", "type": "github" }, "original": { @@ -708,7 +981,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -717,11 +990,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -760,13 +1033,14 @@ "root": { "inputs": { "chaotic": "chaotic", - "flake-parts": "flake-parts", + "determinate": "determinate", + "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", "hyprland": "hyprland", "lanzaboote": "lanzaboote", "nix-flatpak": "nix-flatpak", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_6", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-master": "nixpkgs-master", "nixpkgs-scx-test": "nixpkgs-scx-test", @@ -778,7 +1052,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_7", "utils": "utils" }, "locked": { @@ -883,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1730109786, - "narHash": "sha256-YSmZB4geETQ7eheCTfYn/t7b6rit+WySU4/3sMUqd6Y=", + "lastModified": 1731184947, + "narHash": "sha256-8xtbRd9cU8UzULQUu59t5mW7WzLKWBwAPdd5HKsy6zY=", "owner": "e-tho", "repo": "ucodenix", - "rev": "18221fe451cb5627a1327b18f5bdf5d03a979d5b", + "rev": "ffd8b3f5d9bf3ccb62c2a2152114644a94ee75af", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f844d718..5d56a721 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,9 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; + # Determinate, Nix by Determinate Systems + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*.tar.gz"; + # Don't add follows nixpkgs, else will cause local rebuilds chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; # Bleeding edge packages from chaotic nyx, especially CachyOS kernel diff --git a/flake/hosts.nix b/flake/hosts.nix index a7838bab..62c87187 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -36,6 +36,7 @@ in { modules = [ ../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.ucodenix.nixosModules.ucodenix # ucodeNix - CPU microcode updates @@ -48,7 +49,7 @@ in { home-manager = { useGlobalPkgs = true; useUserPackages = true; - backupFileExtension = "hm.bak"; + #backupFileExtension = "hm.bak"; extraSpecialArgs = specialArgs // { diff --git a/system/hardware/default.nix b/system/hardware/default.nix index 271dc54e..4e8c6405 100644 --- a/system/hardware/default.nix +++ b/system/hardware/default.nix @@ -17,6 +17,6 @@ enable = true; # Use `cpuid | sed -n 's/^.*processor serial number = //p' | head -n1` # to get the serial number of your CPU - cpuSerialNumber = "00A6-0F12-0000-0000-0000-0000"; + # cpuSerialNumber = "00A6-0F12-0000-0000-0000-0000"; # not needed anymore }; } diff --git a/system/nix-settings.nix b/system/nix-settings.nix index 920f04a3..b698f629 100644 --- a/system/nix-settings.nix +++ b/system/nix-settings.nix @@ -5,7 +5,8 @@ userSettings, ... }: { - nix.package = pkgs.lix; # pkgs-edge.nixVersions.latest; # Use latest nix + ## Determinate Nix is configured in ../flake/hosts.nix + # nix.package = pkgs.lix; # pkgs-edge.nixVersions.latest; # Use latest nix # DONOT DISABLE THIS nix.settings.trusted-users = [userSettings.username]; # FIXME: if someday custom cache works without this