split out home-manager
This commit is contained in:
1 parent
2d956525cc
commit
0b34a3cf11
12 files changed
+159
-124
No files matched your search
@@ -5,4 +5,28 @@
|
||||
./macos.nix
|
||||
./nix-substituters.nix
|
||||
];
|
||||
config = {
|
||||
# Remote Builder
|
||||
nix.buildMachines = [
|
||||
{
|
||||
hostName = "root@bigbox1.lab.internal";
|
||||
system = "x86_64-linux";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 1;
|
||||
speedFactor = 2;
|
||||
supportedFeatures = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"kvm"
|
||||
];
|
||||
mandatoryFeatures = [ ];
|
||||
}
|
||||
];
|
||||
nix.distributedBuilds = true;
|
||||
# optional, useful when the builder has a faster internet connection than yours
|
||||
nix.extraOptions = ''
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
};
|
||||
}
|
||||
+32
-3
@@ -13,30 +13,43 @@ in
|
||||
options = {
|
||||
skyg.home-manager.version = mkOption {
|
||||
type = types.str;
|
||||
default = "24.11";
|
||||
description = "The home-manager state version";
|
||||
};
|
||||
skyg.home-manager.extraImports = mkOption {
|
||||
type = types.listOf types.anything;
|
||||
default = [ ];
|
||||
description = "Extra imports to add to the user's home-manager configuration";
|
||||
};
|
||||
skyg.user = {
|
||||
enable = mkEnableOption "";
|
||||
enable = mkEnableOption "home-manager configuration for the user";
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "The username";
|
||||
};
|
||||
fullName = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "The user's full name";
|
||||
};
|
||||
email = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "The user's email address";
|
||||
};
|
||||
extraGitConfigs = mkOption {
|
||||
type = types.listOf (
|
||||
types.submodule {
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
options = {
|
||||
path = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
default = [ ];
|
||||
description = "Extra git configuration files to include";
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -50,6 +63,22 @@ in
|
||||
);
|
||||
in
|
||||
mkIf cfg.user.enable {
|
||||
# Ensure user.name is set when enabling
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.user.name != "";
|
||||
message = "skyg.user.name must be set when skyg.user.enable is true";
|
||||
}
|
||||
{
|
||||
assertion = cfg.user.fullName != "";
|
||||
message = "skyg.user.fullName must be set when skyg.user.enable is true";
|
||||
}
|
||||
{
|
||||
assertion = cfg.user.email != "";
|
||||
message = "skyg.user.email must be set when skyg.user.enable is true";
|
||||
}
|
||||
];
|
||||
|
||||
programs.zsh.enable = true;
|
||||
home-manager = {
|
||||
backupFileExtension = ".bak";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stateVersion }:
|
||||
{ stateVersion ? "24.11" }:
|
||||
let
|
||||
makeCommonGitConfigs = (import ./git.nix).makeCommonGitConfigs;
|
||||
programsModule = (import ./programs.nix);
|
||||
|
||||
+32
-24
@@ -28,36 +28,43 @@ let
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
specialArgs.dms.nixosModules.dank-material-shell
|
||||
];
|
||||
# makeHomeManagerUsers =
|
||||
# { modules ? [ ]
|
||||
# , homeManagerVersion
|
||||
# , user
|
||||
# , system ? "x86_64-linux"
|
||||
# ,
|
||||
# }:
|
||||
# let
|
||||
# hm = (
|
||||
# import ./home {
|
||||
# stateVersion = homeManagerVersion;
|
||||
# }makeHLServices
|
||||
# );
|
||||
# pkgs = allPkgs."${system}";
|
||||
# in
|
||||
# home-manager.lib.homeManagerConfiguration {
|
||||
# inherit pkgs;
|
||||
# modules = [
|
||||
# (hm.makeCommonUser user)
|
||||
# ]
|
||||
# ++ modules;
|
||||
# };
|
||||
|
||||
# Shared function to create home-manager user configuration
|
||||
makeHomeConfig = { stateVersion }: import ./home { stateVersion = stateVersion; };
|
||||
in
|
||||
{
|
||||
eachSystem = eachSystem;
|
||||
pkgs = allPkgs;
|
||||
|
||||
# Standalone home-manager configuration (for non-NixOS systems)
|
||||
makeHomeManagerUsers =
|
||||
{ modules ? [ ]
|
||||
, userConfig ? user
|
||||
, system ? "x86_64-linux"
|
||||
}:
|
||||
let
|
||||
hm = makeHomeConfig { };
|
||||
pkgs = allPkgs.${system};
|
||||
in
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
extraSpecialArgs = specialArgs // {
|
||||
inherit system skygUtils;
|
||||
user = userConfig;
|
||||
unstablePkgs = nixpkgs-unstable.legacyPackages.${system};
|
||||
};
|
||||
modules = [
|
||||
{
|
||||
# Convert the attribute set to a proper home-manager module
|
||||
config = (hm.makeCommonUser userConfig) { inherit pkgs; };
|
||||
}
|
||||
stylix.homeModules.stylix
|
||||
] ++ modules;
|
||||
};
|
||||
|
||||
makeNixOs =
|
||||
{ system ? "x86_64-linux"
|
||||
, hostName
|
||||
, homeManagerVersion ? "24.11"
|
||||
, systemStateVersion ? "24.05"
|
||||
, configuration ? [ ]
|
||||
}: nixpkgs.lib.nixosSystem {
|
||||
@@ -70,12 +77,12 @@ in
|
||||
(import ./main.nix {
|
||||
inherit
|
||||
user
|
||||
homeManagerVersion
|
||||
hostName
|
||||
systemStateVersion;
|
||||
})
|
||||
] ++ configuration;
|
||||
};
|
||||
|
||||
makeIso =
|
||||
{ system ? "x86_64-linux"
|
||||
, hostName
|
||||
@@ -100,6 +107,7 @@ in
|
||||
})
|
||||
] ++ configuration;
|
||||
};
|
||||
|
||||
makeDarwinModule =
|
||||
{ system ? "x86_64-darwin"
|
||||
, user
|
||||
|
||||
+8
-5
@@ -1,18 +1,21 @@
|
||||
{ user
|
||||
, homeManagerVersion
|
||||
, systemStateVersion
|
||||
, hostName
|
||||
, ...
|
||||
}:
|
||||
{ ... }: {
|
||||
{ lib, ... }: {
|
||||
imports = [
|
||||
./core
|
||||
./nixos
|
||||
./network-drives.nix
|
||||
];
|
||||
# Share defaults
|
||||
skyg.user = user;
|
||||
# Share defaults - using mkDefault so they can be overridden per-host
|
||||
skyg.user = {
|
||||
name = lib.mkDefault user.name;
|
||||
fullName = lib.mkDefault user.fullName;
|
||||
email = lib.mkDefault user.email;
|
||||
};
|
||||
skyg.core.hostName = hostName;
|
||||
skyg.home-manager.version = homeManagerVersion;
|
||||
skyg.home-manager.version = lib.mkDefault "24.11";
|
||||
system.stateVersion = systemStateVersion;
|
||||
}
|
||||
@@ -13,5 +13,7 @@
|
||||
];
|
||||
config = {
|
||||
environment.sessionVariables.EDITOR = "vi";
|
||||
environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = 1;
|
||||
environment.localBinInPath = true;
|
||||
};
|
||||
}
|
||||
@@ -1,15 +1,27 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.skyg.user;
|
||||
in
|
||||
{
|
||||
users.users.root = {
|
||||
shell = pkgs.zsh;
|
||||
options.skyg.user.createSystemUser = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Whether to create the system user (separate from home-manager configuration)";
|
||||
};
|
||||
users.users.${config.skyg.user.name} = {
|
||||
shell = pkgs.zsh;
|
||||
isNormalUser = true;
|
||||
description = config.skyg.user.name;
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
];
|
||||
|
||||
config = lib.mkIf (cfg.name != "" && cfg.createSystemUser) {
|
||||
users.users.root = {
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
users.users.${cfg.name} = {
|
||||
shell = pkgs.zsh;
|
||||
isNormalUser = true;
|
||||
description = cfg.fullName;
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -32,6 +32,17 @@ in
|
||||
environment.systemPackages = with pkgs; [
|
||||
libinput
|
||||
];
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
};
|
||||
services.upower.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
audio.enable = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
xdg = {
|
||||
autostart.enable = true;
|
||||
mime.enable = true;
|
||||
@@ -41,6 +52,9 @@ in
|
||||
terminal-exec.enable = true;
|
||||
portal = {
|
||||
enable = true;
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -19,6 +19,7 @@ in
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "wayland";
|
||||
users.users.${config.skyg.user.name} = {
|
||||
extraGroups = [
|
||||
"input"
|
||||
|
||||
Reference in new issue
Block a user