From fbfa4f44e64d653b3f1a3b2634df25dcd4146578 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sun, 4 Sep 2022 16:07:39 -0500 Subject: [PATCH] trying to add the basics for systems using unstable and stable --- README.org | 8 +++++--- flake.nix | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.org b/README.org index df2a72c..edd00e5 100644 --- a/README.org +++ b/README.org @@ -30,6 +30,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -38,9 +39,10 @@ Both include the home-manager module. Primarily I chose that route so that I cou url = "github:vaxerski/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + emacs.url = "github:nix-community/emacs-overlay"; }; - outputs = { nixpkgs, home-manager, hyprland, ... }: + outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, emacs, ... }: let system = "x86_64-linux"; username = "chris"; @@ -85,7 +87,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou nixosConfigurations = { syl = lib.nixosSystem { inherit system; - # inherit pkgs; + inherit emacs; modules = [ ./system/syl/configuration.nix home-manager.nixosModules.home-manager @@ -110,7 +112,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou } ]; }; - dalinar = lib.nixosSystem { + dalinar = lib-stable.nixosSystem { inherit system; modules = [ ./system/dalinar/configuration.nix diff --git a/flake.nix b/flake.nix index 2d58f05..a0e99c0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -11,9 +12,10 @@ url = "github:vaxerski/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + emacs.url = "github:nix-community/emacs-overlay"; }; - outputs = { nixpkgs, home-manager, hyprland, ... }: + outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, emacs, ... }: let system = "x86_64-linux"; username = "chris"; @@ -58,7 +60,7 @@ nixosConfigurations = { syl = lib.nixosSystem { inherit system; - # inherit pkgs; + inherit emacs; modules = [ ./system/syl/configuration.nix home-manager.nixosModules.home-manager @@ -83,7 +85,7 @@ } ]; }; - dalinar = lib.nixosSystem { + dalinar = lib-stable.nixosSystem { inherit system; modules = [ ./system/dalinar/configuration.nix