diff --git a/common/nix.nix b/common/nix.nix index 17c8f5d..f5b4c2f 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -46,5 +46,7 @@ }; programs.nix-ld.enable = true; - environment.systemPackages = with pkgs; [ nvd ]; + environment.systemPackages = with pkgs; [ + nvd + ]; } diff --git a/flake.lock b/flake.lock index 29f3a49..b2cc97b 100644 --- a/flake.lock +++ b/flake.lock @@ -21,10 +21,10 @@ "ghostty": { "inputs": { "nixpkgs-stable": [ - "nixpkgs" + "nixpkgs-stable" ], "nixpkgs-unstable": [ - "nixpkgs" + "nixpkgs-unstable" ], "zig": "zig" }, @@ -60,7 +60,7 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { @@ -77,7 +77,23 @@ "type": "github" } }, - "nixpkgs": { + "nixpkgs-stable": { + "locked": { + "lastModified": 1729044727, + "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -98,7 +114,8 @@ "ghostty": "ghostty", "ghostty-hm": "ghostty-hm", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable" } }, "systems": { diff --git a/flake.nix b/flake.nix index 9e7b129..bfa2684 100644 --- a/flake.nix +++ b/flake.nix @@ -2,16 +2,17 @@ description = "NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; ghostty = { url = "git+ssh://git@github.com/ghostty-org/ghostty"; inputs = { - nixpkgs-stable.follows = "nixpkgs"; - nixpkgs-unstable.follows = "nixpkgs"; + nixpkgs-stable.follows = "nixpkgs-stable"; + nixpkgs-unstable.follows = "nixpkgs-unstable"; }; }; ghostty-hm.url = "github:clo4/ghostty-hm-module"; @@ -20,17 +21,28 @@ outputs = inputs@{ self, - nixpkgs, + nixpkgs-stable, + nixpkgs-unstable, ghostty-hm, home-manager, ... }: let inherit (self) outputs; - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs-unstable.legacyPackages.${system}; + + overlays-nixpkgs = final: prev: { + stable = import nixpkgs-stable { + inherit system; + config.allowUnfree = true; + }; + unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + }; mkHome = modules: @@ -42,13 +54,18 @@ modules = [ ghostty-hm.homeModules.default ./home/common + ( + { ... }: + { + nixpkgs.overlays = [ overlays-nixpkgs ]; + } + ) ] ++ modules; }; mkHost = modules: - nixpkgs.lib.nixosSystem { - inherit system; + nixpkgs-unstable.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; diff --git a/home/common/devel.nix b/home/common/devel.nix index 2ae0a64..61999ee 100644 --- a/home/common/devel.nix +++ b/home/common/devel.nix @@ -14,6 +14,7 @@ ldns minio-client nil + nix-output-monitor nixd nixfmt-rfc-style nodejs_22 diff --git a/home/common/nix.nix b/home/common/nix.nix index 3b66fd3..b1976e0 100644 --- a/home/common/nix.nix +++ b/home/common/nix.nix @@ -1,4 +1,8 @@ -{ outputs, ... }: +{ + pkgs, + outputs, + ... +}: { nixpkgs = { config.allowUnfree = true; diff --git a/home/dln/nemo.nix b/home/dln/nemo.nix index 4a4f79a..1c38f16 100644 --- a/home/dln/nemo.nix +++ b/home/dln/nemo.nix @@ -24,7 +24,7 @@ }; }; - home.packages = with pkgs; [ calibre ]; + home.packages = with pkgs; [ stable.calibre ]; programs.gpg.enable = true;