mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-09 23:22:57 +00:00
combine home-manager and system configs
This commit is contained in:
parent
b922cd8f09
commit
7296c0fefc
17
flake.nix
17
flake.nix
@ -32,19 +32,30 @@
|
||||
nixosConfigurations = {
|
||||
desktop = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = { inherit user fullName font; };
|
||||
specialArgs = {
|
||||
gui = true;
|
||||
inherit user fullName font;
|
||||
};
|
||||
modules = [
|
||||
./nixos/configuration.nix
|
||||
./nixos/hardware-configuration.nix
|
||||
./modules/system/timezone.nix
|
||||
./modules/system/doas.nix
|
||||
./modules/gaming
|
||||
./modules/services/keybase.nix
|
||||
./modules/applications/firefox.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = { inherit user fullName font; };
|
||||
extraSpecialArgs = {
|
||||
gui = true;
|
||||
inherit user fullName font;
|
||||
};
|
||||
users.${user} = {
|
||||
imports = [
|
||||
./nixos/home.nix
|
||||
./modules/applications/firefox.nix
|
||||
./modules/applications/alacritty.nix
|
||||
./modules/shell/fish.nix
|
||||
./modules/shell/utilities.nix
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, lib, user, gui, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [ firefox ];
|
||||
home-manager.users.${user}.home.packages = [ (lib.mkIf gui pkgs.firefox) ];
|
||||
}
|
||||
|
@ -1,13 +1,9 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, lib, user, gui, ... }: {
|
||||
|
||||
let gui = config.gui;
|
||||
services.keybase.enable = true;
|
||||
services.kbfs.enable = true;
|
||||
|
||||
in {
|
||||
home-manager.users.${user}.home.packages =
|
||||
[ (lib.mkIf gui pkgs.keybase-gui) ];
|
||||
|
||||
config = {
|
||||
services.keybase.enable = true;
|
||||
services.kbfs.enable = true;
|
||||
|
||||
# home.packages = with lib; with pkgs; [ (mkIf gui.enable keybase-gui) ];
|
||||
};
|
||||
}
|
||||
|
@ -5,14 +5,6 @@
|
||||
{ config, pkgs, user, ... }:
|
||||
|
||||
{
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
../modules/system/timezone.nix
|
||||
../modules/system/doas.nix
|
||||
../modules/gaming
|
||||
../modules/services/keybase.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix.extraOptions = "experimental-features = nix-command flakes";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user