From 577d977e4ee4983577769811e6bf3a8be8f53966 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 26 Jul 2024 18:58:54 -0400 Subject: [PATCH] thelio76: yolo --- config/modules/home-manager.nix | 18 +++++++++++------- config/users/alex/default.nix | 1 + flake.nix | 16 ++++++++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/config/modules/home-manager.nix b/config/modules/home-manager.nix index eb1ce14..6d79223 100644 --- a/config/modules/home-manager.nix +++ b/config/modules/home-manager.nix @@ -1,9 +1,13 @@ -{ system, inputs }: -inputs.home-manager.nixosModules.home-manager +{ system, inputs, ... }: { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.users.alex = import ./config/users/alex; - home-manager.extraSpecialArgs = { ff = inputs.firefox-addons.packages.${system}; }; + modules = [ + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + home-manager.users.alex = import ./config/users/alex; + home-manager.extraSpecialArgs = { ff = inputs.firefox-addons.packages.${system}; }; + } + ]; } diff --git a/config/users/alex/default.nix b/config/users/alex/default.nix index b760dd5..c8c309b 100644 --- a/config/users/alex/default.nix +++ b/config/users/alex/default.nix @@ -74,6 +74,7 @@ extensions = with ff; [ darkreader multi-account-containers + simple-tab-groups ublock-origin umatrix ]; diff --git a/flake.nix b/flake.nix index 8f06843..6a313f0 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,17 @@ }; outputs = { self, nixpkgs, home-manager, firefox-addons, ... }@inputs: + let + hmModule = system: ( + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + home-manager.users.alex = import ./config/users/alex; + home-manager.extraSpecialArgs = { ff = firefox-addons.packages.${system}; }; + } + ); + in { nixosConfigurations = { ## ---- personal computers (linux) ---- @@ -44,8 +55,9 @@ system = "x86_64-linux"; modules = [ ./config/systems/thelio76 - ./config/modules/home-manager.nix - { inherit system inputs; } + (import ./config/modules/home-manager.nix { + inherit system inputs; + }) # home-manager.nixosModules.home-manager # { # home-manager.useGlobalPkgs = true;