diff --git a/flake.lock b/flake.lock index 8a712ba..88582f8 100644 --- a/flake.lock +++ b/flake.lock @@ -18,9 +18,7 @@ }, "catppuccin": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1754766435, @@ -42,12 +40,8 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "stable": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2", + "stable": "stable" }, "locked": { "lastModified": 1755272288, @@ -467,9 +461,7 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": [ - "nixpkgs-unstable" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1758785683, @@ -488,15 +480,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", - "owner": "nixos", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" @@ -550,6 +542,70 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1758446476, "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", @@ -565,7 +621,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_7": { "locked": { "lastModified": 1758029226, "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=", @@ -581,21 +637,35 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim_2", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1759050748, - "narHash": "sha256-WsCrvz6yQOCmpGD5ch/MPXsMedo/OeL2YN0YlMplI34=", + "lastModified": 1759011566, + "narHash": "sha256-mjzcNHUeNY4z/BrWjquYO4zAjox6ofDykZms/BFb8Iw=", "ref": "refs/heads/main", - "rev": "8bd9c170c0d543c90d12249fdffaa79b6cb2d4f0", - "revCount": 167, + "rev": "f5e3901c0883685055441803bfdf378fbaa0fe85", + "revCount": 166, "type": "git", "url": "https://git.escapeangle.com/lander/nixvim.git" }, @@ -607,7 +677,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch", "systems": "systems_3" }, @@ -653,7 +723,7 @@ "inputs": { "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1758108966, @@ -678,7 +748,7 @@ "home-manager": "home-manager", "nixos-mailserver": "nixos-mailserver", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "sops-nix": "sops-nix", @@ -692,11 +762,11 @@ ] }, "locked": { - "lastModified": 1759030640, - "narHash": "sha256-53VP3BqMXJqD1He1WADTFyUnpta3mie56H7nC59tSic=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ac51832c70f2ff34fcc97b05fa74b4a78317f9e", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -705,6 +775,22 @@ "type": "github" } }, + "stable": { + "locked": { + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "superdirt-src": { "flake": false, "locked": { @@ -786,9 +872,7 @@ "tidalcycles": { "inputs": { "dirt-samples-src": "dirt-samples-src", - "nixpkgs": [ - "nixpkgs-unstable" - ], + "nixpkgs": "nixpkgs_8", "superdirt-src": "superdirt-src", "tidal-src": "tidal-src", "vim-tidal-src": "vim-tidal-src", diff --git a/flake.nix b/flake.nix index 2028238..e26acf6 100644 --- a/flake.nix +++ b/flake.nix @@ -13,48 +13,31 @@ }; # disko - disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + disko.url = "github:nix-community/disko"; + disko.inputs.nixpkgs.follows = "nixpkgs"; # theme - catppuccin = { - url = "github:catppuccin/nix/release-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + catppuccin.url = "github:catppuccin/nix/release-25.05"; # Home manager - home-manager = { - url = "github:nix-community/home-manager/release-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; # colmena - colmena = { - url = "github:zhaofengli/colmena"; - inputs = { - nixpkgs.follows = "nixpkgs-unstable"; - stable.follows = "nixpkgs"; - }; - }; + colmena.url = "github:zhaofengli/colmena"; # nixos-wsl - nixos-wsl = { - url = "github:nix-community/NixOS-WSL/main"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; + nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; # neovim - nixvim = { - url = "git+https://git.escapeangle.com/lander/nixvim.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixvim.url = "git+https://git.escapeangle.com/lander/nixvim.git"; # mailserver nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; }; # headplane @@ -66,7 +49,6 @@ # tidalcycles tidalcycles = { url = "github:mitchmindtree/tidalcycles.nix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; }; };