Refactoring and cleanup
This commit is contained in:
Lauren Lagarde
parent
d0f4d9a3e5
commit
0ec36c1c7e
6 changed files with 138 additions and 191 deletions
286
flake.nix
286
flake.nix
|
|
@ -113,6 +113,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
|
||||||
|
##########################################################################
|
||||||
|
##########################################################################
|
||||||
|
##########################################################################
|
||||||
|
# Physical Systems
|
||||||
|
|
||||||
ll-latitude-e5591 = nixpkgs.lib.nixosSystem {
|
ll-latitude-e5591 = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
|
@ -121,8 +127,8 @@
|
||||||
networking.hostId = "f55542ee";
|
networking.hostId = "f55542ee";
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
system.stateVersion = "24.11";
|
||||||
time.timeZone = "America/Chicago";
|
|
||||||
|
|
||||||
|
time.timeZone = "America/Chicago";
|
||||||
sops.defaultSopsFile = ./secrets.yaml;
|
sops.defaultSopsFile = ./secrets.yaml;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -138,6 +144,97 @@
|
||||||
specialArgs = { inherit inputs pkgs-unstable; };
|
specialArgs = { inherit inputs pkgs-unstable; };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
living-room = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
networking.hostName = "living-room";
|
||||||
|
|
||||||
|
system.stateVersion = "25.05";
|
||||||
|
home-manager.users."lauren_lagarde".home.stateVersion = "25.05";
|
||||||
|
|
||||||
|
time.timeZone = "America/Chicago";
|
||||||
|
sops.defaultSopsFile = ./secrets.yaml;
|
||||||
|
}
|
||||||
|
|
||||||
|
./systems/living-room/configuration.nix
|
||||||
|
|
||||||
|
sops-nix.nixosModules.sops
|
||||||
|
lix-module.nixosModules.default
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
disko.nixosModules.default
|
||||||
|
];
|
||||||
|
specialArgs = { inherit inputs pkgs-unstable; };
|
||||||
|
};
|
||||||
|
|
||||||
|
bastion = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
networking.hostName = "bastion";
|
||||||
|
networking.hostId = "0d13f99b";
|
||||||
|
|
||||||
|
system.stateVersion = "24.11";
|
||||||
|
home-manager.users."lauren_lagarde".home.stateVersion = "24.11";
|
||||||
|
|
||||||
|
time.timeZone = "America/Chicago";
|
||||||
|
sops.defaultSopsFile = ./secrets.yaml;
|
||||||
|
}
|
||||||
|
|
||||||
|
./systems/bastion/configuration.nix
|
||||||
|
|
||||||
|
sops-nix.nixosModules.sops
|
||||||
|
lix-module.nixosModules.default
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
disko.nixosModules.default
|
||||||
|
];
|
||||||
|
specialArgs = { inherit inputs pkgs-unstable; };
|
||||||
|
};
|
||||||
|
|
||||||
|
blockhouse = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
networking.hostName = "blockhouse";
|
||||||
|
networking.hostId = "ed658529";
|
||||||
|
|
||||||
|
system.stateVersion = "23.11";
|
||||||
|
home-manager.users."lauren_lagarde".home.stateVersion = "24.11";
|
||||||
|
|
||||||
|
time.timeZone = "America/Chicago";
|
||||||
|
sops.defaultSopsFile = ./secrets.yaml;
|
||||||
|
}
|
||||||
|
|
||||||
|
./systems/blockhouse/configuration.nix
|
||||||
|
|
||||||
|
sops-nix.nixosModules.sops
|
||||||
|
lix-module.nixosModules.default
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
disko.nixosModules.default
|
||||||
|
];
|
||||||
|
specialArgs = { inherit inputs pkgs-unstable; };
|
||||||
|
};
|
||||||
|
|
||||||
|
stronghold = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
networking.hostName = "stronghold";
|
||||||
|
networking.hostId = "c581a1cd";
|
||||||
|
}
|
||||||
|
./systems/stronghold/configuration.nix
|
||||||
|
|
||||||
|
lix-module.nixosModules.default
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
disko.nixosModules.default
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
##########################################################################
|
||||||
|
##########################################################################
|
||||||
|
##########################################################################
|
||||||
|
# Other
|
||||||
|
|
||||||
ll-nixos-headless-pi = nixpkgs.lib.nixosSystem {
|
ll-nixos-headless-pi = nixpkgs.lib.nixosSystem {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
modules = pi_modules ++ [
|
modules = pi_modules ++ [
|
||||||
|
|
@ -189,110 +286,6 @@
|
||||||
specialArgs = { inherit inputs pkgs-unstable; };
|
specialArgs = { inherit inputs pkgs-unstable; };
|
||||||
};
|
};
|
||||||
|
|
||||||
# Real Systems
|
|
||||||
living-room = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
modules = [
|
|
||||||
{
|
|
||||||
networking.hostName = "living-room";
|
|
||||||
|
|
||||||
system.stateVersion = "25.05";
|
|
||||||
time.timeZone = "America/Chicago";
|
|
||||||
|
|
||||||
# System-managed home-manager
|
|
||||||
home-manager.users."lauren_lagarde" = {
|
|
||||||
home.stateVersion = "25.05";
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
imports = self.homeManagerModules."lauren_lagarde@living-room";
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.defaultSopsFile = ./secrets.yaml;
|
|
||||||
}
|
|
||||||
./systems/living-room/configuration.nix
|
|
||||||
|
|
||||||
sops-nix.nixosModules.sops
|
|
||||||
lix-module.nixosModules.default
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
disko.nixosModules.default
|
|
||||||
];
|
|
||||||
specialArgs = { inherit inputs pkgs-unstable; };
|
|
||||||
};
|
|
||||||
|
|
||||||
bastion = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
modules = [
|
|
||||||
{
|
|
||||||
networking.hostName = "bastion";
|
|
||||||
networking.hostId = "0d13f99b";
|
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
|
||||||
time.timeZone = "America/Chicago";
|
|
||||||
|
|
||||||
# System-managed home-manager
|
|
||||||
home-manager.users."lauren_lagarde" = {
|
|
||||||
home.stateVersion = "24.11";
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
imports = self.homeManagerModules."lauren_lagarde";
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.defaultSopsFile = ./secrets.yaml;
|
|
||||||
}
|
|
||||||
|
|
||||||
./systems/bastion/configuration.nix
|
|
||||||
|
|
||||||
sops-nix.nixosModules.sops
|
|
||||||
lix-module.nixosModules.default
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
disko.nixosModules.default
|
|
||||||
];
|
|
||||||
specialArgs = { inherit inputs pkgs-unstable; };
|
|
||||||
};
|
|
||||||
|
|
||||||
blockhouse = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
modules = [
|
|
||||||
{
|
|
||||||
networking.hostName = "blockhouse";
|
|
||||||
networking.hostId = "ed658529";
|
|
||||||
|
|
||||||
system.stateVersion = "23.11";
|
|
||||||
time.timeZone = "America/Chicago";
|
|
||||||
|
|
||||||
# System-managed home-manager
|
|
||||||
home-manager.users."lauren_lagarde" = {
|
|
||||||
home.stateVersion = "24.11";
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
imports = self.homeManagerModules."lauren_lagarde";
|
|
||||||
};
|
|
||||||
|
|
||||||
sops.defaultSopsFile = ./secrets.yaml;
|
|
||||||
}
|
|
||||||
|
|
||||||
./systems/blockhouse/configuration.nix
|
|
||||||
|
|
||||||
sops-nix.nixosModules.sops
|
|
||||||
lix-module.nixosModules.default
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
disko.nixosModules.default
|
|
||||||
];
|
|
||||||
specialArgs = { inherit inputs pkgs-unstable; };
|
|
||||||
};
|
|
||||||
|
|
||||||
stronghold = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
modules = [
|
|
||||||
{
|
|
||||||
networking.hostName = "stronghold";
|
|
||||||
networking.hostId = "c581a1cd";
|
|
||||||
}
|
|
||||||
./systems/stronghold/configuration.nix
|
|
||||||
|
|
||||||
lix-module.nixosModules.default
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
disko.nixosModules.default
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
vm-docker-luks-test = nixpkgs.lib.nixosSystem {
|
vm-docker-luks-test = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
|
|
@ -360,88 +353,5 @@
|
||||||
# specialArgs = { inherit inputs pkgs-unstable; };
|
# specialArgs = { inherit inputs pkgs-unstable; };
|
||||||
# };
|
# };
|
||||||
#};
|
#};
|
||||||
|
|
||||||
packages.x86_64-linux = {
|
|
||||||
|
|
||||||
##########################################################################
|
|
||||||
##########################################################################
|
|
||||||
##########################################################################
|
|
||||||
# Personal Live Disks
|
|
||||||
|
|
||||||
# TODO: ll-nixos-headless-iso = nixos-generators.nixosGenerate {};
|
|
||||||
|
|
||||||
#ll-nixos-base-iso = nixos-generators.nixosGenerate {
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# modules = [
|
|
||||||
# {
|
|
||||||
# networking.hostName = "ll-nixos";
|
|
||||||
# home-manager.users."lauren_lagarde" = {
|
|
||||||
# nixpkgs.config.allowUnfree = true;
|
|
||||||
# imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
# ./systems/ll-nixos-base.nix
|
|
||||||
# lix-module.nixosModules.default
|
|
||||||
# home-manager.nixosModules.home-manager
|
|
||||||
# ];
|
|
||||||
# specialArgs = {
|
|
||||||
# inherit inputs pkgs-unstable;
|
|
||||||
# };
|
|
||||||
# format = "install-iso";
|
|
||||||
#};
|
|
||||||
|
|
||||||
#ll-nixos-full-iso = nixos-generators.nixosGenerate {
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# modules = [
|
|
||||||
# {
|
|
||||||
# networking.hostName = "ll-nixos";
|
|
||||||
# home-manager.users."lauren_lagarde" = { config, ... }: {
|
|
||||||
# nixpkgs.config.allowUnfree = true;
|
|
||||||
# imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
# ./systems/ll-nixos-full.nix
|
|
||||||
|
|
||||||
# lix-module.nixosModules.default
|
|
||||||
# home-manager.nixosModules.home-manager
|
|
||||||
# waveforms.nixosModule
|
|
||||||
# disko.nixosModules.default
|
|
||||||
# ];
|
|
||||||
# specialArgs = {
|
|
||||||
# inherit inputs pkgs-unstable;
|
|
||||||
# };
|
|
||||||
# format = "install-iso";
|
|
||||||
#};
|
|
||||||
|
|
||||||
#ll-nixos-xmrig-worker-iso = nixos-generators.nixosGenerate {
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# modules = [
|
|
||||||
# { networking.hostName = "ll-nixos-xmrig-worker"; }
|
|
||||||
# ./systems/ll-nixos-xmrig-worker.nix
|
|
||||||
# lix-module.nixosModules.default
|
|
||||||
# home-manager.nixosModules.home-manager
|
|
||||||
# ];
|
|
||||||
# format = "install-iso";
|
|
||||||
#};
|
|
||||||
|
|
||||||
##########################################################################
|
|
||||||
##########################################################################
|
|
||||||
##########################################################################
|
|
||||||
# Systems
|
|
||||||
|
|
||||||
#living-room-nixos-iso = nixos-generators.nixosGenerate {
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# modules = [
|
|
||||||
# { networking.hostName = "living-room-nixos-iso"; }
|
|
||||||
# ./systems/living-room-nixos.nix
|
|
||||||
# lix-module.nixosModules.default
|
|
||||||
# home-manager.nixosModules.home-manager
|
|
||||||
# ];
|
|
||||||
# format = "install-iso";
|
|
||||||
# specialArgs = { inherit inputs pkgs-unstable; };
|
|
||||||
#};
|
|
||||||
|
|
||||||
#default = self.packages.x86_64-linux.ll-nixos-full-iso;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,15 @@
|
||||||
# https://xcp-ng.org/docs/networking.html#intel-i218-i219-slow-speed
|
# https://xcp-ng.org/docs/networking.html#intel-i218-i219-slow-speed
|
||||||
# https://serverfault.com/questions/581265/disable-tcp-checksum-offloading-on-kvm-virtual-network
|
# https://serverfault.com/questions/581265/disable-tcp-checksum-offloading-on-kvm-virtual-network
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
|
# System Info:
|
||||||
|
# - Model: Dell OptiPlex 7060 Micro
|
||||||
|
# - CPU: Intel Core i7-8700T (6C/12T, Passmark: 2301/10172)
|
||||||
|
# - RAM: 32GB
|
||||||
|
# - Storage:
|
||||||
|
# - PNY CS900 PNY244624111201023FB 1TB SATA SSD
|
||||||
|
# - Samsung 970 EVO Plus S58SNG0MA07159M 500GB NVMe SSD
|
||||||
|
# - WD MyBook 25EE 3145484E3348454E 8TB External HDD
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
# Core Features
|
# Core Features
|
||||||
../../nixos/features/base.nix
|
../../nixos/features/base.nix
|
||||||
|
|
@ -21,6 +30,7 @@
|
||||||
|
|
||||||
# Users
|
# Users
|
||||||
../../users/lauren_lagarde/lauren_lagarde.nix
|
../../users/lauren_lagarde/lauren_lagarde.nix
|
||||||
|
../../users/lauren_lagarde/system-managed-home.nix
|
||||||
../../users/ashley_funkhouser/ashley_funkhouser.nix
|
../../users/ashley_funkhouser/ashley_funkhouser.nix
|
||||||
|
|
||||||
# Bastion Features
|
# Bastion Features
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,10 @@
|
||||||
{ config, lib, pkgs, modulesPath, ... }: {
|
{ config, lib, pkgs, modulesPath, ... }: {
|
||||||
|
# System Info:
|
||||||
|
# - Model: Custom
|
||||||
|
# - CPU: AMD Ryzen 9 3900X (12C/24T, Passmark: 2703/32546)
|
||||||
|
# - RAM: 128GB
|
||||||
|
# - Storage: Yes
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
# Core Features
|
# Core Features
|
||||||
../../nixos/features/base.nix
|
../../nixos/features/base.nix
|
||||||
|
|
@ -18,6 +24,7 @@
|
||||||
|
|
||||||
# Users
|
# Users
|
||||||
../../users/lauren_lagarde/lauren_lagarde.nix
|
../../users/lauren_lagarde/lauren_lagarde.nix
|
||||||
|
../../users/lauren_lagarde/system-managed-home.nix
|
||||||
../../users/ashley_funkhouser/ashley_funkhouser.nix
|
../../users/ashley_funkhouser/ashley_funkhouser.nix
|
||||||
|
|
||||||
# Blockhouse Features
|
# Blockhouse Features
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,11 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
|
# System Info:
|
||||||
|
# - Model: Dell OptiPlex 3040 Micro
|
||||||
|
# - CPU: Intel Core i3-6100T (2C/4T, Passmark: 1859/3642)
|
||||||
|
# - RAM: 16GB
|
||||||
|
# - Storage:
|
||||||
|
# - ADATA SP550 2G3720040332 240GB SATA SSD
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
# Core Features
|
# Core Features
|
||||||
../../nixos/features/base.nix
|
../../nixos/features/base.nix
|
||||||
|
|
@ -11,12 +18,13 @@
|
||||||
../../nixos/tweaks/disable_nixos_user.nix
|
../../nixos/tweaks/disable_nixos_user.nix
|
||||||
../../nixos/tweaks/systemd-resolved_nonsense.nix
|
../../nixos/tweaks/systemd-resolved_nonsense.nix
|
||||||
|
|
||||||
# Lauren Base
|
# Users
|
||||||
|
../../users/lauren_lagarde/autologin.nix
|
||||||
../../users/lauren_lagarde/lauren_lagarde.nix
|
../../users/lauren_lagarde/lauren_lagarde.nix
|
||||||
|
../../users/lauren_lagarde/system-managed-home.nix
|
||||||
|
|
||||||
# i3wm
|
# i3wm
|
||||||
../../nixos/features/i3wm.nix
|
../../nixos/features/i3wm.nix
|
||||||
#../../nixos/tweaks/intel_igpu_screen_tearing.nix
|
|
||||||
|
|
||||||
# Dotspace
|
# Dotspace
|
||||||
../../secrets/dotspace.nix
|
../../secrets/dotspace.nix
|
||||||
|
|
@ -26,7 +34,6 @@
|
||||||
# living-room
|
# living-room
|
||||||
../../nixos/features/gpu/intel.nix
|
../../nixos/features/gpu/intel.nix
|
||||||
../../nixos/features/systemd-boot.nix
|
../../nixos/features/systemd-boot.nix
|
||||||
../../users/lauren_lagarde/autologin.nix
|
|
||||||
|
|
||||||
# TODO: Composable Disko Config
|
# TODO: Composable Disko Config
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,13 @@
|
||||||
# sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#$TARGET_HOSTNAME --disk nvme0n1 /dev/nvme0n1
|
# sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#$TARGET_HOSTNAME --disk nvme0n1 /dev/nvme0n1
|
||||||
# tar -xvf /Parlor/Lauren/mlaga97-nixos.tar.zst; sudo nixos-rebuild switch --flake mlaga97-nixos?submodules=1#$HOSTNAME
|
# tar -xvf /Parlor/Lauren/mlaga97-nixos.tar.zst; sudo nixos-rebuild switch --flake mlaga97-nixos?submodules=1#$HOSTNAME
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
|
# System Info:
|
||||||
|
# - Model: Dell Latitude 5591
|
||||||
|
# - CPU: Intel Core i7-8850H (6C/12T, Passmark: 2369/10147)
|
||||||
|
# - RAM: 32GB
|
||||||
|
# - Storage:
|
||||||
|
# - Toshiba KXG60ZNV512G 512GB NVMe SSD
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
# Core Features
|
# Core Features
|
||||||
../../nixos/features/base.nix
|
../../nixos/features/base.nix
|
||||||
|
|
|
||||||
6
users/lauren_lagarde/system-managed-home.nix
Normal file
6
users/lauren_lagarde/system-managed-home.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{ ... }: {
|
||||||
|
home-manager.users."lauren_lagarde" = {
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
imports = self.homeManagerModules."lauren_lagarde";
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue