diff --git a/flake.lock b/flake.lock index 2075ab9..e8cb53d 100644 --- a/flake.lock +++ b/flake.lock @@ -855,22 +855,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pixi": { "inputs": { "nixpkgs": [ @@ -1078,7 +1062,9 @@ "nim2nix": [ "nim2nix" ], - "nixpkgs": "nixpkgs_8" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1731360812, diff --git a/flake.nix b/flake.nix index 0f25da1..0f4022d 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,10 @@ nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; - nix-index-database.url = "github:nix-community/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + nix-index-database = { + url = "github:nix-community/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; lix = { url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; @@ -30,30 +32,44 @@ # }; # https://github.com/ghostty-org/ghostty/issues/2025 - ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty"; - ghostty.inputs.nixpkgs-stable.follows = "nixpkgs"; - ghostty.inputs.nixpkgs-unstable.follows = "nixpkgs"; - + ghostty = { + url = "git+ssh://git@github.com/ghostty-org/ghostty"; + inputs = { + nixpkgs-stable.follows = "nixpkgs"; + nixpkgs-unstable.follows = "nixpkgs"; + }; + }; comin = { url = "github:nlewo/comin"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1&ref=refs/tags/v0.45.0"; hyprland-contrib.url = "github:hyprwm/contrib"; - - f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; - f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; - tsm.url = "github:daylinmorgan/tsm?dir=nix"; - tsm.inputs.nixpkgs.follows = "nixpkgs"; - hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; - hyprman.inputs.nixpkgs.follows = "nixpkgs"; - utils.url = "git+https://git.dayl.in/daylin/utils.git"; - utils.inputs.nim2nix.follows = "nim2nix"; - nim2nix.url = "github:daylinmorgan/nim2nix"; - nim2nix.inputs.nixpkgs.follows = "nixpkgs"; - pixi.url = "github:daylinmorgan/pixi-flake"; - pixi.inputs.nixpkgs.follows = "nixpkgs"; + f1multiviewer = { + url = "github:daylinmorgan/f1multiviewer-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + tsm = { + url = "github:daylinmorgan/tsm?dir=nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprman = { + url = "git+https://git.dayl.in/daylin/hyprman.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + utils = { + url = "git+https://git.dayl.in/daylin/utils.git"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nim2nix.follows = "nim2nix"; + }; + nim2nix = { + url = "github:daylinmorgan/nim2nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + pixi = { + url = "github:daylinmorgan/pixi-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # roc = { # url = "github:roc-lang/roc"; @@ -65,7 +81,6 @@ # zls.url = "github:zigtools/zls"; # zls.inputs.nixpkgs.follows = "nixpkgs"; # zls.inputs.zig-overlay.follows = "zig-overlay"; - }; nixConfig = {