split out home-manager

This commit is contained in:
ari committed 2026-04-14 18:50:11 -04:00
1 parent 2d956525cc
commit 0b34a3cf11
12 files changed
+159 -124

No files matched your search

+7 -5
View File
@@ -117,13 +117,15 @@
lib = lib; lib = lib;
formatter = lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt); formatter = lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt);
# None-NIXOS LINUX Setups # Non-NixOS Linux Setups (standalone home-manager)
# ------------- # -------------
# homeConfigurations."${user.name}" = lib.makeHomeManagerUsers { homeConfigurations = {
# inherit user homeManagerVersion; "ari" = lib.makeHomeManagerUsers {
# }; homeManagerVersion = "24.11";
};
};
# NIXOS LINUX Setups # NixOS Linux Setups
# ------------- # -------------
nixosConfigurations = nixosConfigurations =
{ {
+10 -8
View File
@@ -9,14 +9,7 @@
[ "nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod" ]; [ "nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.kernelPackages = pkgs.linuxPackages_zen;
boot.extraModulePackages = [ ];
boot.plymouth = {
enable = true;
};
boot.consoleLogLevel = 3;
boot.initrd.verbose = false;
boot.kernelParams = [ boot.kernelParams = [
"quiet" "quiet"
"splash" "splash"
@@ -24,6 +17,15 @@
"udev.log_priority=3" "udev.log_priority=3"
"rd.systemd.show_status=auto" "rd.systemd.show_status=auto"
]; ];
boot.extraModulePackages = [ ];
boot.plymouth = {
enable = true;
};
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
boot.consoleLogLevel = 3;
boot.initrd.verbose = false;
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''
options snd_hda_intel power_save=0 options snd_hda_intel power_save=0
''; '';
+5 -67
View File
@@ -1,5 +1,6 @@
{ pkgs { pkgs
, unstablePkgs , config
, lib
, user , user
, ... , ...
}: }:
@@ -13,9 +14,6 @@ let
in in
{ {
# Skyg # Skyg
environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = 1;
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
environment.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "wayland";
skyg = { skyg = {
user.enable = true; user.enable = true;
server.admin.enable = true; server.admin.enable = true;
@@ -35,11 +33,8 @@ in
gnome.enable = false; gnome.enable = false;
tiler = { tiler = {
enable = true; enable = true;
hyprland.enable = true; hyprland.enable = false;
niri.enable = true; niri.enable = true;
# background = {
# enable = true;
# };
}; };
}; };
}; };
@@ -60,24 +55,7 @@ in
"plugdev" "plugdev"
"uucp" "uucp"
]; ];
services.avahi = {
enable = true;
nssmdns4 = true;
};
virtualisation.waydroid.enable = true; virtualisation.waydroid.enable = true;
services.upower.enable = true;
services.pipewire = {
enable = true;
audio.enable = true;
pulse.enable = true;
jack.enable = true;
};
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal
];
};
# Tailscale # Tailscale
services.tailscale.enable = true; services.tailscale.enable = true;
services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ]; services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ];
@@ -85,25 +63,15 @@ in
services.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.displayManager.gdm.wayland = true; services.displayManager.gdm.wayland = true;
services.displayManager.defaultSession = "niri"; services.displayManager.defaultSession = "niri";
# home manager # home manager - only configure if skyg.user.enable is true
home-manager.users.${user.name} = { home-manager.users.${user.name} = lib.mkIf config.skyg.user.enable {
# Add Functions # Add Functions
programs.zsh.initContent = '' programs.zsh.initContent = ''
source ${zshFunctions} source ${zshFunctions}
''; '';
services.blueman-applet.enable = true; services.blueman-applet.enable = true;
}; };
# Network
# networking.nameservers = [ "9.9.9.9" "1.1.1.1" ];
# services.resolved = {
# enable = true;
# dnssec = "true";
# fallbackDns = [ "9.9.9.9" "1.1.1.1" ];
# dnsovertls = "true";
# };
# Firmware updater # Firmware updater
services.fwupd.enable = true;
hardware.framework.enableKmod = true; hardware.framework.enableKmod = true;
services.fprintd.enable = true; services.fprintd.enable = true;
hardware.framework.amd-7040.preventWakeOnAC = true; hardware.framework.amd-7040.preventWakeOnAC = true;
@@ -115,10 +83,6 @@ in
}; };
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"python3.12-ecdsa-0.19.1" "python3.12-ecdsa-0.19.1"
]; ];
@@ -270,10 +234,6 @@ in
"modesetting" "modesetting"
"fbdev" "fbdev"
]; ];
# Kernel
boot.kernelPackages = pkgs.linuxPackages_zen;
environment.localBinInPath = true;
# Family Storage # Family Storage
fileSystems."/mnt/EightTerra/FamilyStorage" = { fileSystems."/mnt/EightTerra/FamilyStorage" = {
device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage"; device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage";
@@ -299,28 +259,6 @@ in
"noauto" "noauto"
]; ];
}; };
# 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
'';
programs.nh = { programs.nh = {
enable = true; enable = true;
flake = "/home/ari/nixos-setup"; flake = "/home/ari/nixos-setup";
+24
View File
@@ -5,4 +5,28 @@
./macos.nix ./macos.nix
./nix-substituters.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
View File
@@ -13,30 +13,43 @@ in
options = { options = {
skyg.home-manager.version = mkOption { skyg.home-manager.version = mkOption {
type = types.str; type = types.str;
default = "24.11";
description = "The home-manager state version";
}; };
skyg.home-manager.extraImports = mkOption { skyg.home-manager.extraImports = mkOption {
type = types.listOf types.anything;
default = [ ]; default = [ ];
description = "Extra imports to add to the user's home-manager configuration";
}; };
skyg.user = { skyg.user = {
enable = mkEnableOption ""; enable = mkEnableOption "home-manager configuration for the user";
name = mkOption { name = mkOption {
type = types.str; type = types.str;
default = "";
description = "The username";
}; };
fullName = mkOption { fullName = mkOption {
type = types.str; type = types.str;
default = "";
description = "The user's full name";
}; };
email = mkOption { email = mkOption {
type = types.str; type = types.str;
default = "";
description = "The user's email address";
}; };
extraGitConfigs = mkOption { extraGitConfigs = mkOption {
type = types.listOf ( type = types.listOf (
types.submodule { types.submodule {
path = mkOption { options = {
type = types.str; path = mkOption {
type = types.str;
};
}; };
} }
); );
default = [ ]; default = [ ];
description = "Extra git configuration files to include";
}; };
}; };
}; };
@@ -50,6 +63,22 @@ in
); );
in in
mkIf cfg.user.enable { 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; programs.zsh.enable = true;
home-manager = { home-manager = {
backupFileExtension = ".bak"; backupFileExtension = ".bak";
+1 -1
View File
@@ -1,4 +1,4 @@
{ stateVersion }: { stateVersion ? "24.11" }:
let let
makeCommonGitConfigs = (import ./git.nix).makeCommonGitConfigs; makeCommonGitConfigs = (import ./git.nix).makeCommonGitConfigs;
programsModule = (import ./programs.nix); programsModule = (import ./programs.nix);
+32 -24
View File
@@ -28,36 +28,43 @@ let
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
specialArgs.dms.nixosModules.dank-material-shell specialArgs.dms.nixosModules.dank-material-shell
]; ];
# makeHomeManagerUsers =
# { modules ? [ ] # Shared function to create home-manager user configuration
# , homeManagerVersion makeHomeConfig = { stateVersion }: import ./home { stateVersion = stateVersion; };
# , 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;
# };
in in
{ {
eachSystem = eachSystem; eachSystem = eachSystem;
pkgs = allPkgs; 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 = makeNixOs =
{ system ? "x86_64-linux" { system ? "x86_64-linux"
, hostName , hostName
, homeManagerVersion ? "24.11"
, systemStateVersion ? "24.05" , systemStateVersion ? "24.05"
, configuration ? [ ] , configuration ? [ ]
}: nixpkgs.lib.nixosSystem { }: nixpkgs.lib.nixosSystem {
@@ -70,12 +77,12 @@ in
(import ./main.nix { (import ./main.nix {
inherit inherit
user user
homeManagerVersion
hostName hostName
systemStateVersion; systemStateVersion;
}) })
] ++ configuration; ] ++ configuration;
}; };
makeIso = makeIso =
{ system ? "x86_64-linux" { system ? "x86_64-linux"
, hostName , hostName
@@ -100,6 +107,7 @@ in
}) })
] ++ configuration; ] ++ configuration;
}; };
makeDarwinModule = makeDarwinModule =
{ system ? "x86_64-darwin" { system ? "x86_64-darwin"
, user , user
+8 -5
View File
@@ -1,18 +1,21 @@
{ user { user
, homeManagerVersion
, systemStateVersion , systemStateVersion
, hostName , hostName
, ... , ...
}: }:
{ ... }: { { lib, ... }: {
imports = [ imports = [
./core ./core
./nixos ./nixos
./network-drives.nix ./network-drives.nix
]; ];
# Share defaults # Share defaults - using mkDefault so they can be overridden per-host
skyg.user = user; skyg.user = {
name = lib.mkDefault user.name;
fullName = lib.mkDefault user.fullName;
email = lib.mkDefault user.email;
};
skyg.core.hostName = hostName; skyg.core.hostName = hostName;
skyg.home-manager.version = homeManagerVersion; skyg.home-manager.version = lib.mkDefault "24.11";
system.stateVersion = systemStateVersion; system.stateVersion = systemStateVersion;
} }
+2
View File
@@ -13,5 +13,7 @@
]; ];
config = { config = {
environment.sessionVariables.EDITOR = "vi"; environment.sessionVariables.EDITOR = "vi";
environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = 1;
environment.localBinInPath = true;
}; };
} }
+23 -11
View File
@@ -1,15 +1,27 @@
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
let
cfg = config.skyg.user;
in
{ {
users.users.root = { options.skyg.user.createSystemUser = lib.mkOption {
shell = pkgs.zsh; 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; config = lib.mkIf (cfg.name != "" && cfg.createSystemUser) {
isNormalUser = true; users.users.root = {
description = config.skyg.user.name; shell = pkgs.zsh;
extraGroups = [ };
"networkmanager" users.users.${cfg.name} = {
"wheel" shell = pkgs.zsh;
]; isNormalUser = true;
description = cfg.fullName;
extraGroups = [
"networkmanager"
"wheel"
];
};
}; };
} }
+14
View File
@@ -32,6 +32,17 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
libinput 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 = { xdg = {
autostart.enable = true; autostart.enable = true;
mime.enable = true; mime.enable = true;
@@ -41,6 +52,9 @@ in
terminal-exec.enable = true; terminal-exec.enable = true;
portal = { portal = {
enable = true; enable = true;
extraPortals = [
pkgs.xdg-desktop-portal
];
}; };
}; };
}; };
+1
View File
@@ -19,6 +19,7 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "wayland";
users.users.${config.skyg.user.name} = { users.users.${config.skyg.user.name} = {
extraGroups = [ extraGroups = [
"input" "input"