diff --git a/cli/flake.lock b/cli/flake.lock index 59ac5bc..62093b6 100644 --- a/cli/flake.lock +++ b/cli/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1774715571, - "narHash": "sha256-MMjHif46sc/iLF9JqxBhFaueSPRcjPeP9AiujERH6N0=", + "lastModified": 1783963347, + "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", "owner": "nix-community", "repo": "home-manager", - "rev": "557f5e38ce94ef0f02f05de7ae65057d4b2a89a6", + "rev": "a45a7c451455a51ae740ec3bce4024b312809c29", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { diff --git a/common/home.nix b/common/home.nix index 0a1ba3b..17d0450 100644 --- a/common/home.nix +++ b/common/home.nix @@ -4,7 +4,7 @@ }: { - home.stateVersion = "25.11"; + home.stateVersion = "26.05"; home.packages = with pkgs; [ # Base diff --git a/darwin.nix b/darwin.nix index 18fd152..60058bb 100644 --- a/darwin.nix +++ b/darwin.nix @@ -18,7 +18,7 @@ # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog - system.stateVersion = 5; + system.stateVersion = 7; nixpkgs.hostPlatform = host.platform; nixpkgs.config.allowUnfree = true; diff --git a/flake.lock b/flake.lock index 1796153..2e5bfc5 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1781041246, - "narHash": "sha256-d+vM+nbgOWGhaqMf1tXhdwuuRzlPiHsSA3Rjz9X6tSo=", + "lastModified": 1783963347, + "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", "owner": "nix-community", "repo": "home-manager", - "rev": "408a6918a0958e28391eab3afae063456358f13e", + "rev": "a45a7c451455a51ae740ec3bce4024b312809c29", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1780795403, - "narHash": "sha256-AkWx4Zt9pQbD/f82Z8N57+d0HGLN/rV3gdMKJTpBPKs=", + "lastModified": 1783395956, + "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6a771120d607dcccb279a27d227650e324815c35", + "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780930886, - "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", + "lastModified": 1783915482, + "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", + "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 12c0206..ea95ce8 100644 --- a/flake.nix +++ b/flake.nix @@ -32,9 +32,6 @@ flake = self; }; modules = [ - { - nixpkgs.overlays = [ (import ./overlay.nix) ]; - } (import ./darwin.nix) home-manager.darwinModules.home-manager { diff --git a/hosts/1k5.nix b/hosts/1k5.nix index 2175ab6..dee2399 100644 --- a/hosts/1k5.nix +++ b/hosts/1k5.nix @@ -7,7 +7,7 @@ extras = { casks = [ "notion" - "linear-linear" + "linear" "miro" "loom" "cursor" diff --git a/overlay.nix b/overlay.nix deleted file mode 100644 index 4888f02..0000000 --- a/overlay.nix +++ /dev/null @@ -1,27 +0,0 @@ -final: prev: { - nvs = prev.buildGoModule rec { - pname = "nvs"; - version = "1.10.5"; - - src = prev.fetchFromGitHub { - owner = "cupcakearmy"; - repo = pname; - # tag = "v${version}"; - rev = "1700f2751e969b77b7f7ab3cc16a4e0f3955ce14"; - sha256 = "sha256-RScXYxkrfLJp1nAgN2YgSRC4mLGK4yXsYjGBrDR00b8="; - }; - - vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA="; - - # Completions - nativeBuildInputs = [ prev.installShellFiles ]; - postInstall = '' - export HOME=$TMPDIR - installShellCompletion --cmd nvs \ - --bash <($out/bin/nvs completion bash) \ - --fish <($out/bin/nvs completion fish) \ - --zsh <($out/bin/nvs completion zsh) - ''; - - }; -}