Updated NIX file to nix formatting standard

On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   flake.nix
	modified:   hosts/default/default.nix
	modified:   hosts/default/hardware.nix
	modified:   hosts/default/host-packages.nix
	modified:   hosts/nixstation/default.nix
	modified:   hosts/nixstation/hardware.nix
	modified:   hosts/nixstation/host-packages.nix
	modified:   hosts/zaneyos-oem/default.nix
	modified:   hosts/zaneyos-oem/hardware.nix
	modified:   hosts/zaneyos-oem/host-packages.nix
	modified:   modules/core/default.nix
	modified:   modules/core/flatpak.nix
	modified:   modules/core/greetd.nix
	modified:   modules/core/network.nix
	modified:   modules/core/nfs.nix
	modified:   modules/core/nh.nix
	modified:   modules/core/packages.nix
	modified:   modules/core/printing.nix
	modified:   modules/core/quickshell.nix
	modified:   modules/core/sddm.nix
	modified:   modules/core/services.nix
	modified:   modules/core/starfish.nix
	modified:   modules/core/steam.nix
	modified:   modules/core/stylix.nix
	modified:   modules/core/syncthing.nix
	modified:   modules/core/system.nix
	modified:   modules/core/thunar.nix
	modified:   modules/core/user.nix
	modified:   modules/core/virtualisation.nix
	modified:   modules/core/xserver.nix
	modified:   modules/drivers/amd-drivers.nix
	modified:   modules/drivers/default.nix
	modified:   modules/drivers/intel-drivers.nix
	modified:   modules/drivers/local-hardware-clock.nix
	modified:   modules/drivers/nvidia-drivers.nix
	modified:   modules/drivers/nvidia-prime-drivers.nix
	modified:   modules/drivers/vm-guest-services.nix
	modified:   modules/home/alacritty.nix
	modified:   modules/home/bash.nix
	modified:   modules/home/bashrc-personal.nix
	modified:   modules/home/bat.nix
	modified:   modules/home/bottom.nix
	modified:   modules/home/btop.nix
	modified:   modules/home/cava.nix
	modified:   modules/home/default.nix
	modified:   modules/home/emoji.nix
	modified:   modules/home/evil-helix.nix
	modified:   modules/home/fzf.nix
	modified:   modules/home/ghostty.nix
	modified:   modules/home/git.nix
	modified:   modules/home/htop.nix
	modified:   modules/home/hyprland/animations-def.nix
	modified:   modules/home/hyprland/animations-dynamic.nix
	modified:   modules/home/hyprland/animations-end4.nix
	modified:   modules/home/hyprland/animations-moving.nix
	modified:   modules/home/hyprland/binds.nix
	modified:   modules/home/hyprland/default.nix
	modified:   modules/home/hyprland/env.nix
	modified:   modules/home/hyprland/exec-once.nix
	modified:   modules/home/hyprland/hypridle.nix
	modified:   modules/home/hyprland/hyprland.nix
	modified:   modules/home/hyprland/hyprlock.nix
	modified:   modules/home/hyprland/pyprland.nix
	modified:   modules/home/hyprland/windowrules.nix
	modified:   modules/home/kitty.nix
	modified:   modules/home/lazygit.nix
	modified:   modules/home/nvf.nix
	modified:   modules/home/obs-studio.nix
	modified:   modules/home/qt.nix
	modified:   modules/home/rofi/config-long.nix
	modified:   modules/home/rofi/default.nix
	modified:   modules/home/rofi/rofi.nix
	modified:   modules/home/scripts/default.nix
	modified:   modules/home/scripts/emopicker9000.nix
	modified:   modules/home/scripts/gemini-cli.nix
	modified:   modules/home/scripts/hm-find.nix
	modified:   modules/home/scripts/keybinds.nix
	modified:   modules/home/scripts/rofi-launcher.nix
	modified:   modules/home/scripts/web-search.nix
	modified:   modules/home/scripts/zcli.nix
	modified:   modules/home/starship-ddubs-1.nix
	modified:   modules/home/starship.nix
	modified:   modules/home/swappy.nix
	modified:   modules/home/swaync.nix
	modified:   modules/home/tealdeer.nix
	modified:   modules/home/tmux.nix
	modified:   modules/home/vscode.nix
	modified:   modules/home/waybar/Jerry-waybar.nix
	modified:   modules/home/waybar/waybar-curved.nix
	modified:   modules/home/waybar/waybar-ddubs-2.nix
	modified:   modules/home/waybar/waybar-ddubs.nix
	modified:   modules/home/waybar/waybar-nekodyke.nix
	modified:   modules/home/waybar/waybar-simple.nix
	modified:   modules/home/wezterm.nix
	modified:   modules/home/xdg.nix
	modified:   modules/home/yazi/default.nix
	modified:   modules/home/yazi/keymap.nix
	modified:   modules/home/yazi/theme.nix
	modified:   modules/home/zsh/default.nix
	modified:   modules/home/zsh/zshrc-personal.nix
	modified:   profiles/amd/default.nix
	modified:   profiles/intel/default.nix
	modified:   profiles/nvidia-laptop/default.nix
	modified:   profiles/nvidia/default.nix
	modified:   profiles/vm/default.nix
This commit is contained in:
Don Williams
2025-08-02 11:40:41 -04:00
parent 9b848e5cea
commit 1d1ea88eba
106 changed files with 2704 additions and 2681 deletions

View File

@ -2,8 +2,9 @@
## ZaneyOS v2.3.3 -- Post GA Release Notes
** Updated: July 24th, 2025 **
** Updated: Aug 1st, 2025 **
- Reformatted NIX to NIX formatting standard
- Added `hostID` to `variables.nix` and `network.nix`
- This is needed by ZFS
- Thanks to Daniel Emeery for the patch

View File

@ -21,18 +21,20 @@
};
};
outputs = {
nixpkgs,
home-manager,
nix-flatpak,
quickshell,
...
} @ inputs: let
outputs =
{ nixpkgs
, home-manager
, nix-flatpak
, quickshell
, ...
} @ inputs:
let
system = "x86_64-linux";
host = "zaneyos-oem";
profile = "vm";
username = "dwilliams";
in {
in
{
nixosConfigurations = {
amd = nixpkgs.lib.nixosSystem {
inherit system;

View File

@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
@ -14,14 +15,16 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/dd005850-6230-40c4-9d70-8c8cf443658d";
{
device = "/dev/disk/by-uuid/dd005850-6230-40c4-9d70-8c8cf443658d";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-b7565781-148e-4c94-9c76-36c84dd93dc8".device = "/dev/disk/by-uuid/b7565781-148e-4c94-9c76-36c84dd93dc8";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/C2A6-DF56";
{
device = "/dev/disk/by-uuid/C2A6-DF56";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};

View File

@ -3,6 +3,5 @@
audacity
discord
nodejs
obs-studio
];
}

View File

@ -1,8 +1,7 @@
{
config,
lib,
modulesPath,
...
{ config
, lib
, modulesPath
, ...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")

View File

@ -1,12 +1,11 @@
# 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 + "/profiles/qemu-guest.nix")

View File

@ -8,13 +8,11 @@
gping
lunarvim
luarocks
mc
mission-center
resources
ncdu
gdu
ugrep
waypaper
dysk
];
}

View File

@ -1,11 +1,12 @@
{
inputs,
host,
...
}: let
{ inputs
, host
, ...
}:
let
# Import the host-specific variables.nix
vars = import ../../hosts/${host}/variables.nix;
in {
in
{
imports = [
./boot.nix
./flatpak.nix

View File

@ -1,7 +1,6 @@
{
pkgs,
username,
...
{ pkgs
, username
, ...
}: {
services.greetd = {
enable = true;

View File

@ -1,11 +1,12 @@
{
pkgs,
host,
options,
...
}: let
{ pkgs
, host
, options
, ...
}:
let
inherit (import ../../hosts/${host}/variables.nix) hostId;
in {
in
{
networking = {
hostName = "${host}";
hostId = hostId;

View File

@ -1,6 +1,8 @@
{host, ...}: let
{ host, ... }:
let
inherit (import ../../hosts/${host}/variables.nix) enableNFS;
in {
in
{
services = {
rpcbind.enable = enableNFS;
nfs.server.enable = enableNFS;

View File

@ -1,7 +1,6 @@
{
pkgs,
username,
...
{ pkgs
, username
, ...
}: {
programs.nh = {
enable = true;

View File

@ -40,6 +40,7 @@
cowsay # Great Fun Terminal Program
docker-compose # Allows Controlling Docker From A Single File
duf # Utility For Viewing Disk Usage In Terminal
dysk # Disk space util nice formattting
eza # Beautiful ls Replacement
ffmpeg # Terminal Video / Audio Editing
file-roller # Archive Manager

View File

@ -1,6 +1,8 @@
{host, ...}: let
{ host, ... }:
let
inherit (import ../../hosts/${host}/variables.nix) printEnable;
in {
in
{
services = {
printing = {
enable = printEnable;

View File

@ -63,7 +63,4 @@ in {
};
environment.systemPackages = [sddm-astronaut];
# To prevent getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
}

View File

@ -1,10 +1,11 @@
{
pkgs,
host,
...
}: let
{ pkgs
, host
, ...
}:
let
inherit (import ../../hosts/${host}/variables.nix) stylixImage;
in {
in
{
# Styling Options
stylix = {
enable = true;

View File

@ -1,6 +1,8 @@
{host, ...}: let
{ host, ... }:
let
inherit (import ../../hosts/${host}/variables.nix) consoleKeyMap;
in {
in
{
nix = {
settings = {
download-buffer-size = 250000000;

View File

@ -1,10 +1,11 @@
{
host,
pkgs,
...
}: let
{ host
, pkgs
, ...
}:
let
inherit (import ../../hosts/${host}/variables.nix) thunarEnable;
in {
in
{
programs = {
thunar = {
enable = thunarEnable;

View File

@ -1,13 +1,14 @@
{
pkgs,
inputs,
username,
host,
profile,
...
}: let
{ pkgs
, inputs
, username
, host
, profile
, ...
}:
let
inherit (import ../../hosts/${host}/variables.nix) gitUsername;
in {
in
{
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = {
useUserPackages = true;

View File

@ -1,6 +1,8 @@
{host, ...}: let
{ host, ... }:
let
inherit (import ../../hosts/${host}/variables.nix) keyboardLayout;
in {
in
{
services.xserver = {
enable = false;
xkb = {

View File

@ -1,8 +1,7 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib;
let

View File

@ -1,5 +1,4 @@
{
...
{ ...
}:
{
imports = [

View File

@ -1,12 +1,12 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config.drivers.intel;
in {
in
{
options.drivers.intel = {
enable = mkEnableOption "Enable Intel Graphics Drivers";
};

View File

@ -1,8 +1,7 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib;
let

View File

@ -1,8 +1,7 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib;
let

View File

@ -1,8 +1,7 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib;
let

View File

@ -1,8 +1,7 @@
{
lib,
pkgs,
config,
...
{ lib
, pkgs
, config
, ...
}:
with lib;
let

View File

@ -1,7 +1,9 @@
{ lib, ... }: {
programs.alacritty = let
programs.alacritty =
let
font_family = lib.mkForce "Maple Mono NF";
in {
in
{
enable = true;
settings = {
font = {

View File

@ -1,4 +1,3 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ bash ];

View File

@ -1,7 +1,6 @@
{
pkgs,
lib,
...
{ pkgs
, lib
, ...
}: {
programs.bat = {
enable = true;

View File

@ -1,4 +1,5 @@
{host, ...}: let
{ host, ... }:
let
inherit
(import ../../hosts/${host}/variables.nix)
alacrittyEnable
@ -9,7 +10,8 @@
vscodeEnable
helixEnable
;
in {
in
{
imports =
[
./amfora.nix

View File

@ -1,6 +1,8 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
enableEvilHelix = true; # Set to true to enable the configuration
in {
in
{
home.packages = with pkgs; (
if enableEvilHelix
then [

View File

@ -1,13 +1,14 @@
# Fzf is a general-purpose command-line fuzzy finder.
{
config,
lib,
...
}: let
{ config
, lib
, ...
}:
let
accent = "#" + config.lib.stylix.colors.base0D;
foreground = "#" + config.lib.stylix.colors.base05;
muted = "#" + config.lib.stylix.colors.base03;
in {
in
{
programs.fzf = {
enable = true;
enableZshIntegration = true;

View File

@ -1,4 +1,5 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
# A recent issue 7/7/2025 w/ghostty causes it to hang or respond slowly
# This is a workaround until a fix is released
myGhostty = pkgs.ghostty.overrideAttrs (_: {
@ -8,7 +9,8 @@
shopt -u globstar
'';
});
in {
in
{
programs.ghostty = {
enable = true;
package = myGhostty; # to fix a but in current builds of ghostty

View File

@ -1,6 +1,8 @@
{host, ...}: let
{ host, ... }:
let
inherit (import ../../hosts/${host}/variables.nix) gitUsername gitEmail;
in {
in
{
programs.git = {
enable = true;
userName = "${gitUsername}";

View File

@ -1,10 +1,12 @@
{host, ...}: let
{ host, ... }:
let
inherit
(import ../../../hosts/${host}/variables.nix)
browser
terminal
;
in {
in
{
wayland.windowManager.hyprland.settings = {
bind = [
"$modifier,Return,exec,${terminal}"

View File

@ -1,6 +1,8 @@
{host, ...}: let
{ host, ... }:
let
inherit (import ../../../hosts/${host}/variables.nix) animChoice;
in {
in
{
imports = [
animChoice
./binds.nix

View File

@ -1,9 +1,11 @@
{host, ...}: let
{ host, ... }:
let
inherit
(import ../../../hosts/${host}/variables.nix)
stylixImage
;
in {
in
{
wayland.windowManager.hyprland.settings = {
exec-once = [
"wl-paste --type text --watch cliphist store" # Saves text

View File

@ -1,16 +1,17 @@
{
host,
config,
pkgs,
...
}: let
{ host
, config
, pkgs
, ...
}:
let
inherit
(import ../../../hosts/${host}/variables.nix)
extraMonitorSettings
keyboardLayout
stylixImage
;
in {
in
{
home.packages = with pkgs; [
swww
grim

View File

@ -1,9 +1,11 @@
{host, ...}: let
{ host, ... }:
let
inherit
(import ../../../hosts/${host}/variables.nix)
extraMonitorSettings
;
in {
in
{
wayland.windowManager.hyprland = {
settings = {
windowrule = [

View File

@ -3,7 +3,8 @@
let
accent = "#${config.lib.stylix.colors.base0D}";
muted = "#${config.lib.stylix.colors.base03}";
in {
in
{
programs.lazygit = {
enable = true;
settings = lib.mkForce {

View File

@ -1,7 +1,6 @@
{
inputs,
config,
...
{ inputs
, config
, ...
}: {
imports = [ inputs.nvf.homeManagerModules.default ];

View File

@ -1,7 +1,6 @@
{
pkgs,
config,
...
{ pkgs
, config
, ...
}: {
programs = {
rofi = {
@ -17,9 +16,11 @@
display-run = " Run";
display-filebrowser = " File";
};
theme = let
theme =
let
inherit (config.lib.formats.rasi) mkLiteral;
in {
in
{
"*" = {
bg = mkLiteral "#${config.stylix.base16Scheme.base00}";
bg-alt = mkLiteral "#${config.stylix.base16Scheme.base09}";

View File

@ -1,8 +1,7 @@
{
pkgs,
username,
profile,
...
{ pkgs
, username
, profile
, ...
}: {
home.packages = [
(import ./emopicker9000.nix { inherit pkgs; })

View File

@ -1,9 +1,9 @@
{
pkgs,
profile,
backupFiles ? [".config/mimeapps.list.backup"],
...
}: let
{ pkgs
, profile
, backupFiles ? [ ".config/mimeapps.list.backup" ]
, ...
}:
let
backupFilesString = pkgs.lib.strings.concatStringsSep " " backupFiles;
in
pkgs.writeShellScriptBin "zcli" ''

View File

@ -1,12 +1,13 @@
# starship is a minimal, fast, and extremely customizable prompt for any shell!
{
config,
lib,
...
}: let
{ config
, lib
, ...
}:
let
accent = "#${config.lib.stylix.colors.base0D}";
background-alt = "#${config.lib.stylix.colors.base01}";
in {
in
{
programs.starship = {
enable = false;
settings = {

View File

@ -1,9 +1,9 @@
{
pkgs,
config,
lib,
...
}: let
{ pkgs
, config
, lib
, ...
}:
let
terminal = "kitty";
base00 = "0F1419";
base01 = "131721";

View File

@ -1,10 +1,10 @@
{
pkgs,
lib,
host,
config,
...
}: let
{ pkgs
, lib
, host
, config
, ...
}:
let
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in

View File

@ -1,9 +1,9 @@
{
pkgs,
config,
lib,
...
}: let
{ pkgs
, config
, lib
, ...
}:
let
terminal = "kitty";
base00 = "0F1419";
base01 = "131721";

View File

@ -1,10 +1,10 @@
{
pkgs,
lib,
host,
config,
...
}: let
{ pkgs
, lib
, host
, config
, ...
}:
let
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in

View File

@ -1,10 +1,10 @@
{
pkgs,
lib,
host,
config,
...
}: let
{ pkgs
, lib
, host
, config
, ...
}:
let
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in

View File

@ -1,10 +1,10 @@
{
pkgs,
lib,
host,
config,
...
}: let
{ pkgs
, lib
, host
, config
, ...
}:
let
inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in
with lib; {

View File

@ -1,8 +1,10 @@
{pkgs, ...}: let
{ pkgs, ... }:
let
settings = import ./yazi.nix;
keymap = import ./keymap.nix;
theme = import ./theme.nix;
in {
in
{
programs.yazi = {
enable = true;
enableZshIntegration = true;

View File

@ -27,10 +27,8 @@
fg = "blue";
bold = true;
};
content = {
};
list = {
};
content = { };
list = { };
btn_yes = {
bg = "green";
fg = "black";
@ -64,8 +62,7 @@
input = { };
cmp = {
active = { reversed = true; };
inactive = {
};
inactive = { };
icon_file = "";
icon_folder = "";
icon_command = "";

View File

@ -1,8 +1,7 @@
{
profile,
pkgs,
lib,
...
{ profile
, pkgs
, lib
, ...
}: {
imports = [
./zshrc-personal.nix

View File

@ -1,6 +1,8 @@
{host, ...}: let
{ host, ... }:
let
inherit (import ../../hosts/${host}/variables.nix) intelID nvidiaID;
in {
in
{
imports = [
../../hosts/${host}
../../modules/drivers