AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

preparation to reinstall workstation

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-03-25 19:31:05 +03:00
parent b7e7d9e02b
commit ccfd7dec09
5 changed files with 89 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
flake.nix
View File

@ -139,29 +139,28 @@
hostnames = builtins.attrNames (builtins.readDir ./machines); hostnames = builtins.attrNames (builtins.readDir ./machines);
mkHost = name: { mkHost = name: {
system = builtins.readFile (./machines + "/${name}/system"); system = builtins.readFile (./machines + "/${name}/system");
modules = [ (import (./machines + "/${name}")) { device = name; mainuser = "alukard"; } ]; modules = [
(import (./machines + "/${name}")) { device = name; mainuser = "ataraxia"; }
inputs.vscode-server.nixosModule
];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
in (genAttrs hostnames mkHost) // { in (genAttrs hostnames mkHost) // {
AMD-Workstation = { AMD-Workstation = {
system = builtins.readFile (./machines/AMD-Workstation/system); system = builtins.readFile (./machines/AMD-Workstation/system);
modules = [ (import (./machines/AMD-Workstation)) { device = "AMD-Workstation"; mainuser = "alukard"; } ];
specialArgs = { inherit inputs; };
channelName = "unstable-zfs";
};
Home-Hypervisor = {
system = builtins.readFile (./machines/Home-Hypervisor/system);
modules = [ modules = [
(import (./machines/Home-Hypervisor)) { device = "Home-Hypervisor"; mainuser = "ataraxia"; } (import (./machines/AMD-Workstation)) { device = "AMD-Workstation"; mainuser = "ataraxia"; }
inputs.vscode-server.nixosModule inputs.vscode-server.nixosModule
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
channelName = "unstable-zfs";
}; };
Flakes-ISO = { Flakes-ISO = {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
(import (./machines/Flakes-ISO)) { device = "Flakes-ISO"; mainuser = "alukard"; } (import (./machines/Flakes-ISO)) { device = "Flakes-ISO"; mainuser = "ataraxia"; }
./machines/Home-Hypervisor/autoinstall.nix ./machines/Home-Hypervisor/autoinstall.nix
./machines/AMD-Workstation/autoinstall.nix
./machines/NixOS-VM/autoinstall.nix ./machines/NixOS-VM/autoinstall.nix
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
@ -169,7 +168,7 @@
Flakes-ISO-Aarch64 = { Flakes-ISO-Aarch64 = {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
(import (./machines/Flakes-ISO)) { device = "Flakes-ISO-Aarch64"; mainuser = "alukard"; } (import (./machines/Flakes-ISO)) { device = "Flakes-ISO-Aarch64"; mainuser = "ataraxia"; }
./machines/Arch-Builder-VM/autoinstall.nix ./machines/Arch-Builder-VM/autoinstall.nix
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
@ -215,14 +214,14 @@
packages = { packages = {
Wayland-VM = nixos-generators.nixosGenerate { Wayland-VM = nixos-generators.nixosGenerate {
system = builtins.readFile (./machines/Wayland-VM/system); system = builtins.readFile (./machines/Wayland-VM/system);
modules = [ (import (./machines/Wayland-VM)) { device = "Wayland-VM"; mainuser = "alukard"; } ]; modules = [ (import (./machines/Wayland-VM)) { device = "Wayland-VM"; mainuser = "ataraxia"; } ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
format = "vm"; format = "vm";
}; };
Flakes-ISO = nixos-generators.nixosGenerate { Flakes-ISO = nixos-generators.nixosGenerate {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
(import (./machines/Flakes-ISO)) { device = "Flakes-ISO"; mainuser = "alukard"; } (import (./machines/Flakes-ISO)) { device = "Flakes-ISO"; mainuser = "ataraxia"; }
./machines/Home-Hypervisor/autoinstall.nix ./machines/Home-Hypervisor/autoinstall.nix
./machines/NixOS-VM/autoinstall.nix ./machines/NixOS-VM/autoinstall.nix
]; ];
@ -232,7 +231,7 @@
Flakes-ISO-Aarch64 = nixos-generators.nixosGenerate { Flakes-ISO-Aarch64 = nixos-generators.nixosGenerate {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
(import (./machines/Flakes-ISO)) { device = "Flakes-ISO-Aarch64"; mainuser = "alukard"; } (import (./machines/Flakes-ISO)) { device = "Flakes-ISO-Aarch64"; mainuser = "ataraxia"; }
./machines/Arch-Builder-VM/autoinstall.nix ./machines/Arch-Builder-VM/autoinstall.nix
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
@ -245,23 +244,23 @@
nixosProfiles = builtins.listToAttrs (findModules ./profiles); nixosProfiles = builtins.listToAttrs (findModules ./profiles);
nixosRoles = import ./roles; nixosRoles = import ./roles;
deploy = { # deploy = {
user = "root"; # user = "root";
sudo = "doas -u"; # sudo = "doas -u";
fastConnection = true; # fastConnection = true;
sshOpts = [ "-A" ]; # sshOpts = [ "-A" ];
# nodes.Hypervisor-VM = { # # nodes.Hypervisor-VM = {
# hostname = "192.168.122.63"; # # hostname = "192.168.122.63";
# profiles = { # # profiles = {
# system = { # # system = {
# user = "root"; # # user = "root";
# sshUser = "alukard"; # # sshUser = "ataraxia";
# path = # # path =
# deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.Hypervisor-VM; # # deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.Hypervisor-VM;
# }; # # };
# }; # # };
# }; # # };
}; # };
# deploy = { # deploy = {
# user = "root"; # user = "root";
@ -270,7 +269,7 @@
# in { # in {
# hostname = machine.config.networking.hostName; # hostname = machine.config.networking.hostName;
# profiles.system = { # profiles.system = {
# user = if activateable then "root" else "alukard"; # user = if activateable then "root" else "ataraxia";
# path = with deploy-rs.lib.${machine.pkgs.system}.activate; # path = with deploy-rs.lib.${machine.pkgs.system}.activate;
# if activateable then # if activateable then
# nixos machine # nixos machine
@ -280,6 +279,6 @@
# }) self.nixosConfigurations); # }) self.nixosConfigurations);
# }; # };
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
}; };
} }

4
machines/AMD-Workstation/autoinstall.nix
View File

@ -2,8 +2,8 @@
autoinstall.AMD-Workstation = { autoinstall.AMD-Workstation = {
mainuser = "ataraxia"; mainuser = "ataraxia";
flakesPath = "/home/nixos/nixos-config"; flakesPath = "/home/nixos/nixos-config";
encryption.ecryptBoot = false; encryption.encryptBoot = false;
encryption.ecryptRoot = true; encryption.encryptRoot = true;
encryption.passwordFile = "/home/nixos/pass"; encryption.passwordFile = "/home/nixos/pass";
encryption.argonIterTime = "4000"; encryption.argonIterTime = "4000";
partitioning.useEntireDisk = true; partitioning.useEntireDisk = true;

41
machines/AMD-Workstation/boot.nix Normal file
View File

@ -0,0 +1,41 @@
{ config, pkgs, lib, ... }:
let
zfs_arc_max = toString (6 * 1024 * 1024 * 1024);
in {
boot = {
initrd = {
luks.devices = {
"cryptroot" = {
preLVM = true;
keyFile = "/keyfile0.bin";
allowDiscards = true;
bypassWorkqueues = config.deviceSpecific.isSSD;
fallbackToPassword = true;
};
};
secrets = {
"keyfile0.bin" = "/etc/secrets/keyfile0.bin";
};
};
loader = {
systemd-boot = {
enable = true;
editor = false;
configurationLimit = 10;
};
efi.canTouchEfiVariables = false;
efi.efiSysMountPoint = "/boot/efi";
generationsDir.copyKernels = true;
};
binfmt.emulatedSystems = [ "aarch64-linux" ];
kernelPackages = pkgs.linuxPackages_lqx;
kernelParams = [
"zfs.metaslab_lba_weighting_enabled=0"
"zfs.zfs_arc_max=${zfs_arc_max}"
];
tmpOnTmpfs = true;
tmpOnTmpfsSize = "32G";
};
}

35
machines/AMD-Workstation/default.nix
View File

@ -1,11 +1,12 @@
{ inputs, config, lib, pkgs, ... }: { { inputs, config, lib, pkgs, ... }: {
imports = with inputs.self; [ imports = with inputs.self; [
./boot.nix
./hardware-configuration.nix ./hardware-configuration.nix
nixosRoles.workstation nixosRoles.workstation
nixosProfiles.stable-diffusion # nixosProfiles.stable-diffusion
nixosProfiles.a2ln-server nixosProfiles.a2ln-server
nixosProfiles.sunshine # nixosProfiles.sunshine
# customModules.passthrough # customModules.passthrough
]; ];
@ -34,10 +35,6 @@
deviceSpecific.enableVirtualisation = true; deviceSpecific.enableVirtualisation = true;
deviceSpecific.vpn.mullvad.enable = true; deviceSpecific.vpn.mullvad.enable = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
boot.zfs.forceImportAll = lib.mkForce false;
hardware.video.hidpi.enable = lib.mkForce false; hardware.video.hidpi.enable = lib.mkForce false;
hardware.firmware = [ pkgs.rtl8761b-firmware ]; hardware.firmware = [ pkgs.rtl8761b-firmware ];
@ -50,19 +47,17 @@
''; '';
}; };
boot.zfs.extraPools = [ "filespool" ];
fileSystems = { fileSystems = {
"/media/sys" = { # "/media/sys" = {
fsType = "ntfs"; # fsType = "ntfs";
device = "/dev/disk/by-partuuid/7d14b1b8-288a-4a5c-a306-6e6ba714d089"; # device = "/dev/disk/by-partuuid/7d14b1b8-288a-4a5c-a306-6e6ba714d089";
options = [ # options = [
"nofail" # "nofail"
"uid=${toString config.users.users.${config.mainuser}.uid}" # "uid=${toString config.users.users.${config.mainuser}.uid}"
"gid=${toString config.users.groups.users.gid}" # "gid=${toString config.users.groups.users.gid}"
]; # ];
}; # };
"/media/files" = { "/media/files" = {
# Samba host
fsType = "ntfs"; fsType = "ntfs";
device = "/dev/mapper/files-veracrypt"; device = "/dev/mapper/files-veracrypt";
options = [ options = [
@ -73,10 +68,6 @@
}; };
}; };
boot.tmpOnTmpfs = true;
boot.tmpOnTmpfsSize = "32G";
boot.supportedFilesystems = [ "btrfs" ];
powerManagement.cpuFreqGovernor = "schedutil"; powerManagement.cpuFreqGovernor = "schedutil";
services.openssh.settings.PermitRootLogin = lib.mkForce "without-password"; services.openssh.settings.PermitRootLogin = lib.mkForce "without-password";
@ -95,7 +86,7 @@
pkgs.anydesk pkgs.anydesk
pkgs.winbox pkgs.winbox
]; ];
home.stateVersion = "21.11"; home.stateVersion = "22.11";
}; };
system.stateVersion = "22.11"; system.stateVersion = "22.11";

3
machines/Flakes-ISO/default.nix
View File

@ -1,6 +1,7 @@
{ modulesPath, lib, inputs, pkgs, config, ... }: { { modulesPath, lib, inputs, pkgs, config, ... }: {
imports = with inputs.self; [ imports = with inputs.self; [
"${toString modulesPath}/installer/cd-dvd/installation-cd-base.nix" "${toString modulesPath}/installer/cd-dvd/installation-cd-graphical-plasma5.nix"
# "${toString modulesPath}/installer/cd-dvd/installation-cd-base.nix"
../../modules/autoinstall/default.nix ../../modules/autoinstall/default.nix
]; ];