diff --git a/flake.lock b/flake.lock index ed61754..c78e2f5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "copilotchat": { "flake": false, "locked": { - "lastModified": 1717194976, - "narHash": "sha256-bdGql7WBn4yk44rd+6fK3CwBZNOZOlatnKjJLoyHBDY=", + "lastModified": 1723986757, + "narHash": "sha256-wVjNMlSgkOjwzJi5g/ydnuKMvZlXqdfIBYT0E240Ad4=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "82923efe22b604cf9c0cad0bb2a74aa9247755ab", + "rev": "1a92bb6d69b35bbfe32a57f81dc4f254abb56352", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -122,23 +122,39 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -154,6 +170,7 @@ "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "thealtf4stream-nvim": "thealtf4stream-nvim" } }, @@ -164,11 +181,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1720896917, - "narHash": "sha256-W2WccXVYnaFeNmdGQT0MA4FgU8Yvx6CbPzm6ho+elC8=", + "lastModified": 1724019887, + "narHash": "sha256-waadua3YOUWurTeDc9SuAV5b0b3oc/HzHlnhsor0/Bc=", "owner": "ALT-F4-LLC", "repo": "thealtf4stream.nvim", - "rev": "d28dd270f25ec2602cb2c1739a4db68e412c3ec9", + "rev": "2abf7f043e7bac9e2a7c1871f876c29234fe6b42", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3d6a971..f1eccdf 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ home-manager.url = "github:nix-community/home-manager"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.url = "github:LnL7/nix-darwin"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; thealtf4stream-nvim.url = "github:ALT-F4-LLC/thealtf4stream.nvim"; }; @@ -41,7 +42,12 @@ systems = ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"]; - perSystem = {pkgs, ...}: let + perSystem = { + inputs', + pkgs, + system, + ... + }: let inherit (pkgs) alejandra callPackage just mkShell; in { devShells = { diff --git a/lib/shared/home-manager.nix b/lib/shared/home-manager.nix index 225e5ba..01e9abd 100644 --- a/lib/shared/home-manager.nix +++ b/lib/shared/home-manager.nix @@ -1,4 +1,6 @@ {inputs}: {git}: {pkgs, ...}: let + awscli2 = inputs.nixpkgs-stable.legacyPackages.${system}.awscli2; + delta = inputs.nixpkgs-stable.legacyPackages.${system}.delta; isDarwin = system == "aarch64-darwin" || system == "x86_64-darwin"; system = pkgs.system; in { @@ -87,6 +89,7 @@ in { { delta = { enable = true; + package = delta; options = { chameleon = { blame-code-style = "syntax";