diff --git a/flake.nix b/flake.nix index 9db5599..22624b2 100644 --- a/flake.nix +++ b/flake.nix @@ -117,13 +117,15 @@ lib = lib; 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 { - # inherit user homeManagerVersion; - # }; + homeConfigurations = { + "ari" = lib.makeHomeManagerUsers { + homeManagerVersion = "24.11"; + }; + }; - # NIXOS LINUX Setups + # NixOS Linux Setups # ------------- nixosConfigurations = { diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index 026c515..46e12c8 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -9,14 +9,7 @@ [ "nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; - - boot.extraModulePackages = [ ]; - boot.plymouth = { - enable = true; - }; - - boot.consoleLogLevel = 3; - boot.initrd.verbose = false; + boot.kernelPackages = pkgs.linuxPackages_zen; boot.kernelParams = [ "quiet" "splash" @@ -24,6 +17,15 @@ "udev.log_priority=3" "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 = '' options snd_hda_intel power_save=0 ''; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 7177c0b..faf358f 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -1,5 +1,6 @@ { pkgs -, unstablePkgs +, config +, lib , user , ... }: @@ -13,9 +14,6 @@ let in { # Skyg - environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = 1; - environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; - environment.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "wayland"; skyg = { user.enable = true; server.admin.enable = true; @@ -35,11 +33,8 @@ in gnome.enable = false; tiler = { enable = true; - hyprland.enable = true; + hyprland.enable = false; niri.enable = true; - # background = { - # enable = true; - # }; }; }; }; @@ -60,24 +55,7 @@ in "plugdev" "uucp" ]; - services.avahi = { - enable = true; - nssmdns4 = 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 services.tailscale.enable = true; services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ]; @@ -85,25 +63,15 @@ in services.displayManager.gdm.enable = true; services.displayManager.gdm.wayland = true; services.displayManager.defaultSession = "niri"; - # home manager - home-manager.users.${user.name} = { + # home manager - only configure if skyg.user.enable is true + home-manager.users.${user.name} = lib.mkIf config.skyg.user.enable { # Add Functions programs.zsh.initContent = '' source ${zshFunctions} ''; 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 - services.fwupd.enable = true; hardware.framework.enableKmod = true; services.fprintd.enable = true; hardware.framework.amd-7040.preventWakeOnAC = true; @@ -115,10 +83,6 @@ in }; hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.tmp.useTmpfs = true; nixpkgs.config.permittedInsecurePackages = [ "python3.12-ecdsa-0.19.1" ]; @@ -270,10 +234,6 @@ in "modesetting" "fbdev" ]; - # Kernel - boot.kernelPackages = pkgs.linuxPackages_zen; - - environment.localBinInPath = true; # Family Storage fileSystems."/mnt/EightTerra/FamilyStorage" = { device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage"; @@ -299,28 +259,6 @@ in "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 = { enable = true; flake = "/home/ari/nixos-setup"; diff --git a/modules/core/default.nix b/modules/core/default.nix index 4953084..25fb7db 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -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 + ''; + }; } diff --git a/modules/core/user.nix b/modules/core/user.nix index d1e011c..c00095d 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -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"; diff --git a/modules/home/default.nix b/modules/home/default.nix index 651a486..509b3d9 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,4 +1,4 @@ -{ stateVersion }: +{ stateVersion ? "24.11" }: let makeCommonGitConfigs = (import ./git.nix).makeCommonGitConfigs; programsModule = (import ./programs.nix); diff --git a/modules/lib.nix b/modules/lib.nix index fcac8c5..0b77545 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -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 diff --git a/modules/main.nix b/modules/main.nix index 24c149e..daeb3b0 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -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; } diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 8a16cab..c7dcdfc 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -13,5 +13,7 @@ ]; config = { environment.sessionVariables.EDITOR = "vi"; + environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = 1; + environment.localBinInPath = true; }; } diff --git a/modules/nixos/common/user.nix b/modules/nixos/common/user.nix index 673bec2..4969491 100644 --- a/modules/nixos/common/user.nix +++ b/modules/nixos/common/user.nix @@ -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" + ]; + }; }; } diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index ead2434..77d18f0 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -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 + ]; }; }; }; diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix index f5fcfda..e475e78 100644 --- a/modules/nixos/desktop/tiler/default.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -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"