From cc09d65964be62e90b3b9b493c2ce4de75abeef4 Mon Sep 17 00:00:00 2001 From: Ryan Hamamura <58859899+ryanhamamura@users.noreply.github.com> Date: Thu, 23 Apr 2026 14:02:27 -1000 Subject: [PATCH] chore(format): apply nixfmt formatting --- flake.nix | 6 +- modules/features/niri.nix | 51 ++--- modules/hosts/fio/configuration.nix | 295 ++++++++++++++-------------- modules/hosts/fio/default.nix | 3 +- modules/hosts/fio/hardware.nix | 72 ++++--- 5 files changed, 233 insertions(+), 194 deletions(-) diff --git a/flake.nix b/flake.nix index 653c0d2..16974a6 100644 --- a/flake.nix +++ b/flake.nix @@ -8,5 +8,9 @@ wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; }; - outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); + outputs = + inputs: + inputs.flake-parts.lib.mkFlake { + inherit inputs; + } (inputs.import-tree ./modules); } diff --git a/modules/features/niri.nix b/modules/features/niri.nix index 20b2741..c607d4b 100644 --- a/modules/features/niri.nix +++ b/modules/features/niri.nix @@ -1,27 +1,32 @@ -{ self, inputs, ... }: { +{ self, inputs, ... }: +{ - flake.nixosModules.niri = { pkgs, lib, ... }: { - programs.niri = { - enable = true; - package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri; - } - }; - - perSystem = { pkgs, lib, ... }: { - packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap { - inherit pkgs; - settings = { - input.keyboard = { - xkb.layout = "us,ua"; - }; - - layout.gaps = 5; - - binds = { - "Mod+Return".spawn-sh = lib.getExe pkgs.alacritty; - "Mod+Q".close-window = null; - }; + flake.nixosModules.niri = + { pkgs, lib, ... }: + { + programs.niri = { + enable = true; + package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri; + }; + }; + + perSystem = + { pkgs, lib, ... }: + { + packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap { + inherit pkgs; + settings = { + input.keyboard = { + xkb.layout = "us,ua"; + }; + + layout.gaps = 5; + + binds = { + "Mod+Return".spawn-sh = lib.getExe pkgs.alacritty; + "Mod+Q".close-window = null; + }; + }; }; }; - }; } diff --git a/modules/hosts/fio/configuration.nix b/modules/hosts/fio/configuration.nix index 1e0b747..0cc35eb 100644 --- a/modules/hosts/fio/configuration.nix +++ b/modules/hosts/fio/configuration.nix @@ -1,161 +1,170 @@ -{ self, inputs, ... }: { - - flake.nixosModules.fioConfiguration = { pkgs, lib, ... }: { - - imports = [ - self.nixosModules.fioHardware - self.nixosModules.niri - ]; +{ self, inputs, ... }: +{ - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + flake.nixosModules.fioConfiguration = + { pkgs, lib, ... }: + { - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + imports = [ + self.nixosModules.fioHardware + self.nixosModules.niri + ]; - networking.hostName = "fio"; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; - # Enable networking - networking.networkmanager.enable = true; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; - # Set your time zone. - time.timeZone = "Pacific/Honolulu"; + networking.hostName = "fio"; + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + # Enable networking + networking.networkmanager.enable = true; - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; + # Set your time zone. + time.timeZone = "Pacific/Honolulu"; - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; + # Enable the X11 windowing system. + # You can disable this if you're only using the Wayland session. + services.xserver.enable = true; - # Enable CUPS to print documents. - services.printing.enable = true; + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; - # Enable sound with pipewire. - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; + # Enable CUPS to print documents. + services.printing.enable = true; - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; + # Enable sound with pipewire. + services.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; - programs.zsh = { - enable = true; - enableCompletion = true; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - }; + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + }; + + programs.git = { + enable = true; + config = { + user.name = "Ryan Hamamura"; + user.email = "58859899+ryanhamamura@users.noreply.github.com"; + init.defaultBranch = "main"; + push.autoSetupRemote = true; + }; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.ryan = { + isNormalUser = true; + description = "Ryan Hamamura"; + extraGroups = [ + "networkmanager" + "wheel" + ]; + shell = pkgs.zsh; + packages = with pkgs; [ + kdePackages.kate + # thunderbird + ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3IDvg7Qfm3BJGK2XAIQEYwyUCPyXdyB3o6BUitu/DS ryan@porco" + ]; + }; + + # Install firefox. + programs.firefox.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + vim + wget + git + neovim + alacritty + tea + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh = { + enable = true; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + PermitRootLogin = "no"; + AllowUsers = [ "ryan" ]; + }; + }; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "25.11"; # Did you read the comment? - programs.git = { - enable = true; - config = { - user.name = "Ryan Hamamura"; - user.email = "58859899+ryanhamamura@users.noreply.github.com"; - init.defaultBranch = "main"; - push.autoSetupRemote = true; }; - }; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.ryan = { - isNormalUser = true; - description = "Ryan Hamamura"; - extraGroups = [ "networkmanager" "wheel" ]; - shell = pkgs.zsh; - packages = with pkgs; [ - kdePackages.kate - # thunderbird - ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3IDvg7Qfm3BJGK2XAIQEYwyUCPyXdyB3o6BUitu/DS ryan@porco" - ]; - }; - - # Install firefox. - programs.firefox.enable = true; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - vim - wget - git - neovim - alacritty - tea - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh = { - enable = true; - settings = { - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - PermitRootLogin = "no"; - AllowUsers = [ "ryan" ]; - }; - }; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "25.11"; # Did you read the comment? - - }; } diff --git a/modules/hosts/fio/default.nix b/modules/hosts/fio/default.nix index 3594f0d..0a3747c 100644 --- a/modules/hosts/fio/default.nix +++ b/modules/hosts/fio/default.nix @@ -1,4 +1,5 @@ -{ self, inputs, ... }: { +{ self, inputs, ... }: +{ flake.nixosConfigurations.fio = inputs.nixpkgs.lib.nixosSystem { modules = [ self.nixosModules.fioConfiguration diff --git a/modules/hosts/fio/hardware.nix b/modules/hosts/fio/hardware.nix index 6889493..cbfabc8 100644 --- a/modules/hosts/fio/hardware.nix +++ b/modules/hosts/fio/hardware.nix @@ -1,32 +1,52 @@ -{ self, inputs, ... }: { +{ self, inputs, ... }: +{ - flake.nixosModules.fioHardware = { config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + flake.nixosModules.fioHardware = + { + config, + lib, + pkgs, + modulesPath, + ... + }: + { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "usb_storage" + "sd_mod" + "rtsx_pci_sdmmc" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/ebb1e88b-3373-4e3c-8297-2d80bd5351a6"; - fsType = "ext4"; + fileSystems."/" = { + device = "/dev/disk/by-uuid/ebb1e88b-3373-4e3c-8297-2d80bd5351a6"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/3779-802B"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { + device = "/dev/disk/by-uuid/812e6cdb-6cfb-402f-9e47-88b2d337c39e"; + } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/3779-802B"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = [ { - device = "/dev/disk/by-uuid/812e6cdb-6cfb-402f-9e47-88b2d337c39e"; - } ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - }; - }