refactor(treewide): format with alejandra
This commit is contained in:
parent
7fefb94400
commit
61cef505da
216 changed files with 5995 additions and 3969 deletions
|
|
@ -1,46 +1,50 @@
|
|||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
ooknet.host = {
|
||||
name = "ooksdesk";
|
||||
type = "desktop";
|
||||
role = "workstation";
|
||||
profiles = [ "gaming" "creative" "media" "console-tools" ];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
client = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "amd";
|
||||
cpu.amd.pstate.enable = true;
|
||||
gpu.type = "amd";
|
||||
features = [ "ssd" "audio" "video" ];
|
||||
monitors = [{
|
||||
name = "DP-1";
|
||||
primary = true;
|
||||
width = 2560;
|
||||
height = 1440;
|
||||
refreshRate = 155;
|
||||
workspace = "1";
|
||||
}];
|
||||
};
|
||||
};
|
||||
ooknet.host = {
|
||||
name = "ooksdesk";
|
||||
type = "desktop";
|
||||
role = "workstation";
|
||||
profiles = ["gaming" "creative" "media" "console-tools"];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
client = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "amd";
|
||||
cpu.amd.pstate.enable = true;
|
||||
gpu.type = "amd";
|
||||
features = ["ssd" "audio" "video"];
|
||||
monitors = [
|
||||
{
|
||||
name = "DP-1";
|
||||
primary = true;
|
||||
width = 2560;
|
||||
height = 1440;
|
||||
refreshRate = 155;
|
||||
workspace = "1";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
};
|
||||
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
};
|
||||
|
||||
system.stateVersion = lib.mkDefault "23.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,50 +1,53 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/b5d09a8b-54a9-4f72-828c-5cceea2ec287";
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" ];
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist"];
|
||||
};
|
||||
|
||||
fileSystems."/swap" =
|
||||
{ device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=swap" ];
|
||||
};
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=swap"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/1D01-7040";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/1D01-7040";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,50 +1,54 @@
|
|||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./modules
|
||||
];
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./modules
|
||||
];
|
||||
|
||||
ooknet.host = {
|
||||
name = "ooksmedia";
|
||||
type = "desktop";
|
||||
role = "workstation";
|
||||
profiles = [ "media-server" "console-tools" ];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
server = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
cpu.amd.pstate.enable = true;
|
||||
gpu.type = "nvidia";
|
||||
features = [
|
||||
"audio"
|
||||
"video"
|
||||
"ssd"
|
||||
];
|
||||
monitors = [{
|
||||
name = "HDMI-A-1";
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
refreshRate = 60;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
}];
|
||||
};
|
||||
};
|
||||
ooknet.host = {
|
||||
name = "ooksmedia";
|
||||
type = "desktop";
|
||||
role = "workstation";
|
||||
profiles = ["media-server" "console-tools"];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
server = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
cpu.amd.pstate.enable = true;
|
||||
gpu.type = "nvidia";
|
||||
features = [
|
||||
"audio"
|
||||
"video"
|
||||
"ssd"
|
||||
];
|
||||
monitors = [
|
||||
{
|
||||
name = "HDMI-A-1";
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
refreshRate = 60;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
};
|
||||
kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
};
|
||||
|
||||
system.stateVersion = lib.mkDefault "23.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,48 +1,51 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" ];
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist"];
|
||||
};
|
||||
|
||||
fileSystems."/swap" =
|
||||
{ device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=swap" ];
|
||||
};
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-uuid/50617edf-e788-49cc-9e0c-85a2f90a5550";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=swap"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/B511-09E2";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/B511-09E2";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf;
|
||||
admin = config.ooknet.host.admin;
|
||||
cfg = config.ooknet.services.nixarr;
|
||||
in
|
||||
|
||||
{
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
nixarr = {
|
||||
vpn.enable = false;
|
||||
|
|
|
|||
|
|
@ -1,67 +1,68 @@
|
|||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkDefault;
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkDefault;
|
||||
in {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
|
||||
ooknet.host = {
|
||||
name = "ooksmicro";
|
||||
type = "micro";
|
||||
role = "workstation";
|
||||
profiles = [ "console-tools" ];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
client = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
gpu.type = "intel";
|
||||
features = [
|
||||
"bluetooth"
|
||||
"backlight"
|
||||
"battery"
|
||||
"ssd"
|
||||
"audio"
|
||||
"video"
|
||||
];
|
||||
monitors = [{
|
||||
name = "DSI-1";
|
||||
width = 720;
|
||||
height = 1280;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
transform = 3;
|
||||
}];
|
||||
battery = {
|
||||
powersave = {
|
||||
minFreq = 500;
|
||||
maxFreq = 800;
|
||||
};
|
||||
performance = {
|
||||
minFreq = 1200;
|
||||
maxFreq = 2400;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
ooknet.host = {
|
||||
name = "ooksmicro";
|
||||
type = "micro";
|
||||
role = "workstation";
|
||||
profiles = ["console-tools"];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
client = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
gpu.type = "intel";
|
||||
features = [
|
||||
"bluetooth"
|
||||
"backlight"
|
||||
"battery"
|
||||
"ssd"
|
||||
"audio"
|
||||
"video"
|
||||
];
|
||||
monitors = [
|
||||
{
|
||||
name = "DSI-1";
|
||||
width = 720;
|
||||
height = 1280;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
transform = 3;
|
||||
}
|
||||
];
|
||||
battery = {
|
||||
powersave = {
|
||||
minFreq = 500;
|
||||
maxFreq = 800;
|
||||
};
|
||||
performance = {
|
||||
minFreq = 1200;
|
||||
maxFreq = 2400;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
};
|
||||
|
||||
system.stateVersion = mkDefault "23.11";
|
||||
system.stateVersion = mkDefault "23.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,44 +1,47 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/385526ad-e263-495d-91eb-1f484985bd0f";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/385526ad-e263-495d-91eb-1f484985bd0f";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/fe7ea7fd-b531-4c00-8123-99f7ea855800";
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/385526ad-e263-495d-91eb-1f484985bd0f";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/385526ad-e263-495d-91eb-1f484985bd0f";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/57C5-11E7";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/57C5-11E7";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-uuid/385526ad-e263-495d-91eb-1f484985bd0f";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" ];
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/385526ad-e263-495d-91eb-1f484985bd0f";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist"];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{ pkgs, inputs, outputs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./modules ];
|
||||
pkgs,
|
||||
inputs,
|
||||
outputs,
|
||||
...
|
||||
}: {
|
||||
imports = [./modules];
|
||||
|
||||
environment.packages = with pkgs; [
|
||||
killall
|
||||
|
|
@ -29,7 +32,7 @@
|
|||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
time.timeZone = "Pacific/Auckland";
|
||||
|
||||
user = {
|
||||
|
|
@ -37,7 +40,7 @@
|
|||
};
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs outputs; };
|
||||
extraSpecialArgs = {inherit inputs outputs;};
|
||||
config = import ../../../home/user/ooks/ooksphone;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
startAgent = true;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
fontPackage = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
|
||||
{pkgs, ...}: let
|
||||
fontPackage = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
|
||||
fontPath = "/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf";
|
||||
in
|
||||
|
||||
{
|
||||
in {
|
||||
terminal = {
|
||||
font = fontPackage + fontPath;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,66 +1,67 @@
|
|||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkDefault;
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkDefault;
|
||||
in {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
|
||||
ooknet.host = {
|
||||
name = "ookst480s";
|
||||
type = "laptop";
|
||||
role = "workstation";
|
||||
profiles = [ "console-tools" "media" ];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
client = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
gpu.type = "intel";
|
||||
features = [
|
||||
"bluetooth"
|
||||
"backlight"
|
||||
"battery"
|
||||
"ssd"
|
||||
"audio"
|
||||
"video"
|
||||
];
|
||||
monitors = [{
|
||||
name = "eDP-1";
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
}];
|
||||
battery = {
|
||||
powersave = {
|
||||
minFreq = 800;
|
||||
maxFreq = 1800;
|
||||
};
|
||||
performance = {
|
||||
minFreq = 1800;
|
||||
maxFreq = 3600;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
ooknet.host = {
|
||||
name = "ookst480s";
|
||||
type = "laptop";
|
||||
role = "workstation";
|
||||
profiles = ["console-tools" "media"];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
networking = {
|
||||
tailscale = {
|
||||
enable = true;
|
||||
client = true;
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
gpu.type = "intel";
|
||||
features = [
|
||||
"bluetooth"
|
||||
"backlight"
|
||||
"battery"
|
||||
"ssd"
|
||||
"audio"
|
||||
"video"
|
||||
];
|
||||
monitors = [
|
||||
{
|
||||
name = "eDP-1";
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
}
|
||||
];
|
||||
battery = {
|
||||
powersave = {
|
||||
minFreq = 800;
|
||||
maxFreq = 1800;
|
||||
};
|
||||
performance = {
|
||||
minFreq = 1800;
|
||||
maxFreq = 3600;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
};
|
||||
|
||||
system.stateVersion = mkDefault "23.11";
|
||||
system.stateVersion = mkDefault "23.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,50 +1,53 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."cryptnix".device = "/dev/disk/by-uuid/014d725c-bf13-40a2-a9ab-0dd6185a95f6";
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" ];
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist"];
|
||||
};
|
||||
|
||||
fileSystems."/swap" =
|
||||
{ device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=swap" ];
|
||||
};
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=swap"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/F356-6F9C";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/F356-6F9C";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,59 +1,60 @@
|
|||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkDefault;
|
||||
in
|
||||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkDefault;
|
||||
in {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
|
||||
ooknet.host = {
|
||||
name = "ooksx1";
|
||||
type = "laptop";
|
||||
role = "workstation";
|
||||
profiles = [ "console-tools" ];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
gpu.type = "intel";
|
||||
features = [
|
||||
"bluetooth"
|
||||
"backlight"
|
||||
"battery"
|
||||
"ssd"
|
||||
"audio"
|
||||
"video"
|
||||
];
|
||||
monitors = [{
|
||||
name = "eDP-1";
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
}];
|
||||
battery = {
|
||||
powersave = {
|
||||
minFreq = 800;
|
||||
maxFreq = 1800;
|
||||
};
|
||||
performance = {
|
||||
minFreq = 1800;
|
||||
maxFreq = 3600;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
ooknet.host = {
|
||||
name = "ooksx1";
|
||||
type = "laptop";
|
||||
role = "workstation";
|
||||
profiles = ["console-tools"];
|
||||
admin = {
|
||||
name = "ooks";
|
||||
shell = "fish";
|
||||
homeManager = true;
|
||||
};
|
||||
hardware = {
|
||||
cpu.type = "intel";
|
||||
gpu.type = "intel";
|
||||
features = [
|
||||
"bluetooth"
|
||||
"backlight"
|
||||
"battery"
|
||||
"ssd"
|
||||
"audio"
|
||||
"video"
|
||||
];
|
||||
monitors = [
|
||||
{
|
||||
name = "eDP-1";
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
workspace = "1";
|
||||
primary = true;
|
||||
}
|
||||
];
|
||||
battery = {
|
||||
powersave = {
|
||||
minFreq = 800;
|
||||
maxFreq = 1800;
|
||||
};
|
||||
performance = {
|
||||
minFreq = 1800;
|
||||
maxFreq = 3600;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
};
|
||||
|
||||
system.stateVersion = mkDefault "23.11";
|
||||
system.stateVersion = mkDefault "23.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,51 +1,55 @@
|
|||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/3ea21f10-f705-457c-8366-a8268f658ba6";
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix"];
|
||||
};
|
||||
|
||||
fileSystems."/persist" =
|
||||
{ device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=persist" ];
|
||||
};
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist"];
|
||||
};
|
||||
|
||||
fileSystems."/swap" =
|
||||
{ device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=swap" ];
|
||||
};
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-uuid/db84a41f-6094-46b1-b98a-26e03afc18e1";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=swap"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/45D8-8DC3";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [{
|
||||
device = "/swap/swapfile";
|
||||
size = 8196;
|
||||
}];
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/45D8-8DC3";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swap/swapfile";
|
||||
size = 8196;
|
||||
}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue