noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-26 09:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

combine home-manager and system configs

Browse Source
This commit is contained in:
Noah Masur 2022-04-28 21:15:47 -04:00
parent b922cd8f09
commit 7296c0fefc
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.nix
View File

@ -32,19 +32,30 @@
nixosConfigurations = { nixosConfigurations = {
desktop = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit user fullName font; }; specialArgs = {
gui = true;
inherit user fullName font;
};
modules = [ modules = [
./nixos/configuration.nix ./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.nixosModules.home-manager
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit user fullName font; }; extraSpecialArgs = {
gui = true;
inherit user fullName font;
};
users.${user} = { users.${user} = {
imports = [ imports = [
./nixos/home.nix ./nixos/home.nix
./modules/applications/firefox.nix
./modules/applications/alacritty.nix ./modules/applications/alacritty.nix
./modules/shell/fish.nix ./modules/shell/fish.nix
./modules/shell/utilities.nix ./modules/shell/utilities.nix

4
modules/applications/firefox.nix
View File

@ -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) ];
} }

14
modules/services/keybase.nix
View File

@ -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) ];
};
} }

8
nixos/configuration.nix
View File

@ -5,14 +5,6 @@
{ config, pkgs, user, ... }: { 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; nixpkgs.config.allowUnfree = true;
nix.extraOptions = "experimental-features = nix-command flakes"; nix.extraOptions = "experimental-features = nix-command flakes";