summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/common/desktop/default.nix23
-rw-r--r--hosts/common/desktop/gnome.nix2
-rw-r--r--hosts/common/desktop/plasma.nix2
-rw-r--r--hosts/common/documentation.nix4
-rw-r--r--hosts/common/fonts.nix27
-rw-r--r--hosts/common/hardware/nvidia.nix9
-rw-r--r--hosts/common/packages.nix20
-rw-r--r--hosts/common/security.nix12
-rw-r--r--hosts/common/systemd.nix2
-rw-r--r--hosts/common/users.nix7
-rw-r--r--hosts/glados-wsl/default.nix2
-rw-r--r--hosts/glados/boot.nix13
-rw-r--r--hosts/glados/hardware-configuration.nix29
13 files changed, 78 insertions, 74 deletions
diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix
index 3496df9..3a651ea 100644
--- a/hosts/common/desktop/default.nix
+++ b/hosts/common/desktop/default.nix
@@ -1,22 +1,21 @@
-{ lib
-, desktop
-, ...
-}:
-let
- gui = desktop != "";
-in
{
+ lib,
+ desktop,
+ ...
+}: let
+ gui = desktop != "";
+in {
imports =
- [ ]
+ []
++ (
if (desktop == "gnome")
- then [ ./gnome.nix ]
- else [ ]
+ then [./gnome.nix]
+ else []
)
++ (
if (desktop == "plasma")
- then [ ./plasma.nix ]
- else [ ]
+ then [./plasma.nix]
+ else []
);
environment.noXlibs = lib.mkForce false;
diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix
index f8d59a5..b72d757 100644
--- a/hosts/common/desktop/gnome.nix
+++ b/hosts/common/desktop/gnome.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
environment = {
gnome.excludePackages = with pkgs; [
epiphany
diff --git a/hosts/common/desktop/plasma.nix b/hosts/common/desktop/plasma.nix
index cd31983..61dc1da 100644
--- a/hosts/common/desktop/plasma.nix
+++ b/hosts/common/desktop/plasma.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
services.xserver = {
displayManager.sddm.enable = true;
desktopManager.plasma5 = {
diff --git a/hosts/common/documentation.nix b/hosts/common/documentation.nix
index 64b78a3..bd22316 100644
--- a/hosts/common/documentation.nix
+++ b/hosts/common/documentation.nix
@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
- environment.systemPackages = with pkgs; [ man-pages man-pages-posix ];
+{pkgs, ...}: {
+ environment.systemPackages = with pkgs; [man-pages man-pages-posix];
documentation = {
dev.enable = true;
man.enable = true;
diff --git a/hosts/common/fonts.nix b/hosts/common/fonts.nix
index a9b133c..7f260dc 100644
--- a/hosts/common/fonts.nix
+++ b/hosts/common/fonts.nix
@@ -1,11 +1,10 @@
-{ pkgs
-, desktop
-, ...
-}:
-let
- gui = desktop != "";
-in
{
+ pkgs,
+ desktop,
+ ...
+}: let
+ gui = desktop != "";
+in {
fonts = {
enableDefaultFonts = gui;
fonts =
@@ -17,17 +16,17 @@ in
noto-fonts-emoji
noto-fonts-cjk-sans
fira-code
- (nerdfonts.override { fonts = [ "FiraCode" ]; })
+ (nerdfonts.override {fonts = ["FiraCode"];})
]
- else [ ];
+ else [];
fontconfig.defaultFonts =
if gui
then {
- serif = [ "Noto Serif" ];
- sansSerif = [ "Noto Sans" ];
- emoji = [ "Noto Color Emoji" ];
- monospace = [ "Fira Code" ];
+ serif = ["Noto Serif"];
+ sansSerif = ["Noto Sans"];
+ emoji = ["Noto Color Emoji"];
+ monospace = ["Fira Code"];
}
- else { };
+ else {};
};
}
diff --git a/hosts/common/hardware/nvidia.nix b/hosts/common/hardware/nvidia.nix
index 5306c56..6a4b177 100644
--- a/hosts/common/hardware/nvidia.nix
+++ b/hosts/common/hardware/nvidia.nix
@@ -1,6 +1,7 @@
-{ config
-, pkgs
-, ...
+{
+ config,
+ pkgs,
+ ...
}: {
hardware = {
nvidia = {
@@ -19,5 +20,5 @@
};
};
- services.xserver.videoDrivers = [ "nvidia" ];
+ services.xserver.videoDrivers = ["nvidia"];
}
diff --git a/hosts/common/packages.nix b/hosts/common/packages.nix
index eb60f10..3a4d2b2 100644
--- a/hosts/common/packages.nix
+++ b/hosts/common/packages.nix
@@ -1,24 +1,26 @@
-{ pkgs
-, desktop
-, ...
-}:
-let
+{
+ pkgs,
+ desktop,
+ ...
+}: let
gui = desktop != "";
pinentry = with pkgs;
if desktop == "gnome"
then pinentry-gnome
else pinentry-curses;
-in
-{
+in {
environment.systemPackages = with pkgs;
[
neofetch
python311
]
- ++ [ pinentry ];
+ ++ [pinentry];
programs = {
- firefox.enable = if gui then true else false;
+ firefox.enable =
+ if gui
+ then true
+ else false;
git.enable = true;
gnupg = {
agent = {
diff --git a/hosts/common/security.nix b/hosts/common/security.nix
index d150236..a6c7e57 100644
--- a/hosts/common/security.nix
+++ b/hosts/common/security.nix
@@ -1,4 +1,4 @@
-{ wsl, ... }: {
+{wsl, ...}: {
security = {
apparmor.enable = !wsl;
audit.enable = !wsl;
@@ -13,13 +13,13 @@
execWheelOnly = true;
extraRules = [
{
- users = [ "root" ];
- groups = [ "root" ];
- commands = [ "ALL" ];
+ users = ["root"];
+ groups = ["root"];
+ commands = ["ALL"];
}
{
- users = [ "seth" ];
- commands = [ "ALL" ];
+ users = ["seth"];
+ commands = ["ALL"];
}
];
};
diff --git a/hosts/common/systemd.nix b/hosts/common/systemd.nix
index d54a2ed..86fea4a 100644
--- a/hosts/common/systemd.nix
+++ b/hosts/common/systemd.nix
@@ -1,4 +1,4 @@
-{ wsl, ... }: {
+{wsl, ...}: {
services = {
journald.extraConfig = ''
MaxRetentionSec=1w
diff --git a/hosts/common/users.nix b/hosts/common/users.nix
index fd31ab0..6ca24c4 100644
--- a/hosts/common/users.nix
+++ b/hosts/common/users.nix
@@ -1,6 +1,7 @@
-{ config
-, pkgs
-, ...
+{
+ config,
+ pkgs,
+ ...
}: {
users = {
defaultUserShell = pkgs.bash;
diff --git a/hosts/glados-wsl/default.nix b/hosts/glados-wsl/default.nix
index ec65d48..af6e712 100644
--- a/hosts/glados-wsl/default.nix
+++ b/hosts/glados-wsl/default.nix
@@ -1,4 +1,4 @@
-{ modulesPath, ... }: {
+{modulesPath, ...}: {
imports = [
(modulesPath + "/profiles/minimal.nix")
];
diff --git a/hosts/glados/boot.nix b/hosts/glados/boot.nix
index 4d905cb..bba1bef 100644
--- a/hosts/glados/boot.nix
+++ b/hosts/glados/boot.nix
@@ -1,7 +1,8 @@
-{ config
-, lib
-, pkgs
-, ...
+{
+ config,
+ lib,
+ pkgs,
+ ...
}: {
environment.systemPackages = with pkgs; [
sbctl
@@ -9,7 +10,7 @@
boot = {
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
- kernelParams = [ "nohibernate" ];
+ kernelParams = ["nohibernate"];
bootspec.enable = true;
loader.systemd-boot.enable = lib.mkForce false;
@@ -18,6 +19,6 @@
enable = true;
pkiBundle = "/etc/secureboot";
};
- supportedFilesystems = [ "zfs" "ntfs" ];
+ supportedFilesystems = ["zfs" "ntfs"];
};
}
diff --git a/hosts/glados/hardware-configuration.nix b/hosts/glados/hardware-configuration.nix
index 891c896..20d2eda 100644
--- a/hosts/glados/hardware-configuration.nix
+++ b/hosts/glados/hardware-configuration.nix
@@ -1,43 +1,44 @@
# 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
-, pkgs
-, modulesPath
-, ...
+{
+ config,
+ lib,
+ pkgs,
+ modulesPath,
+ ...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
- boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
- boot.initrd.kernelModules = [ ];
- boot.kernelModules = [ "kvm-amd" ];
- boot.extraModulePackages = [ ];
+ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+ boot.initrd.kernelModules = [];
+ boot.kernelModules = ["kvm-amd"];
+ boot.extraModulePackages = [];
fileSystems."/" = {
device = "rpool/nixos/root";
fsType = "zfs";
- options = [ "zfsutil" "X-mount.mkdir" ];
+ options = ["zfsutil" "X-mount.mkdir"];
};
fileSystems."/home" = {
device = "rpool/nixos/home";
fsType = "zfs";
- options = [ "zfsutil" "X-mount.mkdir" ];
+ options = ["zfsutil" "X-mount.mkdir"];
};
fileSystems."/nix" = {
device = "rpool/nixos/nixstore";
fsType = "zfs";
- options = [ "zfsutil" "X-mount.mkdir" ];
+ options = ["zfsutil" "X-mount.mkdir"];
};
fileSystems."/var/log" = {
device = "rpool/nixos/var/log";
fsType = "zfs";
- options = [ "zfsutil" "X-mount.mkdir" ];
+ options = ["zfsutil" "X-mount.mkdir"];
};
fileSystems."/boot" = {
@@ -45,7 +46,7 @@
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 22:36:57 +0000