From 995738891731e8c423424954cd22b2f7a6eb2c87 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 19 Nov 2024 18:21:06 -0600 Subject: [PATCH] treewide: snowflake -> flake-parts --- checks/deploy/default.nix | 2 - checks/pre-commit-hooks/default.nix | 21 - .../darwin}/khanelimac/default.nix | 0 .../home}/bruddy@bruddynix/default.nix | 0 .../home}/khaneliman@khanelimac/default.nix | 0 .../home}/khaneliman@khanelinix/default.nix | 0 .../home}/khaneliman@nixos/default.nix | 0 .../home}/nixos@CORE-PW00LM92/default.nix | 0 .../git/windows-compat-config | 0 .../nixos}/CORE-PW00LM92/default.nix | 0 .../nixos}/CORE-PW00LM92/hardware.nix | 0 .../nixos}/bruddynix/default.nix | 0 .../nixos}/bruddynix/disks.nix | 0 .../nixos}/bruddynix/hardware.nix | 0 .../nixos}/bruddynix/network.nix | 0 .../nixos}/bruddynix/specializations.nix | 0 .../nixos}/khanelilab/default.nix | 0 .../nixos}/khanelilab/disks.nix | 0 .../nixos}/khanelilab/hardware.nix | 0 .../nixos}/khanelinix/default.nix | 0 .../nixos}/khanelinix/disks.nix | 0 .../nixos}/khanelinix/hardware.nix | 0 .../nixos}/khanelinix/hyprlandOutput | 0 .../nixos}/khanelinix/monitors.xml | 0 .../nixos}/khanelinix/network.nix | 0 .../nixos}/khanelinix/specializations.nix | 0 .../nixos}/khanelinix/swayOutput | 0 .../nixos}/nixos/default.nix | 0 .../nixos}/nixos/hardware.nix | 0 .../systems}/aarch64-linux/nixos/default.nix | 0 .../systems}/aarch64-linux/nixos/hardware.nix | 0 .../x86_64-install-iso/graphical/default.nix | 0 .../x86_64-install-iso/minimal/default.nix | 0 .../systems}/x86_64-iso/isolated/default.nix | 0 .../systems}/x86_64-iso/rescue/default.nix | 0 flake.lock | 533 +++++++++++++----- flake.nix | 214 ++++--- modules/flake-parts.bak/default.nix | 20 + modules/flake-parts.bak/dev/default.nix | 7 + modules/flake-parts.bak/dev/devshell.nix | 58 ++ modules/flake-parts.bak/dev/git-hooks.nix | 40 ++ modules/flake-parts.bak/dev/server.py | 16 + modules/flake-parts.bak/dev/treefmt.nix | 108 ++++ modules/flake-parts.bak/lib.nix | 19 + modules/flake-parts.bak/packages.nix | 20 + modules/flake-parts.bak/templates.nix | 61 ++ modules/flake-parts/devshell.nix | 14 + modules/flake-parts/git-hooks.nix | 40 ++ modules/flake-parts/pkgs-by-name.nix | 15 + modules/flake-parts/toplevel.nix | 28 + modules/flake-parts/treefmt.nix | 76 +++ .../{csharp-ls/default.nix => csharp-ls.nix} | 0 .../default.nix => looking-glass-client.nix} | 0 overlays/master.nix | 5 + overlays/master/default.nix | 6 - .../default.nix => nixpkgs-unstable.nix} | 5 +- .../default.nix => sketchybar.nix} | 0 .../{default.nix => package.nix} | 0 packages/avrogen/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 packages/fix-git/{default.nix => package.nix} | 0 .../git-cliff/{default.nix => package.nix} | 0 .../list-iommu/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 packages/sbarlua/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../trace-which/{default.nix => package.nix} | 0 .../user-icon/{default.nix => package.nix} | 0 .../wallpapers/{default.nix => package.nix} | 0 .../yabai-helper/{default.nix => package.nix} | 0 templates/angular/flake.nix | 6 + templates/dotnetf/flake.nix | 6 +- treefmt.nix | 96 ---- 75 files changed, 1042 insertions(+), 374 deletions(-) delete mode 100644 checks/deploy/default.nix delete mode 100644 checks/pre-commit-hooks/default.nix rename {systems/aarch64-darwin => configurations/darwin}/khanelimac/default.nix (100%) rename {homes/x86_64-linux => configurations/home}/bruddy@bruddynix/default.nix (100%) rename {homes/aarch64-darwin => configurations/home}/khaneliman@khanelimac/default.nix (100%) rename {homes/x86_64-linux => configurations/home}/khaneliman@khanelinix/default.nix (100%) rename {homes/x86_64-linux => configurations/home}/khaneliman@nixos/default.nix (100%) rename {homes/x86_64-linux => configurations/home}/nixos@CORE-PW00LM92/default.nix (100%) rename {homes/x86_64-linux => configurations/home}/nixos@CORE-PW00LM92/git/windows-compat-config (100%) rename {systems/x86_64-linux => configurations/nixos}/CORE-PW00LM92/default.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/CORE-PW00LM92/hardware.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/bruddynix/default.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/bruddynix/disks.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/bruddynix/hardware.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/bruddynix/network.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/bruddynix/specializations.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelilab/default.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelilab/disks.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelilab/hardware.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/default.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/disks.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/hardware.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/hyprlandOutput (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/monitors.xml (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/network.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/specializations.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/khanelinix/swayOutput (100%) rename {systems/x86_64-linux => configurations/nixos}/nixos/default.nix (100%) rename {systems/x86_64-linux => configurations/nixos}/nixos/hardware.nix (100%) rename {systems => configurations/systems}/aarch64-linux/nixos/default.nix (100%) rename {systems => configurations/systems}/aarch64-linux/nixos/hardware.nix (100%) rename {systems => configurations/systems}/x86_64-install-iso/graphical/default.nix (100%) rename {systems => configurations/systems}/x86_64-install-iso/minimal/default.nix (100%) rename {systems => configurations/systems}/x86_64-iso/isolated/default.nix (100%) rename {systems => configurations/systems}/x86_64-iso/rescue/default.nix (100%) create mode 100644 modules/flake-parts.bak/default.nix create mode 100644 modules/flake-parts.bak/dev/default.nix create mode 100644 modules/flake-parts.bak/dev/devshell.nix create mode 100644 modules/flake-parts.bak/dev/git-hooks.nix create mode 100644 modules/flake-parts.bak/dev/server.py create mode 100644 modules/flake-parts.bak/dev/treefmt.nix create mode 100644 modules/flake-parts.bak/lib.nix create mode 100644 modules/flake-parts.bak/packages.nix create mode 100644 modules/flake-parts.bak/templates.nix create mode 100644 modules/flake-parts/devshell.nix create mode 100644 modules/flake-parts/git-hooks.nix create mode 100644 modules/flake-parts/pkgs-by-name.nix create mode 100644 modules/flake-parts/toplevel.nix create mode 100644 modules/flake-parts/treefmt.nix rename overlays/{csharp-ls/default.nix => csharp-ls.nix} (100%) rename overlays/{looking-glass/default.nix => looking-glass-client.nix} (100%) create mode 100644 overlays/master.nix delete mode 100644 overlays/master/default.nix rename overlays/{nixpkgs-unstable/default.nix => nixpkgs-unstable.nix} (72%) rename overlays/{sketchybar/default.nix => sketchybar.nix} (100%) rename packages/artifacts-credprovider/{default.nix => package.nix} (100%) rename packages/avrogen/{default.nix => package.nix} (100%) rename packages/build-by-path/{default.nix => package.nix} (100%) rename packages/dynamic-island-helper/{default.nix => package.nix} (100%) rename packages/fix-git/{default.nix => package.nix} (100%) rename packages/git-cliff/{default.nix => package.nix} (100%) rename packages/list-iommu/{default.nix => package.nix} (100%) rename packages/record_screen/{default.nix => package.nix} (100%) rename packages/sbarlua/{default.nix => package.nix} (100%) rename packages/sketchyhelper/{default.nix => package.nix} (100%) rename packages/trace-symlink/{default.nix => package.nix} (100%) rename packages/trace-which/{default.nix => package.nix} (100%) rename packages/user-icon/{default.nix => package.nix} (100%) rename packages/wallpapers/{default.nix => package.nix} (100%) rename packages/yabai-helper/{default.nix => package.nix} (100%) delete mode 100644 treefmt.nix diff --git a/checks/deploy/default.nix b/checks/deploy/default.nix deleted file mode 100644 index 84b64a8b4..000000000 --- a/checks/deploy/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ inputs, ... }: -builtins.mapAttrs (_: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib diff --git a/checks/pre-commit-hooks/default.nix b/checks/pre-commit-hooks/default.nix deleted file mode 100644 index 8be054eed..000000000 --- a/checks/pre-commit-hooks/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - inputs, - pkgs, - ... -}: -let - inherit (inputs) git-hooks-nix; -in -git-hooks-nix.lib.${pkgs.system}.run { - src = ./.; - hooks = { - clang-tidy.enable = true; - luacheck.enable = true; - pre-commit-hook-ensure-sops.enable = true; - treefmt = { - enable = true; - settings.fail-on-change = false; - packageOverrides.treefmt = inputs.treefmt-nix.lib.mkWrapper pkgs ../../treefmt.nix; - }; - }; -} diff --git a/systems/aarch64-darwin/khanelimac/default.nix b/configurations/darwin/khanelimac/default.nix similarity index 100% rename from systems/aarch64-darwin/khanelimac/default.nix rename to configurations/darwin/khanelimac/default.nix diff --git a/homes/x86_64-linux/bruddy@bruddynix/default.nix b/configurations/home/bruddy@bruddynix/default.nix similarity index 100% rename from homes/x86_64-linux/bruddy@bruddynix/default.nix rename to configurations/home/bruddy@bruddynix/default.nix diff --git a/homes/aarch64-darwin/khaneliman@khanelimac/default.nix b/configurations/home/khaneliman@khanelimac/default.nix similarity index 100% rename from homes/aarch64-darwin/khaneliman@khanelimac/default.nix rename to configurations/home/khaneliman@khanelimac/default.nix diff --git a/homes/x86_64-linux/khaneliman@khanelinix/default.nix b/configurations/home/khaneliman@khanelinix/default.nix similarity index 100% rename from homes/x86_64-linux/khaneliman@khanelinix/default.nix rename to configurations/home/khaneliman@khanelinix/default.nix diff --git a/homes/x86_64-linux/khaneliman@nixos/default.nix b/configurations/home/khaneliman@nixos/default.nix similarity index 100% rename from homes/x86_64-linux/khaneliman@nixos/default.nix rename to configurations/home/khaneliman@nixos/default.nix diff --git a/homes/x86_64-linux/nixos@CORE-PW00LM92/default.nix b/configurations/home/nixos@CORE-PW00LM92/default.nix similarity index 100% rename from homes/x86_64-linux/nixos@CORE-PW00LM92/default.nix rename to configurations/home/nixos@CORE-PW00LM92/default.nix diff --git a/homes/x86_64-linux/nixos@CORE-PW00LM92/git/windows-compat-config b/configurations/home/nixos@CORE-PW00LM92/git/windows-compat-config similarity index 100% rename from homes/x86_64-linux/nixos@CORE-PW00LM92/git/windows-compat-config rename to configurations/home/nixos@CORE-PW00LM92/git/windows-compat-config diff --git a/systems/x86_64-linux/CORE-PW00LM92/default.nix b/configurations/nixos/CORE-PW00LM92/default.nix similarity index 100% rename from systems/x86_64-linux/CORE-PW00LM92/default.nix rename to configurations/nixos/CORE-PW00LM92/default.nix diff --git a/systems/x86_64-linux/CORE-PW00LM92/hardware.nix b/configurations/nixos/CORE-PW00LM92/hardware.nix similarity index 100% rename from systems/x86_64-linux/CORE-PW00LM92/hardware.nix rename to configurations/nixos/CORE-PW00LM92/hardware.nix diff --git a/systems/x86_64-linux/bruddynix/default.nix b/configurations/nixos/bruddynix/default.nix similarity index 100% rename from systems/x86_64-linux/bruddynix/default.nix rename to configurations/nixos/bruddynix/default.nix diff --git a/systems/x86_64-linux/bruddynix/disks.nix b/configurations/nixos/bruddynix/disks.nix similarity index 100% rename from systems/x86_64-linux/bruddynix/disks.nix rename to configurations/nixos/bruddynix/disks.nix diff --git a/systems/x86_64-linux/bruddynix/hardware.nix b/configurations/nixos/bruddynix/hardware.nix similarity index 100% rename from systems/x86_64-linux/bruddynix/hardware.nix rename to configurations/nixos/bruddynix/hardware.nix diff --git a/systems/x86_64-linux/bruddynix/network.nix b/configurations/nixos/bruddynix/network.nix similarity index 100% rename from systems/x86_64-linux/bruddynix/network.nix rename to configurations/nixos/bruddynix/network.nix diff --git a/systems/x86_64-linux/bruddynix/specializations.nix b/configurations/nixos/bruddynix/specializations.nix similarity index 100% rename from systems/x86_64-linux/bruddynix/specializations.nix rename to configurations/nixos/bruddynix/specializations.nix diff --git a/systems/x86_64-linux/khanelilab/default.nix b/configurations/nixos/khanelilab/default.nix similarity index 100% rename from systems/x86_64-linux/khanelilab/default.nix rename to configurations/nixos/khanelilab/default.nix diff --git a/systems/x86_64-linux/khanelilab/disks.nix b/configurations/nixos/khanelilab/disks.nix similarity index 100% rename from systems/x86_64-linux/khanelilab/disks.nix rename to configurations/nixos/khanelilab/disks.nix diff --git a/systems/x86_64-linux/khanelilab/hardware.nix b/configurations/nixos/khanelilab/hardware.nix similarity index 100% rename from systems/x86_64-linux/khanelilab/hardware.nix rename to configurations/nixos/khanelilab/hardware.nix diff --git a/systems/x86_64-linux/khanelinix/default.nix b/configurations/nixos/khanelinix/default.nix similarity index 100% rename from systems/x86_64-linux/khanelinix/default.nix rename to configurations/nixos/khanelinix/default.nix diff --git a/systems/x86_64-linux/khanelinix/disks.nix b/configurations/nixos/khanelinix/disks.nix similarity index 100% rename from systems/x86_64-linux/khanelinix/disks.nix rename to configurations/nixos/khanelinix/disks.nix diff --git a/systems/x86_64-linux/khanelinix/hardware.nix b/configurations/nixos/khanelinix/hardware.nix similarity index 100% rename from systems/x86_64-linux/khanelinix/hardware.nix rename to configurations/nixos/khanelinix/hardware.nix diff --git a/systems/x86_64-linux/khanelinix/hyprlandOutput b/configurations/nixos/khanelinix/hyprlandOutput similarity index 100% rename from systems/x86_64-linux/khanelinix/hyprlandOutput rename to configurations/nixos/khanelinix/hyprlandOutput diff --git a/systems/x86_64-linux/khanelinix/monitors.xml b/configurations/nixos/khanelinix/monitors.xml similarity index 100% rename from systems/x86_64-linux/khanelinix/monitors.xml rename to configurations/nixos/khanelinix/monitors.xml diff --git a/systems/x86_64-linux/khanelinix/network.nix b/configurations/nixos/khanelinix/network.nix similarity index 100% rename from systems/x86_64-linux/khanelinix/network.nix rename to configurations/nixos/khanelinix/network.nix diff --git a/systems/x86_64-linux/khanelinix/specializations.nix b/configurations/nixos/khanelinix/specializations.nix similarity index 100% rename from systems/x86_64-linux/khanelinix/specializations.nix rename to configurations/nixos/khanelinix/specializations.nix diff --git a/systems/x86_64-linux/khanelinix/swayOutput b/configurations/nixos/khanelinix/swayOutput similarity index 100% rename from systems/x86_64-linux/khanelinix/swayOutput rename to configurations/nixos/khanelinix/swayOutput diff --git a/systems/x86_64-linux/nixos/default.nix b/configurations/nixos/nixos/default.nix similarity index 100% rename from systems/x86_64-linux/nixos/default.nix rename to configurations/nixos/nixos/default.nix diff --git a/systems/x86_64-linux/nixos/hardware.nix b/configurations/nixos/nixos/hardware.nix similarity index 100% rename from systems/x86_64-linux/nixos/hardware.nix rename to configurations/nixos/nixos/hardware.nix diff --git a/systems/aarch64-linux/nixos/default.nix b/configurations/systems/aarch64-linux/nixos/default.nix similarity index 100% rename from systems/aarch64-linux/nixos/default.nix rename to configurations/systems/aarch64-linux/nixos/default.nix diff --git a/systems/aarch64-linux/nixos/hardware.nix b/configurations/systems/aarch64-linux/nixos/hardware.nix similarity index 100% rename from systems/aarch64-linux/nixos/hardware.nix rename to configurations/systems/aarch64-linux/nixos/hardware.nix diff --git a/systems/x86_64-install-iso/graphical/default.nix b/configurations/systems/x86_64-install-iso/graphical/default.nix similarity index 100% rename from systems/x86_64-install-iso/graphical/default.nix rename to configurations/systems/x86_64-install-iso/graphical/default.nix diff --git a/systems/x86_64-install-iso/minimal/default.nix b/configurations/systems/x86_64-install-iso/minimal/default.nix similarity index 100% rename from systems/x86_64-install-iso/minimal/default.nix rename to configurations/systems/x86_64-install-iso/minimal/default.nix diff --git a/systems/x86_64-iso/isolated/default.nix b/configurations/systems/x86_64-iso/isolated/default.nix similarity index 100% rename from systems/x86_64-iso/isolated/default.nix rename to configurations/systems/x86_64-iso/isolated/default.nix diff --git a/systems/x86_64-iso/rescue/default.nix b/configurations/systems/x86_64-iso/rescue/default.nix similarity index 100% rename from systems/x86_64-iso/rescue/default.nix rename to configurations/systems/x86_64-iso/rescue/default.nix diff --git a/flake.lock b/flake.lock index d038bd651..1b5faff6b 100644 --- a/flake.lock +++ b/flake.lock @@ -75,8 +75,8 @@ "blink-cmp": { "inputs": { "fenix": "fenix", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_12" + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1736057994, @@ -257,6 +257,24 @@ } }, "devshell": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", + "owner": "numtide", + "repo": "devshell", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { "inputs": { "nixpkgs": [ "khanelivim", @@ -280,7 +298,7 @@ }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1734088167, @@ -352,7 +370,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_11": { "flake": false, "locked": { "lastModified": 1696426674, @@ -364,18 +382,19 @@ }, "original": { "owner": "edolstra", + "ref": "v1.0.1", "repo": "flake-compat", "type": "github" } }, - "flake-compat_3": { + "flake-compat_12": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -384,21 +403,39 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_13": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, - "flake-compat_5": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -414,14 +451,14 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -430,7 +467,21 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_5": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -447,7 +498,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1650374568, @@ -463,7 +514,7 @@ "type": "github" } }, - "flake-compat_9": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1650374568, @@ -479,6 +530,22 @@ "type": "github" } }, + "flake-compat_9": { + "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": [ @@ -522,6 +589,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, + "locked": { + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, "locked": { "lastModified": 1733312601, "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", @@ -536,7 +621,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "khanelivim", @@ -558,7 +643,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -579,7 +664,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "nur", @@ -620,7 +705,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1715533576, @@ -639,7 +724,26 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_7" + "flake-utils": "flake-utils_5" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + } + }, + "flake-utils-plus_3": { + "inputs": { + "flake-utils": "flake-utils_8" }, "locked": { "lastModified": 1715533576, @@ -693,15 +797,12 @@ } }, "flake-utils_4": { - "inputs": { - "systems": "systems_7" - }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -712,14 +813,14 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -729,12 +830,15 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_8" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -748,11 +852,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -762,6 +866,21 @@ } }, "flake-utils_8": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { "inputs": { "systems": "systems_10" }, @@ -803,7 +922,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_4", "nixpkgs": [ "khanelivim", "nixvim", @@ -828,7 +947,27 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks-nix_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_3", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1735882644, @@ -888,6 +1027,28 @@ } }, "gitignore_3": { + "inputs": { + "nixpkgs": [ + "khanelivim", + "git-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_4": { "inputs": { "nixpkgs": [ "khanelivim", @@ -910,7 +1071,7 @@ "type": "github" } }, - "gitignore_4": { + "gitignore_5": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -994,7 +1155,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1736066484, @@ -1034,7 +1195,7 @@ }, "hypr-socket-watch": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "rust-overlay": "rust-overlay" }, "locked": { @@ -1119,7 +1280,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_5", "xdph": "xdph" @@ -1336,18 +1497,12 @@ "blink-cmp": "blink-cmp", "blink-compat": "blink-compat", "blink-emoji": "blink-emoji", - "git-hooks-nix": [ - "git-hooks-nix" - ], - "nixpkgs": "nixpkgs_13", + "git-hooks-nix": "git-hooks-nix_2", + "nixpkgs": "nixpkgs_15", "nixpkgs-tree-sitter": "nixpkgs-tree-sitter", "nixvim": "nixvim", - "snowfall-flake": [ - "snowfall-flake" - ], - "snowfall-lib": [ - "snowfall-lib" - ] + "snowfall-flake": "snowfall-flake", + "snowfall-lib": "snowfall-lib_2" }, "locked": { "lastModified": 1736095908, @@ -1366,10 +1521,10 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_5", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_15", + "flake-compat": "flake-compat_9", + "flake-parts": "flake-parts_6", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_17", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_2" }, @@ -1444,7 +1599,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1736047960, @@ -1460,10 +1615,25 @@ "type": "github" } }, + "nixos-unified": { + "locked": { + "lastModified": 1735833372, + "narHash": "sha256-I8aD120ikq/WWFQ95MacxH/0RETpM+SFQX7ess7CvRA=", + "owner": "srid", + "repo": "nixos-unified", + "rev": "61d3fc775abc937b0d8dfc687d3116f841b59fb7", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "nixos-unified", + "type": "github" + } + }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_10", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] @@ -1517,6 +1687,18 @@ } }, "nixpkgs-lib_2": { + "locked": { + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" + } + }, + "nixpkgs-lib_3": { "locked": { "lastModified": 1733096140, "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", @@ -1624,6 +1806,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1639,7 +1837,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1735291276, "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", @@ -1655,7 +1853,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1734435836, "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", @@ -1671,7 +1869,23 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { + "locked": { + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { "locked": { "lastModified": 1735915915, "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=", @@ -1687,7 +1901,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_16": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -1703,7 +1917,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_17": { "locked": { "lastModified": 1717794163, "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", @@ -1719,7 +1933,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_18": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -1735,7 +1949,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_19": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -1751,7 +1965,20 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_2": { + "locked": { + "lastModified": 1690031011, + "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", + "path": "/nix/store/gxw5rlp29swdpgz26vhaqzy21b9pxrim-source", + "rev": "12303c652b881435065a98729eb7278313041e49", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_20": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -1767,7 +1994,7 @@ "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_21": { "locked": { "lastModified": 1704290814, "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", @@ -1783,20 +2010,7 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1690031011, - "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", - "path": "/nix/store/gxw5rlp29swdpgz26vhaqzy21b9pxrim-source", - "rev": "12303c652b881435065a98729eb7278313041e49", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_20": { + "nixpkgs_22": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -1812,7 +2026,7 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_23": { "locked": { "lastModified": 1735554305, "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", @@ -1828,7 +2042,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_24": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -1844,7 +2058,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1735821806, "narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=", @@ -1909,11 +2123,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1733749988, - "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "lastModified": 1722073938, + "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", "type": "github" }, "original": { @@ -1925,11 +2139,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "type": "github" }, "original": { @@ -1941,27 +2155,27 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -1973,13 +2187,13 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", + "devshell": "devshell_2", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_5", "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_16", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -1999,8 +2213,8 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_18", + "flake-parts": "flake-parts_7", + "nixpkgs": "nixpkgs_20", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -2064,6 +2278,21 @@ "type": "github" } }, + "pkgs-by-name-for-flake-parts": { + "locked": { + "lastModified": 1727519927, + "narHash": "sha256-3SNX6BuaisoX9PKYI+fh3geZ3jBgKKkAtHcWuHRU0+o=", + "owner": "drupol", + "repo": "pkgs-by-name-for-flake-parts", + "rev": "91debb07d81ff25b8e3b48914b6abd6f11dc26e2", + "type": "github" + }, + "original": { + "owner": "drupol", + "repo": "pkgs-by-name-for-flake-parts", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -2094,7 +2323,7 @@ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_4", + "gitignore": "gitignore_5", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -2123,7 +2352,9 @@ "catppuccin-cursors": "catppuccin-cursors", "darwin": "darwin", "deploy-rs": "deploy-rs", + "devshell": "devshell", "disko": "disko", + "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix", "home-manager": "home-manager_2", "hypr-socket-watch": "hypr-socket-watch", @@ -2132,13 +2363,14 @@ "lanzaboote": "lanzaboote", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", + "nixos-unified": "nixos-unified", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_19", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", - "snowfall-flake": "snowfall-flake", - "snowfall-lib": "snowfall-lib_2", + "pkgs-by-name-for-flake-parts": "pkgs-by-name-for-flake-parts", + "snowfall-flake": "snowfall-flake_2", "sops-nix": "sops-nix", "treefmt-nix": "treefmt-nix_3", "waybar": "waybar", @@ -2166,7 +2398,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1714529851, @@ -2230,8 +2462,11 @@ }, "snowfall-flake": { "inputs": { - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_19", + "flake-compat": "flake-compat_6", + "nixpkgs": [ + "khanelivim", + "nixpkgs" + ], "snowfall-lib": "snowfall-lib" }, "locked": { @@ -2248,11 +2483,32 @@ "type": "github" } }, + "snowfall-flake_2": { + "inputs": { + "flake-compat": "flake-compat_11", + "nixpkgs": "nixpkgs_21", + "snowfall-lib": "snowfall-lib_3" + }, + "locked": { + "lastModified": 1716675632, + "narHash": "sha256-AOgmoVZvMPUMSlHMrRjWaPykNS5YWxnUNp7STgfjGdA=", + "owner": "snowfallorg", + "repo": "flake", + "rev": "d3b1167f7265d28549930b95b98327c277ef8afd", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "flake", + "type": "github" + } + }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ + "khanelivim", "snowfall-flake", "nixpkgs" ] @@ -2274,9 +2530,10 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_8", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ + "khanelivim", "nixpkgs" ] }, @@ -2294,9 +2551,33 @@ "type": "github" } }, + "snowfall-lib_3": { + "inputs": { + "flake-compat": "flake-compat_12", + "flake-utils-plus": "flake-utils-plus_3", + "nixpkgs": [ + "snowfall-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716675292, + "narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "5d6e9f235735393c28e1145bec919610b172a20f", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "ref": "v3.0.2", + "repo": "lib", + "type": "github" + } + }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1736064798, @@ -2507,7 +2788,7 @@ }, "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1736090846, @@ -2543,8 +2824,8 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_10", - "nixpkgs": "nixpkgs_22" + "flake-compat": "flake-compat_13", + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1736001503, @@ -2562,11 +2843,11 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_25", "rust-overlay": "rust-overlay_3", "zlib": "zlib" }, diff --git a/flake.nix b/flake.nix index 6113e387a..fa6061d45 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "KhaneliNix"; inputs = { - # ╭──────────────────────────────────────────────────────────╮ # │ Core System │ # ╰──────────────────────────────────────────────────────────╯ @@ -14,36 +13,27 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + devshell.url = "github:numtide/devshell"; + flake-parts.url = "github:hercules-ci/flake-parts"; git-hooks-nix.url = "github:cachix/git-hooks.nix"; - home-manager.url = "github:nix-community/home-manager"; - # home-manager.url = "github:khaneliman/home-manager/thunderbird"; # home-manager.url = "git+file:///home/khaneliman/Documents/github/home-manager"; # home-manager.url = "git+file:///Users/khaneliman/Documents/github/home-manager"; - # Secure boot - lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1"; - + lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1"; # Secure boot nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # FIXME: remove after upstream PRs are available nixpkgs-master.url = "github:nixos/nixpkgs"; + nixos-unified.url = "github:srid/nixos-unified"; + pkgs-by-name-for-flake-parts.url = "github:drupol/pkgs-by-name-for-flake-parts"; nixos-wsl = { url = "github:nix-community/nixos-wsl"; inputs.nixpkgs.follows = "nixpkgs"; }; - snowfall-lib = { - url = "github:snowfallorg/lib"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # Secrets management - sops-nix = { - url = "github:Mic92/sops-nix"; - }; - + sops-nix.url = "github:Mic92/sops-nix"; # Secrets management treefmt-nix.url = "github:numtide/treefmt-nix"; # ╭──────────────────────────────────────────────────────────╮ @@ -64,17 +54,9 @@ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hypr-socket-watch.url = "github:khaneliman/hypr-socket-watch"; - khanelivim = { - url = "github:khaneliman/khanelivim"; - # url = "git+file:///Users/khaneliman/Documents/github/khanelivim"; - # url = "git+file:///home/khaneliman/Documents/github/khanelivim"; - inputs = { - # nixpkgs.follows = "nixpkgs"; - git-hooks-nix.follows = "git-hooks-nix"; - snowfall-lib.follows = "snowfall-lib"; - snowfall-flake.follows = "snowfall-flake"; - }; - }; + khanelivim.url = "github:khaneliman/khanelivim"; + # khanelivim.url = "git+file:///Users/khaneliman/Documents/github/khanelivim"; + # khanelivim.url = "git+file:///home/khaneliman/Documents/github/khanelivim"; nix-flatpak.url = "github:gmodena/nix-flatpak"; nix-index-database.url = "github:nix-community/nix-index-database"; @@ -89,99 +71,93 @@ }; }; + # Wired using https://nixos-unified.org/autowiring.html outputs = inputs: - let - inherit (inputs) snowfall-lib; - - lib = snowfall-lib.mkLib { - inherit inputs; - src = ./.; - - snowfall = { - meta = { - name = "khanelinix"; - title = "KhaneliNix"; - }; - - namespace = "khanelinix"; - }; - }; - in - lib.mkFlake { - channels-config = { - # allowBroken = true; - allowUnfree = true; - # showDerivationWarnings = [ "maintainerless" ]; - - # TODO: cleanup when available - permittedInsecurePackages = [ - # NOTE: needed by emulationstation - "freeimage-unstable-2021-11-01" - # dev shells - "aspnetcore-runtime-6.0.36" - "aspnetcore-runtime-7.0.20" - "aspnetcore-runtime-wrapped-7.0.20" - "aspnetcore-runtime-wrapped-6.0.36" - "dotnet-combined" - "dotnet-core-combined" - "dotnet-runtime-6.0.36" - "dotnet-runtime-7.0.20" - "dotnet-runtime-wrapped-6.0.36" - "dotnet-runtime-wrapped-7.0.20" - "dotnet-sdk-6.0.428" - "dotnet-sdk-7.0.410" - "dotnet-sdk-wrapped-6.0.428" - "dotnet-sdk-wrapped-7.0.410" - "dotnet-wrapped-combined" - ]; - }; - - overlays = [ ]; - - homes.modules = with inputs; [ - anyrun.homeManagerModules.default - catppuccin.homeManagerModules.catppuccin - hypr-socket-watch.homeManagerModules.default - nix-index-database.hmModules.nix-index - # FIXME: - # nur.modules.homeManager.default - sops-nix.homeManagerModules.sops - ]; - - systems = { - modules = { - darwin = with inputs; [ - sops-nix.darwinModules.sops - ]; - nixos = with inputs; [ - disko.nixosModules.disko - lanzaboote.nixosModules.lanzaboote - nix-flatpak.nixosModules.nix-flatpak - sops-nix.nixosModules.sops - ]; - }; - }; - - templates = { - angular.description = "Angular template"; - c.description = "C flake template."; - container.description = "Container template"; - cpp.description = "CPP flake template"; - dotnetf.description = "Dotnet FSharp template"; - flake-compat.description = "Flake-compat shell and default files."; - go.description = "Go template"; - node.description = "Node template"; - python.description = "Python template"; - rust.description = "Rust template"; - rust-web-server.description = "Rust web server template"; - snowfall.description = "Snowfall-lib template"; - }; - - deploy = lib.mkDeploy { inherit (inputs) self; }; - - outputs-builder = channels: { - formatter = inputs.treefmt-nix.lib.mkWrapper channels.nixpkgs ./treefmt.nix; - }; + inputs.nixos-unified.lib.mkFlake { + inherit inputs; + root = ./.; }; + + # outputs = + # inputs@{ flake-parts, self, ... }: + # flake-parts.lib.mkFlake { inherit inputs; } { + # imports = [ + # ./flake-modules + # ]; + # + # systems = [ + # "x86_64-linux" + # "aarch64-darwin" + # ]; + # flake = { + # modules = { + # darwin = with inputs; [ + # sops-nix.darwinModules.sops + # ]; + # + # homes = with inputs; [ + # anyrun.homeManagerModules.default + # catppuccin.homeManagerModules.catppuccin + # hypr-socket-watch.homeManagerModules.default + # nix-index-database.hmModules.nix-index + # nur.hmModules.nur + # sops-nix.homeManagerModules.sops + # ]; + # + # nixos = with inputs; [ + # lanzaboote.nixosModules.lanzaboote + # sops-nix.nixosModules.sops + # ]; + # }; + # + # deploy = { + # inherit self; + # }; + # }; + # }; + + # lib.mkFlake { + # channels-config = { + # # allowBroken = true; + # allowUnfree = true; + # # showDerivationWarnings = [ "maintainerless" ]; + # + # # TODO: cleanup when available + # permittedInsecurePackages = [ + # # NOTE: needed by emulationstation + # "freeimage-unstable-2021-11-01" + # # dev shells + # "aspnetcore-runtime-6.0.36" + # "aspnetcore-runtime-7.0.20" + # "aspnetcore-runtime-wrapped-7.0.20" + # "aspnetcore-runtime-wrapped-6.0.36" + # "dotnet-combined" + # "dotnet-core-combined" + # "dotnet-runtime-6.0.36" + # "dotnet-runtime-7.0.20" + # "dotnet-runtime-wrapped-6.0.36" + # "dotnet-runtime-wrapped-7.0.20" + # "dotnet-sdk-6.0.428" + # "dotnet-sdk-7.0.410" + # "dotnet-sdk-wrapped-6.0.428" + # "dotnet-sdk-wrapped-7.0.410" + # "dotnet-wrapped-combined" + # ]; + # }; + # + # templates = { + # angular.description = "Angular template"; + # c.description = "C flake template."; + # container.description = "Container template"; + # cpp.description = "CPP flake template"; + # dotnetf.description = "Dotnet FSharp template"; + # flake-compat.description = "Flake-compat shell and default files."; + # go.description = "Go template"; + # node.description = "Node template"; + # python.description = "Python template"; + # rust.description = "Rust template"; + # rust-web-server.description = "Rust web server template"; + # snowfall.description = "Snowfall-lib template"; + # }; } diff --git a/modules/flake-parts.bak/default.nix b/modules/flake-parts.bak/default.nix new file mode 100644 index 000000000..7e056c7cd --- /dev/null +++ b/modules/flake-parts.bak/default.nix @@ -0,0 +1,20 @@ +{ inputs, ... }: +{ + imports = [ + ./dev + ./lib.nix + ./packages.nix + ./templates.nix + ]; + + perSystem = + { system, ... }: + { + _module.args = { + pkgs = import inputs.nixpkgs { + inherit system; + config.allowUnfree = true; + }; + }; + }; +} diff --git a/modules/flake-parts.bak/dev/default.nix b/modules/flake-parts.bak/dev/default.nix new file mode 100644 index 000000000..d05d6f4ef --- /dev/null +++ b/modules/flake-parts.bak/dev/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ./devshell.nix + ./git-hooks.nix + ./treefmt.nix + ]; +} diff --git a/modules/flake-parts.bak/dev/devshell.nix b/modules/flake-parts.bak/dev/devshell.nix new file mode 100644 index 000000000..373d642a3 --- /dev/null +++ b/modules/flake-parts.bak/dev/devshell.nix @@ -0,0 +1,58 @@ +{ lib, inputs, ... }: +{ + imports = lib.optional (inputs.devshell ? flakeModule) inputs.devshell.flakeModule; + + perSystem = + { + lib, + pkgs, + config, + ... + }: + lib.optionalAttrs (inputs.devshell ? flakeModule) { + devshells.default = { + devshell.startup.pre-commit.text = config.pre-commit.installationScript; + + commands = [ + { + name = "checks"; + help = "Run all checks"; + command = '' + echo "=> Running all checks..." + + nix flake check "$@" + ''; + } + { + name = "format"; + help = "Format the entire codebase"; + command = "nix fmt"; + } + { + name = "docs"; + help = "Build khanelinix documentation"; + command = '' + echo "=> Building khanelinix documentation..." + + ${pkgs.lib.getExe pkgs.nix-output-monitor} build .#docs "$@" + ''; + } + { + name = "serve-docs"; + help = "Build and serve documentation locally"; + command = '' + echo -e "=> Building khanelinix documentation...\n" + + doc_derivation=$(${pkgs.lib.getExe pkgs.nix-output-monitor} build .#docs --no-link --print-out-paths) + + echo -e "\n=> Documentation successfully built ('$doc_derivation')" + + echo -e "\n=> You can then open your browser to view the doc\n" + + (cd "$doc_derivation"/share/doc && ${pkgs.lib.getExe pkgs.python3} ${./server.py}) + ''; + } + ]; + }; + }; +} diff --git a/modules/flake-parts.bak/dev/git-hooks.nix b/modules/flake-parts.bak/dev/git-hooks.nix new file mode 100644 index 000000000..47527d691 --- /dev/null +++ b/modules/flake-parts.bak/dev/git-hooks.nix @@ -0,0 +1,40 @@ +{ lib, inputs, ... }: +{ + imports = lib.optional (inputs.git-hooks-nix ? flakeModule) inputs.git-hooks-nix.flakeModule; + + perSystem = + { + lib, + pkgs, + ... + }: + lib.optionalAttrs (inputs.git-hooks-nix ? flakeModule) { + pre-commit = { + check.enable = false; + + settings.hooks = { + actionlint.enable = true; + clang-tidy.enable = true; + deadnix = { + enable = true; + + settings = { + edit = true; + }; + }; + eslint = { + enable = true; + package = pkgs.eslint_d; + }; + luacheck.enable = true; + pre-commit-hook-ensure-sops.enable = true; + statix.enable = true; + treefmt.enable = true; + typos = { + enable = true; + excludes = [ "generated/*" ]; + }; + }; + }; + }; +} diff --git a/modules/flake-parts.bak/dev/server.py b/modules/flake-parts.bak/dev/server.py new file mode 100644 index 000000000..5300c916c --- /dev/null +++ b/modules/flake-parts.bak/dev/server.py @@ -0,0 +1,16 @@ +import http.server + +PORT = 8000 + + +class UncachedHTTPHandler(http.server.SimpleHTTPRequestHandler): + def end_headers(self): + self.send_header("Cache-Control", "no-cache, no-store, must-revalidate") + self.send_header("Pragma", "no-cache") + self.send_header("Expires", "0") + super().end_headers() + + +with http.server.HTTPServer(("", PORT), UncachedHTTPHandler) as httpd: + print(f"Serving documentation at http://localhost:{PORT}/nixvim") + httpd.serve_forever() diff --git a/modules/flake-parts.bak/dev/treefmt.nix b/modules/flake-parts.bak/dev/treefmt.nix new file mode 100644 index 000000000..04a3673be --- /dev/null +++ b/modules/flake-parts.bak/dev/treefmt.nix @@ -0,0 +1,108 @@ +{ lib, inputs, ... }: +{ + imports = lib.optional (inputs.treefmt-nix ? flakeModule) inputs.treefmt-nix.flakeModule; + + perSystem = + { + lib, + ... + }: + lib.optionalAttrs (inputs.treefmt-nix ? flakeModule) { + treefmt = { + projectRootFile = "flake.nix"; + + programs = { + actionlint.enable = true; + biome = { + enable = true; + settings.formatter.formatWithErrors = true; + }; + clang-format.enable = true; + deadnix = { + enable = true; + }; + deno = { + enable = true; + # Using biome for these + excludes = [ + "*.ts" + "*.js" + "*.json" + "*.jsonc" + ]; + }; + fantomas.enable = true; + fish_indent.enable = true; + gofmt.enable = true; + isort.enable = true; + nixfmt.enable = true; + nufmt.enable = true; + ruff-check.enable = true; + ruff-format.enable = true; + rustfmt.enable = true; + shfmt = { + enable = true; + indent_size = 4; + }; + statix.enable = true; + stylua.enable = true; + taplo.enable = true; + yamlfmt.enable = true; + }; + + settings = { + global.excludes = [ + "*.editorconfig" + "*.envrc" + "*.gitconfig" + "*.git-blame-ignore-revs" + "*.gitignore" + "*.gitattributes" + "*.luacheckrc" + "*CODEOWNERS" + "*LICENSE" + "*flake.lock" + "*.svg" + "*.png" + "*.gif" + "*.ico" + # TODO: formatters? + "*Makefile" + "*makefile" + "*.xml" + "*.zsh" + "*.rasi" + "*.kdl" + + # TODO: exceptions + # WARN no formatter for path: homes/x86_64-linux/nixos@CORE-PW00LM92/git/windows-compat-config + # WARN no formatter for path: modules/darwin/desktop/wms/yabai/extraConfig + # WARN no formatter for path: modules/home/programs/graphical/addons/electron-support/electron-flags.conf + # WARN no formatter for path: modules/home/programs/graphical/addons/kanshi/config + # WARN no formatter for path: modules/home/programs/graphical/addons/mako/config + # WARN no formatter for path: modules/home/programs/graphical/addons/swappy/config + # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/helper/islandhelper + # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/scripts/islands/music/cava.conf + # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/scripts/islands/music/get_artwork.scpt + # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/scripts/islands/volume/data/cache + # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/sketchybarrc + # WARN no formatter for path: modules/home/programs/graphical/launchers/wofi/config + # WARN no formatter for path: modules/home/programs/terminal/editors/micro/catppuccin-macchiato.micro + # WARN no formatter for path: modules/home/programs/terminal/tools/tmux/config/general.tmux + # WARN no formatter for path: modules/home/theme/qt/Kvantum/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.kvconfig + # WARN no formatter for path: modules/home/theme/qt/Kvantum/kvantum.kvconfig + # WARN no formatter for path: modules/nixos/programs/graphical/addons/looking-glass-client/client.ini + # WARN no formatter for path: systems/x86_64-linux/khanelinix/hyprlandOutput + # WARN no formatter for path: systems/x86_64-linux/khanelinix/swayOutput + # WARN no formatter for path: templates/c/Makefile.in + # WARN no formatter for path: templates/c/configure.ac + # WARN no formatter for path: templates/dotnetf/HelloWorld.Test/HelloWorld.Test.fsproj + # WARN no formatter for path: templates/dotnetf/HelloWorld.sln + # WARN no formatter for path: templates/dotnetf/HelloWorld/HelloWorld.fsproj + ]; + + formatter.ruff-format.options = [ "--isolated" ]; + }; + }; + }; +} diff --git a/modules/flake-parts.bak/lib.nix b/modules/flake-parts.bak/lib.nix new file mode 100644 index 000000000..44a637e2b --- /dev/null +++ b/modules/flake-parts.bak/lib.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + withSystem, + ... +}: +{ + _module.args.helpers = import ../lib { inherit lib; }; + + flake.lib = lib.genAttrs config.systems ( + lib.flip withSystem ( + { pkgs, ... }: + { + check = import ../lib/tests.nix { inherit lib pkgs; }; + helpers = import ../lib { inherit lib pkgs; }; + } + ) + ); +} diff --git a/modules/flake-parts.bak/packages.nix b/modules/flake-parts.bak/packages.nix new file mode 100644 index 000000000..2ab4a07f7 --- /dev/null +++ b/modules/flake-parts.bak/packages.nix @@ -0,0 +1,20 @@ +_: { + perSystem = + { + config, + ... + }: + { + imports = [ + # ../packages/default.nix + ]; + + # packages = import ../docs { + # inherit system; + # inherit (inputs) nixpkgs; + # }; + + # Test that all packages build fine when running `nix flake check`. + checks = config.packages; + }; +} diff --git a/modules/flake-parts.bak/templates.nix b/modules/flake-parts.bak/templates.nix new file mode 100644 index 000000000..97f08b847 --- /dev/null +++ b/modules/flake-parts.bak/templates.nix @@ -0,0 +1,61 @@ +{ inputs, ... }: +let + templatesDir = ../templates; + templates = builtins.attrNames (builtins.readDir templatesDir); + generateTemplate = name: { + description = "${name} template"; + path = "${templatesDir}/${name}"; + }; +in +{ + flake.templates = builtins.listToAttrs ( + map (name: { + inherit name; + value = generateTemplate name; + }) templates + ); + + perSystem = + { + system, + lib, + ... + }: + { + checks = + let + callFlake = + args@{ + inputs, + }: + let + result = { + outputs = args.outputs (inputs // { self = result; }); + }; + in + result; + + templateFlakeOutputs = map ( + template: + callFlake { + inputs = { + inherit (inputs) flake-parts nixpkgs; + }; + # Import and read the `outputs` field of the template flake. + outputs = import (templatesDir + "/${template}/flake.nix"); + sourceInfo = { }; + } + ) templates; + + templateChecks = lib.concatMap ( + templateOutput: templateOutput.checks.${system} or [ ] + ) templateFlakeOutputs; + in + lib.listToAttrs ( + map (check: { + name = "template-${check.name}"; + value = check; + }) templateChecks + ); + }; +} diff --git a/modules/flake-parts/devshell.nix b/modules/flake-parts/devshell.nix new file mode 100644 index 000000000..137c46291 --- /dev/null +++ b/modules/flake-parts/devshell.nix @@ -0,0 +1,14 @@ +{ + perSystem = + { pkgs, ... }: + { + devShells.default = pkgs.mkShell { + name = "Khanelivim development shell"; + meta.description = "Shell environment for modifying this Nix configuration"; + packages = with pkgs; [ + just + nixd + ]; + }; + }; +} diff --git a/modules/flake-parts/git-hooks.nix b/modules/flake-parts/git-hooks.nix new file mode 100644 index 000000000..47527d691 --- /dev/null +++ b/modules/flake-parts/git-hooks.nix @@ -0,0 +1,40 @@ +{ lib, inputs, ... }: +{ + imports = lib.optional (inputs.git-hooks-nix ? flakeModule) inputs.git-hooks-nix.flakeModule; + + perSystem = + { + lib, + pkgs, + ... + }: + lib.optionalAttrs (inputs.git-hooks-nix ? flakeModule) { + pre-commit = { + check.enable = false; + + settings.hooks = { + actionlint.enable = true; + clang-tidy.enable = true; + deadnix = { + enable = true; + + settings = { + edit = true; + }; + }; + eslint = { + enable = true; + package = pkgs.eslint_d; + }; + luacheck.enable = true; + pre-commit-hook-ensure-sops.enable = true; + statix.enable = true; + treefmt.enable = true; + typos = { + enable = true; + excludes = [ "generated/*" ]; + }; + }; + }; + }; +} diff --git a/modules/flake-parts/pkgs-by-name.nix b/modules/flake-parts/pkgs-by-name.nix new file mode 100644 index 000000000..88445cdaa --- /dev/null +++ b/modules/flake-parts/pkgs-by-name.nix @@ -0,0 +1,15 @@ +{ lib, inputs, ... }: +{ + imports = lib.optional ( + inputs.pkgs-by-name-for-flake-parts ? flakeModule + ) inputs.pkgs-by-name-for-flake-parts.flakeModule; + + perSystem = + { + lib, + ... + }: + lib.optionalAttrs (inputs.pkgs-by-name-for-flake-parts ? flakeModule) { + pkgsDirectory = ../../packages; + }; +} diff --git a/modules/flake-parts/toplevel.nix b/modules/flake-parts/toplevel.nix new file mode 100644 index 000000000..005eeae40 --- /dev/null +++ b/modules/flake-parts/toplevel.nix @@ -0,0 +1,28 @@ +{ + inputs, + lib, + self, + ... +}: + +{ + imports = [ + inputs.nixos-unified.flakeModules.default + inputs.nixos-unified.flakeModules.autoWire + ]; + perSystem = + { + self', + system, + ... + }: + { + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + overlays = lib.attrValues self.overlays; + config.allowUnfree = true; + }; + + packages.default = self'.packages.activate; + }; +} diff --git a/modules/flake-parts/treefmt.nix b/modules/flake-parts/treefmt.nix new file mode 100644 index 000000000..4b51780f3 --- /dev/null +++ b/modules/flake-parts/treefmt.nix @@ -0,0 +1,76 @@ +{ lib, inputs, ... }: +{ + imports = lib.optional (inputs.treefmt-nix ? flakeModule) inputs.treefmt-nix.flakeModule; + + perSystem = + { + lib, + ... + }: + lib.optionalAttrs (inputs.treefmt-nix ? flakeModule) { + treefmt = { + flakeCheck = true; + flakeFormatter = true; + + projectRootFile = "flake.nix"; + + programs = { + actionlint.enable = true; + biome = { + enable = true; + settings.formatter.formatWithErrors = true; + }; + clang-format.enable = true; + deadnix = { + enable = true; + }; + deno = { + enable = true; + # Using biome for these + excludes = [ + "*.ts" + "*.js" + "*.json" + "*.jsonc" + ]; + }; + fantomas.enable = true; + fish_indent.enable = true; + gofmt.enable = true; + isort.enable = true; + nixfmt.enable = true; + nufmt.enable = true; + ruff-check.enable = true; + ruff-format.enable = true; + rustfmt.enable = true; + shfmt = { + enable = true; + indent_size = 4; + }; + statix.enable = true; + stylua.enable = true; + taplo.enable = true; + yamlfmt.enable = true; + }; + + settings = { + global.excludes = [ + "*.editorconfig" + "*.envrc" + "*.gitconfig" + "*.git-blame-ignore-revs" + "*.gitignore" + "*.gitattributes" + "*.luacheckrc" + "*CODEOWNERS" + "*LICENSE" + "*flake.lock" + "justfile" + "assets/*" + ]; + + formatter.ruff-format.options = [ "--isolated" ]; + }; + }; + }; +} diff --git a/overlays/csharp-ls/default.nix b/overlays/csharp-ls.nix similarity index 100% rename from overlays/csharp-ls/default.nix rename to overlays/csharp-ls.nix diff --git a/overlays/looking-glass/default.nix b/overlays/looking-glass-client.nix similarity index 100% rename from overlays/looking-glass/default.nix rename to overlays/looking-glass-client.nix diff --git a/overlays/master.nix b/overlays/master.nix new file mode 100644 index 000000000..4080f2016 --- /dev/null +++ b/overlays/master.nix @@ -0,0 +1,5 @@ +specialArgs: _final: _prev: { + inherit (specialArgs.flake.inputs.nixpkgs-master) + rocmPackages_6 + ; +} diff --git a/overlays/master/default.nix b/overlays/master/default.nix deleted file mode 100644 index 6e7cb33e7..000000000 --- a/overlays/master/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ channels, ... }: -_final: _prev: { - inherit (channels.nixpkgs-master) - rocmPackages_6 - ; -} diff --git a/overlays/nixpkgs-unstable/default.nix b/overlays/nixpkgs-unstable.nix similarity index 72% rename from overlays/nixpkgs-unstable/default.nix rename to overlays/nixpkgs-unstable.nix index b6c5fe0c0..bbf1e838d 100644 --- a/overlays/nixpkgs-unstable/default.nix +++ b/overlays/nixpkgs-unstable.nix @@ -1,6 +1,5 @@ -{ channels, ... }: -_final: _prev: { - inherit (channels.nixpkgs-unstable) +specialArgs: _final: _prev: { + inherit (specialArgs.flake.inputs.nixpkgs-unstable) # Core jankyborders raycast diff --git a/overlays/sketchybar/default.nix b/overlays/sketchybar.nix similarity index 100% rename from overlays/sketchybar/default.nix rename to overlays/sketchybar.nix diff --git a/packages/artifacts-credprovider/default.nix b/packages/artifacts-credprovider/package.nix similarity index 100% rename from packages/artifacts-credprovider/default.nix rename to packages/artifacts-credprovider/package.nix diff --git a/packages/avrogen/default.nix b/packages/avrogen/package.nix similarity index 100% rename from packages/avrogen/default.nix rename to packages/avrogen/package.nix diff --git a/packages/build-by-path/default.nix b/packages/build-by-path/package.nix similarity index 100% rename from packages/build-by-path/default.nix rename to packages/build-by-path/package.nix diff --git a/packages/dynamic-island-helper/default.nix b/packages/dynamic-island-helper/package.nix similarity index 100% rename from packages/dynamic-island-helper/default.nix rename to packages/dynamic-island-helper/package.nix diff --git a/packages/fix-git/default.nix b/packages/fix-git/package.nix similarity index 100% rename from packages/fix-git/default.nix rename to packages/fix-git/package.nix diff --git a/packages/git-cliff/default.nix b/packages/git-cliff/package.nix similarity index 100% rename from packages/git-cliff/default.nix rename to packages/git-cliff/package.nix diff --git a/packages/list-iommu/default.nix b/packages/list-iommu/package.nix similarity index 100% rename from packages/list-iommu/default.nix rename to packages/list-iommu/package.nix diff --git a/packages/record_screen/default.nix b/packages/record_screen/package.nix similarity index 100% rename from packages/record_screen/default.nix rename to packages/record_screen/package.nix diff --git a/packages/sbarlua/default.nix b/packages/sbarlua/package.nix similarity index 100% rename from packages/sbarlua/default.nix rename to packages/sbarlua/package.nix diff --git a/packages/sketchyhelper/default.nix b/packages/sketchyhelper/package.nix similarity index 100% rename from packages/sketchyhelper/default.nix rename to packages/sketchyhelper/package.nix diff --git a/packages/trace-symlink/default.nix b/packages/trace-symlink/package.nix similarity index 100% rename from packages/trace-symlink/default.nix rename to packages/trace-symlink/package.nix diff --git a/packages/trace-which/default.nix b/packages/trace-which/package.nix similarity index 100% rename from packages/trace-which/default.nix rename to packages/trace-which/package.nix diff --git a/packages/user-icon/default.nix b/packages/user-icon/package.nix similarity index 100% rename from packages/user-icon/default.nix rename to packages/user-icon/package.nix diff --git a/packages/wallpapers/default.nix b/packages/wallpapers/package.nix similarity index 100% rename from packages/wallpapers/default.nix rename to packages/wallpapers/package.nix diff --git a/packages/yabai-helper/default.nix b/packages/yabai-helper/package.nix similarity index 100% rename from packages/yabai-helper/default.nix rename to packages/yabai-helper/package.nix diff --git a/templates/angular/flake.nix b/templates/angular/flake.nix index c152f6a1d..ce285f8cd 100644 --- a/templates/angular/flake.nix +++ b/templates/angular/flake.nix @@ -25,5 +25,11 @@ }); hydraJobs = packages; + + checks = forEachSystem (system: { + default = pkgsForEach.${system}.runCommand "check" { } '' + echo "Running checks for ${system}" + ''; + }); }; } diff --git a/templates/dotnetf/flake.nix b/templates/dotnetf/flake.nix index 2a64433cf..5fe8c7a51 100644 --- a/templates/dotnetf/flake.nix +++ b/templates/dotnetf/flake.nix @@ -5,7 +5,11 @@ flake-utils.url = "github:numtide/flake-utils"; }; outputs = - { nixpkgs, flake-utils, ... }: + { + nixpkgs, + flake-utils, + ... + }: flake-utils.lib.eachDefaultSystem ( system: let diff --git a/treefmt.nix b/treefmt.nix deleted file mode 100644 index e6911b253..000000000 --- a/treefmt.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ - projectRootFile = "flake.nix"; - - programs = { - actionlint.enable = true; - biome = { - enable = true; - settings.formatter.formatWithErrors = true; - }; - clang-format.enable = true; - deadnix = { - enable = true; - }; - deno = { - enable = true; - # Using biome for these - excludes = [ - "*.ts" - "*.js" - "*.json" - "*.jsonc" - ]; - }; - fantomas.enable = true; - fish_indent.enable = true; - gofmt.enable = true; - isort.enable = true; - nixfmt.enable = true; - nufmt.enable = true; - ruff-check.enable = true; - ruff-format.enable = true; - rustfmt.enable = true; - shfmt = { - enable = true; - indent_size = 4; - }; - statix.enable = true; - stylua.enable = true; - taplo.enable = true; - yamlfmt.enable = true; - }; - - settings = { - global.excludes = [ - "*.editorconfig" - "*.envrc" - "*.gitconfig" - "*.git-blame-ignore-revs" - "*.gitignore" - "*.gitattributes" - "*.luacheckrc" - "*CODEOWNERS" - "*LICENSE" - "*flake.lock" - "*.svg" - "*.png" - "*.gif" - "*.ico" - # TODO: formatters? - "*Makefile" - "*makefile" - "*.xml" - "*.zsh" - "*.rasi" - "*.kdl" - - # TODO: exceptions - # WARN no formatter for path: homes/x86_64-linux/nixos@CORE-PW00LM92/git/windows-compat-config - # WARN no formatter for path: modules/darwin/desktop/wms/yabai/extraConfig - # WARN no formatter for path: modules/home/programs/graphical/addons/electron-support/electron-flags.conf - # WARN no formatter for path: modules/home/programs/graphical/addons/kanshi/config - # WARN no formatter for path: modules/home/programs/graphical/addons/mako/config - # WARN no formatter for path: modules/home/programs/graphical/addons/swappy/config - # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/helper/islandhelper - # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/scripts/islands/music/cava.conf - # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/scripts/islands/music/get_artwork.scpt - # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/scripts/islands/volume/data/cache - # WARN no formatter for path: modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/sketchybarrc - # WARN no formatter for path: modules/home/programs/graphical/launchers/wofi/config - # WARN no formatter for path: modules/home/programs/terminal/editors/micro/catppuccin-macchiato.micro - # WARN no formatter for path: modules/home/programs/terminal/tools/tmux/config/general.tmux - # WARN no formatter for path: modules/home/theme/qt/Kvantum/Catppuccin-Macchiato-Blue/Catppuccin-Macchiato-Blue.kvconfig - # WARN no formatter for path: modules/home/theme/qt/Kvantum/kvantum.kvconfig - # WARN no formatter for path: modules/nixos/programs/graphical/addons/looking-glass-client/client.ini - # WARN no formatter for path: systems/x86_64-linux/khanelinix/hyprlandOutput - # WARN no formatter for path: systems/x86_64-linux/khanelinix/swayOutput - # WARN no formatter for path: templates/c/Makefile.in - # WARN no formatter for path: templates/c/configure.ac - # WARN no formatter for path: templates/dotnetf/HelloWorld.Test/HelloWorld.Test.fsproj - # WARN no formatter for path: templates/dotnetf/HelloWorld.sln - # WARN no formatter for path: templates/dotnetf/HelloWorld/HelloWorld.fsproj - ]; - - formatter.ruff-format.options = [ "--isolated" ]; - }; -}