diff --git a/flake.lock b/flake.lock index eaab102..c2cf387 100644 --- a/flake.lock +++ b/flake.lock @@ -665,6 +665,22 @@ "type": "github" } }, + "nixos-stable": { + "locked": { + "lastModified": 1721668471, + "narHash": "sha256-E0mKoLlknvaeYNJ1LEfERrzLW6ZDlGBbtm8KETKhkhA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b9de2b60d0486038b5a028196c4d821474054793", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1720542800, @@ -832,6 +848,7 @@ "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixos-small": "nixos-small", + "nixos-stable": "nixos-stable", "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", "sops": "sops", diff --git a/flake.nix b/flake.nix index 7d9cee2..b7fa54f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; + nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05-small"; nixos-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixos-hardware.url = "github:NixOS/nixos-hardware"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/home/shell/default.nix b/home/shell/default.nix index 19bb7fd..c622721 100644 --- a/home/shell/default.nix +++ b/home/shell/default.nix @@ -1,24 +1,28 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: +let + stablePkgs = import inputs.nixos-stable { inherit (pkgs) system; }; +in { imports = [ ./fish.nix ./git.nix ]; - home.packages = with pkgs; [ - nushell - ripgrep - fd - htop - file - unzip - httpie - nix-your-shell - comma - cachix - nix-output-monitor - gh - ]; + home.packages = + (with pkgs; [ + nushell + ripgrep + fd + htop + file + unzip + nix-your-shell + comma + cachix + nix-output-monitor + gh + ]) + ++ [ stablePkgs.httpie ]; home.sessionVariables = { PAGER = "less";