diff --git a/flake.lock b/flake.lock index 975bf75..a85172e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "brew-api": { "flake": false, "locked": { - "lastModified": 1786806851, - "narHash": "sha256-XF8NugcFzv4GRsNMl50k7Wa5iXgOzD30yu3icWYcMow=", + "lastModified": 1787380173, + "narHash": "sha256-ZOLt+LkWDFIILqHmx2znZfbuCOpt2Ap4jBM1kakd0dM=", "owner": "BatteredBunny", "repo": "brew-api", - "rev": "8fbd7431a00c26572a4774769c0e934aae8c36df", + "rev": "50698fae602aff4542020770763e06e58a9c0868", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781801538, - "narHash": "sha256-6zUToQ0ydSgpgrMk3GEEVOpWgn9SwVlrP+7tFb9gpOU=", + "lastModified": 1784490391, + "narHash": "sha256-/qnykj46xlcFPaoiksoGCk4g2g4EtF72ZNzYJtHTmh4=", "owner": "BatteredBunny", "repo": "brew-nix", - "rev": "7614a09c5a86ef717c7cbcd3f4fffeacfb66b30b", + "rev": "05377d6a5e6707a1914263ff02df0a5c597374d8", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", "type": "github" }, "original": { @@ -59,24 +59,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "ghostty-cursor-shaders": { "flake": false, "locked": { @@ -100,48 +82,20 @@ ] }, "locked": { - "lastModified": 1775077333, - "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", + "lastModified": 1787377438, + "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", + "rev": "65258d5c65a250189fde2e35f490d15e064c4c62", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -170,16 +124,16 @@ ] }, "locked": { - "lastModified": 1772129556, - "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=", + "lastModified": 1783744694, + "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "ebec37af18215214173c98cf6356d0aca24a2585", + "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74", "type": "github" }, "original": { "owner": "nix-darwin", - "ref": "nix-darwin-25.11", + "ref": "nix-darwin-26.05", "repo": "nix-darwin", "type": "github" } @@ -202,11 +156,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775064974, - "narHash": "sha256-fp7+8MzxHrIixIIVvyORI2XpqpQnxf8NodmEHy8rczg=", + "lastModified": 1787209939, + "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ebfbc38bdc6b22822a6f991f2d922306f33cfbc", + "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", "type": "github" }, "original": { @@ -218,64 +172,54 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774818300, - "narHash": "sha256-4eRB7XOFBxQ/tUUFPjz7UU2/zt1dtTiVP96X9BNWdeI=", + "lastModified": 1786920013, + "narHash": "sha256-tlbRqzZ3suDUO3vyR0QFBk0TrxJiRP50t7VWfHhtVrw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb0b20238291625260547f4ce9f5540aff156fd5", + "rev": "33da5f36e599b50aa7dbbfacb718254423b18354", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-25.11-darwin", + "ref": "nixpkgs-26.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" - }, + "nixpkgs_3": { "locked": { - "lastModified": 1769049374, - "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", + "lastModified": 1787204541, + "narHash": "sha256-OURZPknrTjQrlNyxPdqzyqmU/81Wes1CUP/Ft1Rv/YI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5880666fd9eb563038431edb35c2d0aa595884e6", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "nixos-25.11", - "repo": "nixvim", + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", "type": "github" } }, - "nuschtosSearch": { + "nixvim": { "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_3", + "systems": "systems" }, "locked": { - "lastModified": 1768249818, - "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", - "owner": "NuschtOS", - "repo": "search", - "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", + "lastModified": 1786873773, + "narHash": "sha256-Hj/nkhKDv0aJly1PAUstrhrgEYn1mVSkLIYMh90r/Pc=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "b397fb9f6950d57355d62bb92457d223464e0115", "type": "github" }, "original": { - "owner": "NuschtOS", - "repo": "search", + "owner": "nix-community", + "ref": "nixos-26.05", + "repo": "nixvim", "type": "github" } }, @@ -305,21 +249,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index df99b2d..bbc252a 100644 --- a/flake.nix +++ b/flake.nix @@ -16,18 +16,15 @@ }; home-manager = { inputs.nixpkgs.follows = "nixpkgs"; - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; }; nix-darwin = { inputs.nixpkgs.follows = "nixpkgs"; - url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; + url = "github:nix-darwin/nix-darwin/nix-darwin-26.05"; }; - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-25.11-darwin"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-26.05-darwin"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixvim = { - inputs.nixpkgs.follows = "nixpkgs"; - url = "github:nix-community/nixvim/nixos-25.11"; - }; + nixvim.url = "github:nix-community/nixvim/nixos-26.05"; }; outputs = { self, brew-nix, home-manager, nix-darwin, nixpkgs, nixpkgs-unstable, nixvim, ... }@inputs: diff --git a/home-manager/default.nix b/home-manager/default.nix index 6cdd1fb..6c1d98a 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -49,7 +49,6 @@ in { fish = { enable = true; loginShellInit = builtins.readFile ./fish/config.fish; - package = pkgs.unstable.fish; # v4.3+ to get the auto theme support }; ghostty = { enable = true; diff --git a/home-manager/nvim.nix b/home-manager/nvim.nix index 49583c8..b9e4ae1 100644 --- a/home-manager/nvim.nix +++ b/home-manager/nvim.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { programs.nixvim = { enable = true; + nixpkgs.config.allowUnfree = true; plugins.lz-n.enable = true; globals.mapleader = " "; opts = {