From 110fa225d48f599a7459c207e8fdb8d0f6f36d28 Mon Sep 17 00:00:00 2001 From: Lauren Lagarde Date: Sun, 9 Mar 2025 18:23:21 -0500 Subject: [PATCH] Modifications to allow using in system flake, at the expense of pkgs-unstable --- default.nix | 7 +++++ flake.nix | 55 ++++++++++++++++++++-------------- programs/firefox.nix | 5 ++-- secrets.tar.zst.gpg | Bin 6137 -> 4541 bytes systems/ll-latitude-e5591.nix | 11 +++++-- 5 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..50510bf --- /dev/null +++ b/default.nix @@ -0,0 +1,7 @@ +(import ( + fetchTarball { + url = "https://github.com/edolstra/flake-compat/archive/12c64ca55c1014cdc1b16ed5a804aa8576601ff2.tar.gz"; + sha256 = "0jm6nzb83wa6ai17ly9fzpqc40wg1viib8klq8lby54agpl213w5"; } +) { + src = ./.; +}).defaultNix diff --git a/flake.nix b/flake.nix index fc2b26c..4c14c7a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,37 +9,46 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = {nixpkgs, nixpkgs-unstable, home-manager, ... }: let + outputs = { self, home-manager, nixpkgs, nixpkgs-unstable, ... }@inputs: let system = "x86_64-linux"; - unstable = nixpkgs-unstable.legacyPackages.${system}; - - lauren_lagarde_modules = [{ - home.username = "lauren_lagarde"; - home.homeDirectory = "/home/lauren_lagarde"; - }]; + pkgs = import nixpkgs { inherit system; }; + pkgs-unstable = import nixpkgs-unstable { inherit system; }; in { + # Enables all of these be used in a system flake + # https://discourse.nixos.org/t/nixos-home-manager-config-where-both-use-flakes/41410/2 + homeManagerModules = { + #inherit pkgs-unstable; #TODO: ???? + + "lauren_lagarde" = [ + { + home.username = "lauren_lagarde"; + home.homeDirectory = "/home/lauren_lagarde"; + } + ./base.nix + ]; + + "lauren_lagarde@ll-latitude-e5591" = self.homeManagerModules."lauren_lagarde" ++ [ + ./i3.nix + + ./secrets/dotspace.nix + ./secrets/dotspace_gui.nix + + ./systems/ll-latitude-e5591.nix + ]; + }; + homeConfigurations = { "lauren_lagarde" = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { system = "x86_64-linux"; }; - modules = lauren_lagarde_modules ++ [ - ./base.nix - ]; + inherit pkgs; + modules = self.homeManagerModules."lauren_lagarde"; + extraSpecialArgs = { inherit inputs pkgs-unstable; }; }; "lauren_lagarde@ll-latitude-e5591" = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { system = "x86_64-linux"; }; - modules = lauren_lagarde_modules ++ [ - ./base.nix - - ./i3.nix - - ./secrets/dotspace.nix - ./secrets/dotspace_gui.nix - - ./systems/ll-latitude-e5591.nix - ]; - extraSpecialArgs = { unstable = unstable; }; + inherit pkgs; + modules = self.homeManagerModules."lauren_lagarde@ll-latitude-e5591"; + extraSpecialArgs = { inherit inputs pkgs-unstable; }; }; }; }; diff --git a/programs/firefox.nix b/programs/firefox.nix index 74fbbd9..b697382 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -1,7 +1,8 @@ -{ unstable, ... }: { +#{ pkgs-unstable, ... }: { +{ ... }: { programs.firefox = { enable = true; - package = unstable.pkgs.firefox; + #package = pkgs-unstable.firefox; policies = { DisableTelemetry = false; DisablePocket = true; diff --git a/secrets.tar.zst.gpg b/secrets.tar.zst.gpg index 04fd043457c22cf010a5ac2247f1c912c57ba324..72305aeec3ceff6161571ce5e8ddbb722dbe5220 100644 GIT binary patch literal 4541 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 LWQ