From 9ea28ef2186572c111fb536266b6597c3a50c12c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 22:46:17 +0300 Subject: [PATCH] formatting --- .../darwinHosts/prometheus/configuration.nix | 16 +++++-- hosts/nixos/apollo/configuration.nix | 29 ++++++----- hosts/nixos/apollo/hardware-configuration.nix | 2 +- modules/home-manager/programs/ssh.nix | 2 +- modules/nixos/hardware/disko.nix | 28 ++++++++--- modules/nixos/options.nix | 23 +++++++-- modules/nixos/programs/arduino.nix | 7 ++- modules/nixos/programs/command-line.nix | 7 ++- modules/nixos/programs/graphical.nix | 7 ++- modules/nixos/programs/neovim.nix | 8 +++- modules/nixos/programs/steam.nix | 18 +++---- modules/nixos/system/agenix.nix | 48 +++++++++++-------- modules/nixos/system/desktop-environment.nix | 7 ++- modules/nixos/system/fonts.nix | 20 ++++++-- modules/nixos/system/home-manager.nix | 7 ++- modules/nixos/system/nix-index.nix | 7 ++- modules/nixos/system/nix-settings.nix | 10 +++- modules/nixos/system/users.nix | 12 +++-- 18 files changed, 183 insertions(+), 75 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 3d10385..892d3a8 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -67,7 +67,6 @@ nix.channel.enable = false; - nix.registry = { self.flake = inputs.self; nixpkgs.flake = inputs.nixpkgs; @@ -91,7 +90,10 @@ osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs = { - from = { type = "indirect"; id = "my-nixpkgs"; }; + from = { + type = "indirect"; + id = "my-nixpkgs"; + }; to = { owner = "osbm"; repo = "nixpkgs"; @@ -99,7 +101,10 @@ }; }; osbm-dev = { - from = { type = "indirect"; id = "osbm-dev"; }; + from = { + type = "indirect"; + id = "osbm-dev"; + }; to = { owner = "osbm"; repo = "osbm.dev"; @@ -107,7 +112,10 @@ }; }; devshells = { - from = { type = "indirect"; id = "devshells"; }; + from = { + type = "indirect"; + id = "devshells"; + }; to = { owner = "osbm"; repo = "devshells"; diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index d0e67cc..ba52af6 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -48,10 +48,10 @@ enable = true; hostID = "0f7de22e"; root = { - useTmpfs = false; # Use ZFS root, not tmpfs + useTmpfs = false; # Use ZFS root, not tmpfs encrypt = true; disk1 = "vda"; - impermanenceRoot = true; # Wipe root on boot with ZFS snapshots + impermanenceRoot = true; # Wipe root on boot with ZFS snapshots }; }; }; @@ -73,17 +73,24 @@ useDHCP = false; interfaces.ens3 = { useDHCP = false; - ipv4.addresses = [{ - address = "152.53.152.129"; - prefixLength = 22; - }]; - ipv6.addresses = [{ - address = "2a00:11c0:47:3b2a::1"; - prefixLength = 64; - }]; + ipv4.addresses = [ + { + address = "152.53.152.129"; + prefixLength = 22; + } + ]; + ipv6.addresses = [ + { + address = "2a00:11c0:47:3b2a::1"; + prefixLength = 64; + } + ]; }; defaultGateway = "152.53.152.1"; - defaultGateway6 = { address = "fe80::1"; interface = "ens3"; }; + defaultGateway6 = { + address = "fe80::1"; + interface = "ens3"; + }; }; # Override initrd kernel params for static IP diff --git a/hosts/nixos/apollo/hardware-configuration.nix b/hosts/nixos/apollo/hardware-configuration.nix index 5c9e404..0b20651 100644 --- a/hosts/nixos/apollo/hardware-configuration.nix +++ b/hosts/nixos/apollo/hardware-configuration.nix @@ -2,7 +2,7 @@ { # Disko configuration is now managed by osbmModules.hardware.disko # All disk configuration moved to configuration.nix - + # Required for ZFS nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index 12a937d..ac1367a 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -28,7 +28,7 @@ in programs.ssh = { enable = true; enableDefaultConfig = false; - + matchBlocks = { ymir = sshBlock "192.168.0.2"; ymir-ts = sshBlock "ymir.curl-boga.ts.net"; diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix index 74a23a3..93fa04d 100644 --- a/modules/nixos/hardware/disko.nix +++ b/modules/nixos/hardware/disko.nix @@ -1,4 +1,10 @@ -{ config, inputs, lib, pkgs, ... }: +{ + config, + inputs, + lib, + pkgs, + ... +}: let cfg = config.osbmModules.hardware.disko; inherit (config.networking) hostName; @@ -9,9 +15,11 @@ let "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHYSJ9ywFRJ747tkhvYWFkx/Y9SkLqv3rb7T1UuXVBWo" ]; - authorizedKeys = if cfg.initrd-ssh.authorizedKeys != [] - then cfg.initrd-ssh.authorizedKeys - else defaultAuthorizedKeys; + authorizedKeys = + if cfg.initrd-ssh.authorizedKeys != [ ] then + cfg.initrd-ssh.authorizedKeys + else + defaultAuthorizedKeys; in { imports = [ @@ -52,9 +60,12 @@ in # ZFS does not support swapfiles kernelParams = [ "nohibernate" - "zfs.zfs_arc_max=17179869184" # 16GB ARC max + "zfs.zfs_arc_max=17179869184" # 16GB ARC max + ]; + supportedFilesystems = [ + "vfat" + "zfs" ]; - supportedFilesystems = [ "vfat" "zfs" ]; zfs = { devNodes = "/dev/disk/by-id/"; forceImportAll = true; @@ -117,7 +128,10 @@ in type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = [ "defaults" "umask=0077" ]; + mountOptions = [ + "defaults" + "umask=0077" + ]; }; }; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index d14da81..50f00d6 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -3,14 +3,23 @@ options.osbmModules = { # Desktop Environment desktopEnvironment = lib.mkOption { - type = lib.types.enum [ "plasma" "none" ]; + type = lib.types.enum [ + "plasma" + "none" + ]; default = "none"; description = "Which desktop environment to use"; }; # Machine Type machineType = lib.mkOption { - type = lib.types.enum [ "desktop" "laptop" "server" "embedded" "mobile" ]; + type = lib.types.enum [ + "desktop" + "laptop" + "server" + "embedded" + "mobile" + ]; default = "server"; description = "Type of machine for appropriate defaults"; }; @@ -18,7 +27,10 @@ # Users users = lib.mkOption { type = lib.types.listOf lib.types.str; - default = [ "osbm" "bayram" ]; + default = [ + "osbm" + "bayram" + ]; description = "List of users to create. `osbm` is my main user, and `bayram` is for my family."; }; @@ -188,7 +200,10 @@ }; fileSystem = lib.mkOption { - type = lib.types.enum [ "zfs" "ext4" ]; + type = lib.types.enum [ + "zfs" + "ext4" + ]; default = "ext4"; description = "Root filesystem type"; }; diff --git a/modules/nixos/programs/arduino.nix b/modules/nixos/programs/arduino.nix index 719d170..f5123eb 100644 --- a/modules/nixos/programs/arduino.nix +++ b/modules/nixos/programs/arduino.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.programs.arduino.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index a01666a..8311a71 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.programs.commandLine.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/programs/graphical.nix b/modules/nixos/programs/graphical.nix index d388c0b..3f4f11d 100644 --- a/modules/nixos/programs/graphical.nix +++ b/modules/nixos/programs/graphical.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.programs.graphical.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/programs/neovim.nix b/modules/nixos/programs/neovim.nix index 2814441..429f032 100644 --- a/modules/nixos/programs/neovim.nix +++ b/modules/nixos/programs/neovim.nix @@ -1,4 +1,10 @@ -{ lib, inputs, config, pkgs, ... }: +{ + lib, + inputs, + config, + pkgs, + ... +}: { config = lib.mkIf config.osbmModules.programs.neovim.enable { environment.systemPackages = [ diff --git a/modules/nixos/programs/steam.nix b/modules/nixos/programs/steam.nix index 94dbeae..21f6359 100644 --- a/modules/nixos/programs/steam.nix +++ b/modules/nixos/programs/steam.nix @@ -1,14 +1,14 @@ { lib, config, ... }: { config = lib.mkIf config.osbmModules.programs.steam.enable { - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - dedicatedServer.openFirewall = true; - # Open ports in the firewall for Steam Local Network Game Transfers - localNetworkGameTransfers.openFirewall = true; - }; + programs.steam = { + enable = true; + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; + }; }; } diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix index 4630856..cd84056 100644 --- a/modules/nixos/system/agenix.nix +++ b/modules/nixos/system/agenix.nix @@ -1,32 +1,38 @@ -{ lib, pkgs, inputs, config, ... }: +{ + lib, + pkgs, + inputs, + config, + ... +}: { imports = [ inputs.agenix.nixosModules.default ]; config = lib.mkIf config.osbmModules.agenix.enable { - environment.systemPackages = [ - inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix - pkgs.age - ]; + environment.systemPackages = [ + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix + pkgs.age + ]; - age.secrets = { - network-manager.file = ../secrets/network-manager.age; - ssh-key-private = { - file = ../secrets/ssh-key-private.age; - path = "/home/osbm/.ssh/id_ed25519"; - owner = "osbm"; - group = "users"; - mode = "600"; - }; - ssh-key-public = { - file = ../secrets/ssh-key-public.age; - path = "/home/osbm/.ssh/id_ed25519.pub"; - owner = "osbm"; - group = "users"; - mode = "644"; - }; + age.secrets = { + network-manager.file = ../secrets/network-manager.age; + ssh-key-private = { + file = ../secrets/ssh-key-private.age; + path = "/home/osbm/.ssh/id_ed25519"; + owner = "osbm"; + group = "users"; + mode = "600"; }; + ssh-key-public = { + file = ../secrets/ssh-key-public.age; + path = "/home/osbm/.ssh/id_ed25519.pub"; + owner = "osbm"; + group = "users"; + mode = "644"; + }; + }; }; } diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index e84e89f..430316f 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: let cfg = config.osbmModules; in diff --git a/modules/nixos/system/fonts.nix b/modules/nixos/system/fonts.nix index b8f68fe..388afd8 100644 --- a/modules/nixos/system/fonts.nix +++ b/modules/nixos/system/fonts.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.fonts.enable { fonts.packages = with pkgs; [ @@ -12,14 +17,23 @@ dina-font proggyfonts jetbrains-mono - (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Iosevka" ]; }) + (nerdfonts.override { + fonts = [ + "FiraCode" + "JetBrainsMono" + "Iosevka" + ]; + }) ]; fonts.fontconfig = { defaultFonts = { serif = [ "Noto Serif" ]; sansSerif = [ "Noto Sans" ]; - monospace = [ "JetBrainsMono Nerd Font" "Fira Code" ]; + monospace = [ + "JetBrainsMono Nerd Font" + "Fira Code" + ]; emoji = [ "Noto Color Emoji" ]; }; }; diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index e0552d8..950fdfd 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -1,4 +1,9 @@ -{ lib, config, inputs, ... }: +{ + lib, + config, + inputs, + ... +}: { imports = lib.optionals (inputs ? home-manager) [ diff --git a/modules/nixos/system/nix-index.nix b/modules/nixos/system/nix-index.nix index 87b1fb6..6b1f8e9 100644 --- a/modules/nixos/system/nix-index.nix +++ b/modules/nixos/system/nix-index.nix @@ -1,4 +1,9 @@ -{ lib, config, inputs, ... }: +{ + lib, + config, + inputs, + ... +}: { imports = [ inputs.nix-index-database.nixosModules.nix-index diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index e8489b1..0e2bbd0 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -1,8 +1,14 @@ -{ inputs, lib, config, ... }: +{ + inputs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.nixSettings.enable { # Allow unfree packages - nixpkgs.config.allowUnfreePredicate = pkg: + nixpkgs.config.allowUnfreePredicate = + pkg: builtins.elem (lib.getName pkg) [ "vscode" "discord" diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index 18870e7..d3d3b14 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -5,16 +5,18 @@ let regularUsers = builtins.filter (u: u != "root") cfg.users; in { - config = lib.mkIf (cfg.users != []) { + config = lib.mkIf (cfg.users != [ ]) { users.users = lib.mkMerge [ # Create users based on the list (excluding root) (lib.genAttrs regularUsers (username: { isNormalUser = true; description = username; - extraGroups = [ "networkmanager" ] - ++ lib.optional (username == cfg.defaultUser) "wheel" - ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" - ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; + extraGroups = [ + "networkmanager" + ] + ++ lib.optional (username == cfg.defaultUser) "wheel" + ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" + ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; })) # Additional configuration for default user (including root if it's default)