added base configuration for ixion, applied system update, modified power mgmt readme
This commit is contained in:
18
flake.lock
generated
18
flake.lock
generated
@@ -156,13 +156,29 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"quadlet-nix": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1758631655,
|
||||||
|
"narHash": "sha256-EGeZ963L7xsNAY7snvP1JHQe7LWLVCM6f49+PzWjhEE=",
|
||||||
|
"owner": "SEIAROTg",
|
||||||
|
"repo": "quadlet-nix",
|
||||||
|
"rev": "2ebe01b175e2e1e6de3f172d23f0c3b88713eec9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "SEIAROTg",
|
||||||
|
"repo": "quadlet-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"darwin": "darwin",
|
"darwin": "darwin",
|
||||||
"ghostty": "ghostty",
|
"ghostty": "ghostty",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-flatpak": "nix-flatpak",
|
"nix-flatpak": "nix-flatpak",
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3",
|
||||||
|
"quadlet-nix": "quadlet-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
34
flake.nix
34
flake.nix
@@ -27,8 +27,10 @@
|
|||||||
}: let
|
}: let
|
||||||
userName = "wyatt";
|
userName = "wyatt";
|
||||||
userEmail = "wyatt@wyattjmiller.com";
|
userEmail = "wyatt@wyattjmiller.com";
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit userName userEmail ghostty;
|
# use this variable to take inputs and use them as arguments in your modules, this will be the common one
|
||||||
|
customArgs = {
|
||||||
|
inherit userName userEmail ghostty quadlet-nix;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
meta = import ./meta;
|
meta = import ./meta;
|
||||||
@@ -36,8 +38,7 @@
|
|||||||
# Primary laptop - MacBook Pro (2023, M3)
|
# Primary laptop - MacBook Pro (2023, M3)
|
||||||
darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
|
darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
|
||||||
system = "aarch64-darwin";
|
system = "aarch64-darwin";
|
||||||
specialArgs = {
|
specialArgs = customArgs // {
|
||||||
inherit userName userEmail ghostty;
|
|
||||||
hostname = "sephiroth";
|
hostname = "sephiroth";
|
||||||
role = "devel";
|
role = "devel";
|
||||||
};
|
};
|
||||||
@@ -49,7 +50,9 @@
|
|||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
home-manager.extraSpecialArgs = customArgs // {
|
||||||
|
inherit home-manager;
|
||||||
|
};
|
||||||
home-manager.users.${userName} = import ./home;
|
home-manager.users.${userName} = import ./home;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@@ -58,8 +61,7 @@
|
|||||||
# Primary desktop computer
|
# Primary desktop computer
|
||||||
nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
|
nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = customArgs // {
|
||||||
inherit userName userEmail ghostty;
|
|
||||||
hostname = "cloud";
|
hostname = "cloud";
|
||||||
role = "devel";
|
role = "devel";
|
||||||
};
|
};
|
||||||
@@ -72,7 +74,9 @@
|
|||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
home-manager.extraSpecialArgs = customArgs // {
|
||||||
|
inherit home-manager;
|
||||||
|
};
|
||||||
home-manager.users.${userName}.imports = [
|
home-manager.users.${userName}.imports = [
|
||||||
./home
|
./home
|
||||||
];
|
];
|
||||||
@@ -83,8 +87,7 @@
|
|||||||
# Apartment appliance server
|
# Apartment appliance server
|
||||||
nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
|
nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = customArgs // {
|
||||||
inherit userName userEmail;
|
|
||||||
hostname = "valefor";
|
hostname = "valefor";
|
||||||
role = "server";
|
role = "server";
|
||||||
};
|
};
|
||||||
@@ -96,7 +99,9 @@
|
|||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
home-manager.extraSpecialArgs = customArgs // {
|
||||||
|
inherit home-manager;
|
||||||
|
};
|
||||||
home-manager.users.${userName}.imports = [
|
home-manager.users.${userName}.imports = [
|
||||||
./home
|
./home
|
||||||
];
|
];
|
||||||
@@ -107,13 +112,12 @@
|
|||||||
# Storage, status, game, and media server
|
# Storage, status, game, and media server
|
||||||
nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
|
nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = customArgs // {
|
||||||
inherit userName userEmail;
|
|
||||||
hostname = "ixion";
|
hostname = "ixion";
|
||||||
role = "server";
|
role = "server";
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
quadlet-nix.nixosModules.quadlet
|
||||||
./modules/common
|
./modules/common
|
||||||
./modules/machine/ixion
|
./modules/machine/ixion
|
||||||
|
|
||||||
@@ -121,7 +125,7 @@
|
|||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
home-manager.extraSpecialArgs = customArgs;
|
||||||
home-manager.users.${userName}.imports = [
|
home-manager.users.${userName}.imports = [
|
||||||
./home
|
./home
|
||||||
];
|
];
|
||||||
|
@@ -1,16 +1,84 @@
|
|||||||
{
|
{
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
userName,
|
userName,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [ ];
|
imports = [
|
||||||
|
../../pwrMgmt
|
||||||
|
../../networking/core.nix
|
||||||
|
../../virtualization/podman.nix
|
||||||
|
../../virtualization/quadlet.nix
|
||||||
|
../../virtualization/hardware.nix
|
||||||
|
];
|
||||||
|
|
||||||
# Enable flakes for NixOS
|
# Enable flakes for NixOS
|
||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
# Custom kernel/boot stuff
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot = {
|
||||||
boot.loader.systemd-boot.enable = true;
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
loader = {
|
||||||
|
systemd-boot.enable = true;
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable Polkit
|
||||||
|
security.polkit.enable = true;
|
||||||
|
|
||||||
|
# Make sure Bluetooth is off!
|
||||||
|
hardware.bluetooth.enable = false;
|
||||||
|
|
||||||
|
# Set your timezone
|
||||||
|
time.timeZone = "America/Detroit";
|
||||||
|
|
||||||
|
# Power management module
|
||||||
|
pwrMgmt = {
|
||||||
|
enable = true;
|
||||||
|
cpuFreqGovernor = "performance";
|
||||||
|
powertop.enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Podman module (see ../../virtualization/podman.nix)
|
||||||
|
podman = {
|
||||||
|
enable = true;
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
docker-credential-helpers
|
||||||
|
toolbox
|
||||||
|
cosign
|
||||||
|
crane
|
||||||
|
podman-tui
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Core networking module (see ../../networking/core.nix)
|
||||||
|
network = {
|
||||||
|
firewall.enable = true;
|
||||||
|
networkManager.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
programs = {
|
||||||
|
# Enable GnuPG
|
||||||
|
gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable SUID wrappers (some programs need them)
|
||||||
|
mtr.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
users.users.${userName}.extraGroups = ["wheel" "video" "podman" "network"];
|
||||||
|
|
||||||
|
services = {
|
||||||
|
# Enable OpenSSH
|
||||||
|
openssh.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Install packages to be installed system-wide
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
wireguard-tools
|
||||||
|
];
|
||||||
|
|
||||||
|
system.stateVersion = "25.05";
|
||||||
}
|
}
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
# Power management modules
|
# Power management modules
|
||||||
|
|
||||||
This directory houses my own custom defined power management settings. These are set in the machine-specific configurations (typically).
|
This directory houses my own custom defined power management settings as NixOS modules. These are set in the machine-specific configurations (typically).
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
Given that this configuration is in the `machine/<hostname>` directory (where hostname is the name of the computer your configuring):
|
Given that this configuration is in the `machine/<hostname>` directory (where hostname is the name of the computer your configuring):
|
||||||
|
|
||||||
### Desktop configuration
|
### Desktop/server configuration
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
imports = [
|
imports = [
|
||||||
|
Reference in New Issue
Block a user