From d8dd32193db4f05e448caa3c17fe833f4ab9e4bc Mon Sep 17 00:00:00 2001 From: Fishandchips321 Date: Sat, 28 Feb 2026 20:03:22 +0000 Subject: [PATCH] fixed formatting --- all-modules.nix | 6 +-- flake.nix | 14 +++--- modules/boot.nix | 4 +- modules/default-packages.nix | 4 +- modules/graphical.nix | 37 +++++++++------- modules/k3s.nix | 13 +++--- modules/kubernetes.nix | 11 +++-- modules/locale.nix | 7 ++- modules/networkManager.nix | 4 +- modules/prismLauncher.nix | 15 ++++--- modules/yazi.nix | 9 +++- shell.nix | 6 ++- systems/vm/configuration.nix | 24 +++++------ systems/vm/hardware-configuration.nix | 28 ++++++++---- treefmt.toml | 61 +++++++++++++++++++++++++++ 15 files changed, 167 insertions(+), 76 deletions(-) create mode 100644 treefmt.toml diff --git a/all-modules.nix b/all-modules.nix index a92e2a0..ca68789 100644 --- a/all-modules.nix +++ b/all-modules.nix @@ -1,5 +1,5 @@ -{lib, ...}: +{ lib, ... }: { - imports = lib.fileset.toList (lib.fileset.fileFilter (f: f.hasExt "nix") ./modules); -} \ No newline at end of file + imports = lib.fileset.toList (lib.fileset.fileFilter (f: f.hasExt "nix") ./modules); +} diff --git a/flake.nix b/flake.nix index 6f523a3..42af1f5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,12 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; }; - outputs = { self, nixpkgs }: { - # hydraJobs = nixpkgs.lib.mapAttrs (_: value: value.config.system.build.toplevel) self.nixosConfigurations; - nixosConfigurations = { - vm = nixpkgs.lib.nixosSystem { - modules = [ - ./systems/vm/configuration.nix - ]; + outputs = + { self, nixpkgs }: + { + # hydraJobs = nixpkgs.lib.mapAttrs (_: value: value.config.system.build.toplevel) self.nixosConfigurations; + nixosConfigurations = { + vm = nixpkgs.lib.nixosSystem { modules = [ ./systems/vm/configuration.nix ]; }; }; }; - }; } diff --git a/modules/boot.nix b/modules/boot.nix index 814ff37..7181c0f 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -1,7 +1,7 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda"; boot.loader.grub.useOSProber = true; -} \ No newline at end of file +} diff --git a/modules/default-packages.nix b/modules/default-packages.nix index 3fcb9f9..1eb713f 100644 --- a/modules/default-packages.nix +++ b/modules/default-packages.nix @@ -1,4 +1,4 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { programs = { @@ -10,4 +10,4 @@ acpi wget ]; -} \ No newline at end of file +} diff --git a/modules/graphical.nix b/modules/graphical.nix index b29b61f..6620151 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -1,28 +1,35 @@ -{config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: let - cfg = config.modules.graphical; + cfg = config.modules.graphical; in { - options = { - modules.graphical = { + options = { + modules.graphical = { enable = lib.mkEnableOption "Enable the GUI"; waybar = lib.mkEnableOption "Enable waybar"; quickshell = lib.mkEnableOption "Enable quickshell"; }; - }; + }; - config = lib.mkIf cfg.enable { - programs.niri.enable = true; - services.displayManager.ly.enable = true; + config = lib.mkIf cfg.enable { + programs.niri.enable = true; + services.displayManager.ly.enable = true; - environment.systemPackages = with pkgs; [ - alacritty - wl-clipboard - ] - ++ lib.optional cfg.quickshell quickshell; + environment.systemPackages = + with pkgs; + [ + alacritty + wl-clipboard + ] + ++ lib.optional cfg.quickshell quickshell; programs.waybar.enable = lib.mkIf cfg.waybar true; - }; -} \ No newline at end of file + }; +} diff --git a/modules/k3s.nix b/modules/k3s.nix index ba69020..0df95ff 100644 --- a/modules/k3s.nix +++ b/modules/k3s.nix @@ -1,4 +1,9 @@ -{config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: let cfg = config.modules.k3s; @@ -7,7 +12,5 @@ in { options.modules.k3s.enable = lib.mkEnableOption "Enable the k3s service"; - config = lib.mkIf cfg.enable { - services.k3s.enable = true; - }; -} \ No newline at end of file + config = lib.mkIf cfg.enable { services.k3s.enable = true; }; +} diff --git a/modules/kubernetes.nix b/modules/kubernetes.nix index 3f10a7d..819dceb 100644 --- a/modules/kubernetes.nix +++ b/modules/kubernetes.nix @@ -1,11 +1,16 @@ -{config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: let cfg = config.modules.kubernetes; in { - options.modules.kubernetes.enable = lib.mkEnableOption "Enable MiniKube and Kubectl"; + options.modules.kubernetes.enable = lib.mkEnableOption "Enable MiniKube and Kubectl"; config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ @@ -13,4 +18,4 @@ in kubectl ]; }; -} \ No newline at end of file +} diff --git a/modules/locale.nix b/modules/locale.nix index 88ecdcd..1d3a479 100644 --- a/modules/locale.nix +++ b/modules/locale.nix @@ -1,5 +1,4 @@ -_: -{ +_: { services.automatic-timezoned.enable = true; i18n.defaultLocale = "en_GB.UTF-8"; i18n.extraLocaleSettings = { @@ -13,5 +12,5 @@ _: LC_TELEPHONE = "en_GB.UTF-8"; LC_TIME = "en_GB.UTF-8"; }; - console.keyMap = "uk"; -} \ No newline at end of file + console.keyMap = "uk"; +} diff --git a/modules/networkManager.nix b/modules/networkManager.nix index dca6ad0..34b6b7c 100644 --- a/modules/networkManager.nix +++ b/modules/networkManager.nix @@ -1,5 +1,5 @@ -{config, pkgs, ...}: +{ config, pkgs, ... }: { networking.networkmanager.enable = true; -} \ No newline at end of file +} diff --git a/modules/prismLauncher.nix b/modules/prismLauncher.nix index 98acfbb..1cab5d6 100644 --- a/modules/prismLauncher.nix +++ b/modules/prismLauncher.nix @@ -1,4 +1,9 @@ -{config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: let cfg = config.modules.prismLauncher; @@ -6,9 +11,5 @@ in { options.modules.prismLauncher.enable = lib.mkEnableOption "Enables the prism minecraft launcher"; - config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - prismlauncher - ]; - }; -} \ No newline at end of file + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ prismlauncher ]; }; +} diff --git a/modules/yazi.nix b/modules/yazi.nix index ee8991c..55aa448 100644 --- a/modules/yazi.nix +++ b/modules/yazi.nix @@ -1,4 +1,9 @@ -{config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: let cfg = config.modules.yazi; @@ -28,4 +33,4 @@ in imagemagick ]; }; -} \ No newline at end of file +} diff --git a/shell.nix b/shell.nix index c305f39..1b9bf5d 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,6 @@ -{pkgs ? import {}}: +{ + pkgs ? import { }, +}: pkgs.mkShell { nativeBuildInputs = with pkgs.buildPackages; [ deadnix @@ -6,4 +8,4 @@ pkgs.mkShell { treefmt nixfmt-rfc-style ]; -} \ No newline at end of file +} diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix index e908b79..61fec7c 100644 --- a/systems/vm/configuration.nix +++ b/systems/vm/configuration.nix @@ -1,19 +1,19 @@ -{ config, pkgs, ...}: +{ config, pkgs, ... }: { - imports = [ - ../../all-modules.nix - ./hardware-configuration.nix - ]; + imports = [ + ../../all-modules.nix + ./hardware-configuration.nix + ]; - users.users.riley = { - isNormalUser = true; - extraGroups = ["wheel"]; - }; + users.users.riley = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + }; networking.hostName = "vm"; - modules.graphical = { + modules.graphical = { enable = true; waybar = true; quickshell = true; @@ -21,5 +21,5 @@ modules.yazi.enable = true; - system.stateVersion = "25.11"; -} \ No newline at end of file + system.stateVersion = "25.11"; +} diff --git a/systems/vm/hardware-configuration.nix b/systems/vm/hardware-configuration.nix index 3b2f28b..23f42df 100644 --- a/systems/vm/hardware-configuration.nix +++ b/systems/vm/hardware-configuration.nix @@ -1,19 +1,29 @@ -{ config, lib, pkgs, modulesPath, ...}: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: +{ + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; - boot.initrd.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "ahci" + "xhci_pci" + "virtio_pci" + "sr_mod" + "virtio_blk" + ]; + boot.initrd.kernelModules = [ ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/ed56e12e-55cc-42e0-b94f-9a6d6bb2bdad"; fsType = "ext4"; }; - swapDevices = []; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} \ No newline at end of file +} diff --git a/treefmt.toml b/treefmt.toml new file mode 100644 index 0000000..c883b33 --- /dev/null +++ b/treefmt.toml @@ -0,0 +1,61 @@ +# One CLI to format the code tree - https://github.com/numtide/treefmt + +# Do not exit with error if a configured formatter is missing +# Env $TREEFMT_ALLOW_MISSING_FORMATTER +# allow-missing-formatter = true + +# The file into which a cpu profile will be written +# Env $TREEFMT_CPU_PROFILE +# cpu-profile = ./cpu.pprof + +# Exclude files or directories matching the specified globs +# Env $TREEFMT_EXCLUDES +# excludes = ["*.md", "*.gif"] + +# Exit with error if any changes were made during execution +# Useful for CI +# Env $TREEFMT_FAIL_ON_CHANGE +# fail-on-change = true + +# A list of formatters to apply +# Defaults to all configured formatters +# Env $TREEFMT_FORMATTERS +# formatters = ["gofmt", "prettier"] + +# Log paths that did not match any formatters at the specified log level +# Possible values are +# Env $TREEFMT_ON_UNMATCHED +# on-unmatched = "info" + +# The root directory from which treefmt will start walking the filesystem +# Defaults to the directory containing the config file +# Env $TREEFMT_TREE_ROOT +# tree-root = "/tmp/foo" + +# File to search for to find the tree root (if tree-root is not set) +# Env $TREEFMT_TREE_ROOT_FILE +# tree-root-file = ".git/config" + +# Set the verbosity of logs +# 0 = warn, 1 = info, 2 = debug +# Env $TREEFMT_VERBOSE +# verbose = 2 + +# The method used to traverse the files within the tree root +# Currently, we support 'auto', 'git' or 'filesystem' +# Env $TREEFMT_WALK +# walk = "filesystem" + +[formatter.mylanguage] +# Command to execute +command = "nixfmt" +# Command-line arguments for the command +options = ["-s", "-v", "-w150"] +# Glob pattern of files to include +includes = ["*.nix"] +# Glob patterns of files to exclude +excludes = [] +# Controls the order of application when multiple formatters match the same file +# Lower the number, the higher the precedence +# Default is 0 +priority = 0