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 ## 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` - Added `hostID` to `variables.nix` and `network.nix`
- This is needed by ZFS - This is needed by ZFS
- Thanks to Daniel Emeery for the patch - Thanks to Daniel Emeery for the patch

View File

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

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
imports = [ imports = [
./hardware.nix ./hardware.nix
./host-packages.nix ./host-packages.nix

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
imports = [ imports = [
./hardware.nix ./hardware.nix
./host-packages.nix ./host-packages.nix

View File

@ -1,8 +1,7 @@
{ { config
config, , lib
lib, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
@ -17,13 +16,13 @@
"usbhid" "usbhid"
"sd_mod" "sd_mod"
]; ];
kernelModules = []; kernelModules = [ ];
luks.devices = { luks.devices = {
"luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f"; "luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f";
}; };
}; };
kernelModules = ["kvm-intel"]; kernelModules = [ "kvm-intel" ];
extraModulePackages = []; extraModulePackages = [ ];
}; };
fileSystems = { fileSystems = {
"/" = { "/" = {
@ -52,7 +51,7 @@
]; ];
}; };
}; };
swapDevices = []; swapDevices = [ ];
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
audacity audacity
discord discord

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
imports = [ imports = [
./hardware.nix ./hardware.nix
./host-packages.nix ./host-packages.nix

View File

@ -1,21 +1,20 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config
config, , lib
lib, , pkgs
pkgs, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [ ];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = []; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6"; device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6";
@ -25,7 +24,7 @@
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/9287-3738"; device = "/dev/disk/by-uuid/9287-3738";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0077" "dmask=0077"]; options = [ "fmask=0077" "dmask=0077" ];
}; };
fileSystems."/mnt/nas" = { fileSystems."/mnt/nas" = {
@ -34,7 +33,7 @@
}; };
swapDevices = [ swapDevices = [
{device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087";} { device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View File

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

View File

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

View File

@ -1,8 +1,8 @@
{pkgs, ...}: { { pkgs, ... }: {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
extraPortals = [pkgs.xdg-desktop-portal-hyprland]; extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
configPackages = [pkgs.hyprland]; configPackages = [ pkgs.hyprland ];
}; };
services = { services = {
flatpak = { flatpak = {

View File

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

View File

@ -1,16 +1,17 @@
{ { pkgs
pkgs, , host
host, , options
options, , ...
... }:
}: let let
inherit (import ../../hosts/${host}/variables.nix) hostId; inherit (import ../../hosts/${host}/variables.nix) hostId;
in { in
{
networking = { networking = {
hostName = "${host}"; hostName = "${host}";
hostId = hostId; hostId = hostId;
networkmanager.enable = true; networkmanager.enable = true;
timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"]; timeServers = options.networking.timeServers.default ++ [ "pool.ntp.org" ];
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ allowedTCPPorts = [
@ -28,5 +29,5 @@ in {
}; };
}; };
environment.systemPackages = with pkgs; [networkmanagerapplet]; environment.systemPackages = with pkgs; [ networkmanagerapplet ];
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{profile, ...}: { { profile, ... }: {
# Services to start # Services to start
services = { services = {
libinput.enable = true; # Input Handling libinput.enable = true; # Input Handling
@ -11,7 +11,7 @@
PasswordAuthentication = true; #Users can SSH using kb and password PasswordAuthentication = true; #Users can SSH using kb and password
KbdInteractiveAuthentication = true; KbdInteractiveAuthentication = true;
}; };
ports = [22]; ports = [ 22 ];
}; };
blueman.enable = true; # Bluetooth Support blueman.enable = true; # Bluetooth Support
tumbler.enable = true; # Image/video preview tumbler.enable = true; # Image/video preview

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
programs = { programs = {
starship = { starship = {
enable = false; enable = false;

View File

@ -1,11 +1,11 @@
{pkgs, ...}: { { pkgs, ... }: {
programs = { programs = {
steam = { steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = false; dedicatedServer.openFirewall = false;
gamescopeSession.enable = true; gamescopeSession.enable = true;
extraCompatPackages = [pkgs.proton-ge-bin]; extraCompatPackages = [ pkgs.proton-ge-bin ];
}; };
gamescope = { gamescope = {

View File

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

View File

@ -1,4 +1,4 @@
{username, ...}: { { username, ... }: {
services.syncthing = { services.syncthing = {
enable = false; enable = false;
user = "${username}"; user = "${username}";

View File

@ -1,6 +1,8 @@
{host, ...}: let { host, ... }:
let
inherit (import ../../hosts/${host}/variables.nix) consoleKeyMap; inherit (import ../../hosts/${host}/variables.nix) consoleKeyMap;
in { in
{
nix = { nix = {
settings = { settings = {
download-buffer-size = 250000000; download-buffer-size = 250000000;
@ -9,8 +11,8 @@ in {
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
substituters = ["https://hyprland.cachix.org"]; substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
}; };
}; };
time.timeZone = "America/Chicago"; time.timeZone = "America/Chicago";

View File

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

View File

@ -1,21 +1,22 @@
{ { pkgs
pkgs, , inputs
inputs, , username
username, , host
host, , profile
profile, , ...
... }:
}: let let
inherit (import ../../hosts/${host}/variables.nix) gitUsername; inherit (import ../../hosts/${host}/variables.nix) gitUsername;
in { in
imports = [inputs.home-manager.nixosModules.home-manager]; {
imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = false; useGlobalPkgs = false;
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = {inherit inputs username host profile;}; extraSpecialArgs = { inherit inputs username host profile; };
users.${username} = { users.${username} = {
imports = [./../home]; imports = [ ./../home ];
home = { home = {
username = "${username}"; username = "${username}";
homeDirectory = "/home/${username}"; homeDirectory = "/home/${username}";
@ -40,5 +41,5 @@ in {
shell = pkgs.zsh; shell = pkgs.zsh;
ignoreShellProgramCheck = true; ignoreShellProgramCheck = true;
}; };
nix.settings.allowed-users = ["${username}"]; nix.settings.allowed-users = [ "${username}" ];
} }

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
# Only enable either docker or podman -- Not both # Only enable either docker or podman -- Not both
virtualisation = { virtualisation = {
docker = { docker = {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{profile, ...}: { { profile, ... }: {
programs.bash = { programs.bash = {
enable = false; enable = false;
enableCompletion = true; enableCompletion = true;

View File

@ -1,6 +1,5 @@
{ pkgs, ... }: {
{pkgs, ...}: { home.packages = with pkgs; [ bash ];
home.packages = with pkgs; [bash];
home.file."./.bashrc-personal".text = '' home.file."./.bashrc-personal".text = ''

View File

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

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
programs.bottom = { programs.bottom = {
enable = true; enable = true;
settings = { settings = {
@ -9,14 +9,14 @@
{ {
ratio = 2; ratio = 2;
child = [ child = [
{type = "cpu";} { type = "cpu"; }
{type = "temp";} { type = "temp"; }
]; ];
} }
{ {
ratio = 2; ratio = 2;
child = [ child = [
{type = "network";} { type = "network"; }
]; ];
} }
{ {

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.btop = { programs.btop = {
enable = true; enable = true;
package = pkgs.btop.override { package = pkgs.btop.override {

View File

@ -1,4 +1,4 @@
{config, ...}: { { config, ... }: {
programs.cava = { programs.cava = {
enable = true; enable = true;
settings = { settings = {

View File

@ -1,4 +1,5 @@
{host, ...}: let { host, ... }:
let
inherit inherit
(import ../../hosts/${host}/variables.nix) (import ../../hosts/${host}/variables.nix)
alacrittyEnable alacrittyEnable
@ -9,7 +10,8 @@
vscodeEnable vscodeEnable
helixEnable helixEnable
; ;
in { in
{
imports = imports =
[ [
./amfora.nix ./amfora.nix
@ -53,32 +55,32 @@ in {
] ]
++ ( ++ (
if helixEnable if helixEnable
then [./evil-helix.nix] then [ ./evil-helix.nix ]
else [] else [ ]
) )
++ ( ++ (
if vscodeEnable if vscodeEnable
then [./vscode.nix] then [ ./vscode.nix ]
else [] else [ ]
) )
++ ( ++ (
if weztermEnable if weztermEnable
then [./wezterm.nix] then [ ./wezterm.nix ]
else [] else [ ]
) )
++ ( ++ (
if ghosttyEnable if ghosttyEnable
then [./ghostty.nix] then [ ./ghostty.nix ]
else [] else [ ]
) )
++ ( ++ (
if tmuxEnable if tmuxEnable
then [./tmux.nix] then [ ./tmux.nix ]
else [] else [ ]
) )
++ ( ++ (
if alacrittyEnable if alacrittyEnable
then [./alacritty.nix] then [ ./alacritty.nix ]
else [] else [ ]
); );
} }

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
home.file.".config/.emoji".text = '' home.file.".config/.emoji".text = ''
😀 grinning face face smile happy joy :D grin 😀 grinning face face smile happy joy :D grin
😃 grinning face with big eyes face happy joy haha :D :) smile funny 😃 grinning face with big eyes face happy joy haha :D :) smile funny

View File

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
enableEvilHelix = true; # Set to true to enable the configuration enableEvilHelix = true; # Set to true to enable the configuration
in { in
{
home.packages = with pkgs; ( home.packages = with pkgs; (
if enableEvilHelix if enableEvilHelix
then [ then [
@ -23,7 +25,7 @@ in {
docker-language-server docker-language-server
typescript-language-server typescript-language-server
] ]
else [] else [ ]
); );
home.file.".config/helix/languages.toml".text = home.file.".config/helix/languages.toml".text =

View File

@ -1,13 +1,14 @@
# Fzf is a general-purpose command-line fuzzy finder. # Fzf is a general-purpose command-line fuzzy finder.
{ { config
config, , lib
lib, , ...
... }:
}: let let
accent = "#" + config.lib.stylix.colors.base0D; accent = "#" + config.lib.stylix.colors.base0D;
foreground = "#" + config.lib.stylix.colors.base05; foreground = "#" + config.lib.stylix.colors.base05;
muted = "#" + config.lib.stylix.colors.base03; muted = "#" + config.lib.stylix.colors.base03;
in { in
{
programs.fzf = { programs.fzf = {
enable = true; enable = true;
enableZshIntegration = 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 # A recent issue 7/7/2025 w/ghostty causes it to hang or respond slowly
# This is a workaround until a fix is released # This is a workaround until a fix is released
myGhostty = pkgs.ghostty.overrideAttrs (_: { myGhostty = pkgs.ghostty.overrideAttrs (_: {
@ -8,7 +9,8 @@
shopt -u globstar shopt -u globstar
''; '';
}); });
in { in
{
programs.ghostty = { programs.ghostty = {
enable = true; enable = true;
package = myGhostty; # to fix a but in current builds of ghostty 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; inherit (import ../../hosts/${host}/variables.nix) gitUsername gitEmail;
in { in
{
programs.git = { programs.git = {
enable = true; enable = true;
userName = "${gitUsername}"; userName = "${gitUsername}";

View File

@ -1,4 +1,4 @@
{config, ...}: { { config, ... }: {
programs.htop = { programs.htop = {
enable = true; enable = true;
settings = settings =

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
animations = { animations = {
enabled = true; enabled = true;

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
# name "Dynamic" # name "Dynamic"
# credit https://github.com/mylinuxforwork/dotfiles # credit https://github.com/mylinuxforwork/dotfiles

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
# Name: END-4 # Name: END-4
# Credit: END-4 project https://github.com/end-4/dots-hyprland # Credit: END-4 project https://github.com/end-4/dots-hyprland

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
# name "moving" # name "moving"
# credit https://github.com/mylinuxforwork/dotfiles # credit https://github.com/mylinuxforwork/dotfiles

View File

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

View File

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

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
env = [ env = [

View File

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

View File

@ -1,16 +1,17 @@
{ { host
host, , config
config, , pkgs
pkgs, , ...
... }:
}: let let
inherit inherit
(import ../../../hosts/${host}/variables.nix) (import ../../../hosts/${host}/variables.nix)
extraMonitorSettings extraMonitorSettings
keyboardLayout keyboardLayout
stylixImage stylixImage
; ;
in { in
{
home.packages = with pkgs; [ home.packages = with pkgs; [
swww swww
grim grim
@ -39,7 +40,7 @@ in {
systemd = { systemd = {
enable = true; enable = true;
enableXdgAutostart = true; enableXdgAutostart = true;
variables = ["--all"]; variables = [ "--all" ];
}; };
xwayland = { xwayland = {
enable = true; enable = true;

View File

@ -1,4 +1,4 @@
{username, ...}: { { username, ... }: {
programs.hyprlock = { programs.hyprlock = {
enable = true; enable = true;
settings = { settings = {

View File

@ -1,5 +1,5 @@
{pkgs, ...}: { { pkgs, ... }: {
home.packages = with pkgs; [pyprland]; home.packages = with pkgs; [ pyprland ];
home.file.".config/hypr/pyprland.toml".text = '' home.file.".config/hypr/pyprland.toml".text = ''
[pyprland] [pyprland]

View File

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

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
package = pkgs.kitty; package = pkgs.kitty;

View File

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

View File

@ -1,9 +1,8 @@
{ { inputs
inputs, , config
config, , ...
...
}: { }: {
imports = [inputs.nvf.homeManagerModules.default]; imports = [ inputs.nvf.homeManagerModules.default ];
programs.nvf = { programs.nvf = {
enable = true; enable = true;
@ -51,55 +50,55 @@
keymaps = [ keymaps = [
{ {
key = "jk"; key = "jk";
mode = ["i"]; mode = [ "i" ];
action = "<ESC>"; action = "<ESC>";
desc = "Exit insert mode"; desc = "Exit insert mode";
} }
{ {
key = "<leader>nh"; key = "<leader>nh";
mode = ["n"]; mode = [ "n" ];
action = ":nohl<CR>"; action = ":nohl<CR>";
desc = "Clear search highlights"; desc = "Clear search highlights";
} }
{ {
key = "<leader>ff"; key = "<leader>ff";
mode = ["n"]; mode = [ "n" ];
action = "<cmd>Telescope find_files<cr>"; action = "<cmd>Telescope find_files<cr>";
desc = "Search files by name"; desc = "Search files by name";
} }
{ {
key = "<leader>lg"; key = "<leader>lg";
mode = ["n"]; mode = [ "n" ];
action = "<cmd>Telescope live_grep<cr>"; action = "<cmd>Telescope live_grep<cr>";
desc = "Search files by contents"; desc = "Search files by contents";
} }
{ {
key = "<leader>fe"; key = "<leader>fe";
mode = ["n"]; mode = [ "n" ];
action = "<cmd>Neotree toggle<cr>"; action = "<cmd>Neotree toggle<cr>";
desc = "File browser toggle"; desc = "File browser toggle";
} }
{ {
key = "<C-h>"; key = "<C-h>";
mode = ["i"]; mode = [ "i" ];
action = "<Left>"; action = "<Left>";
desc = "Move left in insert mode"; desc = "Move left in insert mode";
} }
{ {
key = "<C-j>"; key = "<C-j>";
mode = ["i"]; mode = [ "i" ];
action = "<Down>"; action = "<Down>";
desc = "Move down in insert mode"; desc = "Move down in insert mode";
} }
{ {
key = "<C-k>"; key = "<C-k>";
mode = ["i"]; mode = [ "i" ];
action = "<Up>"; action = "<Up>";
desc = "Move up in insert mode"; desc = "Move up in insert mode";
} }
{ {
key = "<C-l>"; key = "<C-l>";
mode = ["i"]; mode = [ "i" ];
action = "<Right>"; action = "<Right>";
desc = "Move right in insert mode"; desc = "Move right in insert mode";
} }
@ -109,7 +108,7 @@
spellcheck = { spellcheck = {
enable = true; enable = true;
languages = ["en"]; languages = [ "en" ];
programmingWordlist.enable = false; programmingWordlist.enable = false;
}; };

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.obs-studio = { programs.obs-studio = {
enable = true; enable = true;
#enableVirtualCamera = true; #enableVirtualCamera = true;

View File

@ -1,4 +1,4 @@
{lib, ...}: { { lib, ... }: {
qt = { qt = {
enable = true; enable = true;
platformTheme.name = lib.mkForce "qtct"; platformTheme.name = lib.mkForce "qtct";

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
home.file.".config/rofi/config-long.rasi".text = '' home.file.".config/rofi/config-long.rasi".text = ''
@import "~/.config/rofi/config.rasi" @import "~/.config/rofi/config.rasi"
window { window {

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
imports = [ imports = [
./config-long.nix ./config-long.nix
./rofi.nix ./rofi.nix

View File

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

View File

@ -1,23 +1,22 @@
{ { pkgs
pkgs, , username
username, , profile
profile, , ...
...
}: { }: {
home.packages = [ home.packages = [
(import ./emopicker9000.nix {inherit pkgs;}) (import ./emopicker9000.nix { inherit pkgs; })
(import ./keybinds.nix {inherit pkgs;}) (import ./keybinds.nix { inherit pkgs; })
(import ./task-waybar.nix {inherit pkgs;}) (import ./task-waybar.nix { inherit pkgs; })
(import ./squirtle.nix {inherit pkgs;}) (import ./squirtle.nix { inherit pkgs; })
(import ./nvidia-offload.nix {inherit pkgs;}) (import ./nvidia-offload.nix { inherit pkgs; })
(import ./wallsetter.nix { (import ./wallsetter.nix {
inherit pkgs; inherit pkgs;
inherit username; inherit username;
}) })
(import ./web-search.nix {inherit pkgs;}) (import ./web-search.nix { inherit pkgs; })
(import ./rofi-launcher.nix {inherit pkgs;}) (import ./rofi-launcher.nix { inherit pkgs; })
(import ./screenshootin.nix {inherit pkgs;}) (import ./screenshootin.nix { inherit pkgs; })
(import ./hm-find.nix {inherit pkgs;}) (import ./hm-find.nix { inherit pkgs; })
(import ./zcli.nix { (import ./zcli.nix {
inherit pkgs profile; inherit pkgs profile;
backupFiles = [ backupFiles = [

View File

@ -1,4 +1,4 @@
{pkgs}: { pkgs }:
pkgs.writeShellScriptBin "emopicker9000" '' pkgs.writeShellScriptBin "emopicker9000" ''
# check if rofi is already running # check if rofi is already running
if pidof rofi > /dev/null; then if pidof rofi > /dev/null; then

View File

@ -1,4 +1,4 @@
{pkgs}: { pkgs }:
pkgs.writeShellScriptBin "hm-find" '' pkgs.writeShellScriptBin "hm-find" ''
#!/usr/bin/env bash #!/usr/bin/env bash

View File

@ -1,4 +1,4 @@
{pkgs}: { pkgs }:
pkgs.writeShellScriptBin "list-keybinds" '' pkgs.writeShellScriptBin "list-keybinds" ''
# check if rofi is already running # check if rofi is already running
if pidof rofi > /dev/null; then if pidof rofi > /dev/null; then

View File

@ -1,4 +1,4 @@
{pkgs}: { pkgs }:
pkgs.writeShellScriptBin "rofi-launcher" '' pkgs.writeShellScriptBin "rofi-launcher" ''
# check if rofi is already running # check if rofi is already running
if pidof rofi > /dev/null; then if pidof rofi > /dev/null; then

View File

@ -1,4 +1,4 @@
{pkgs}: { pkgs }:
pkgs.writeShellScriptBin "web-search" '' pkgs.writeShellScriptBin "web-search" ''
# check if rofi is already running # check if rofi is already running
if pidof rofi > /dev/null; then if pidof rofi > /dev/null; then

View File

@ -1,12 +1,12 @@
{ { pkgs
pkgs, , profile
profile, , backupFiles ? [ ".config/mimeapps.list.backup" ]
backupFiles ? [".config/mimeapps.list.backup"], , ...
... }:
}: let let
backupFilesString = pkgs.lib.strings.concatStringsSep " " backupFiles; backupFilesString = pkgs.lib.strings.concatStringsSep " " backupFiles;
in in
pkgs.writeShellScriptBin "zcli" '' pkgs.writeShellScriptBin "zcli" ''
#!${pkgs.bash}/bin/bash #!${pkgs.bash}/bin/bash
set -euo pipefail set -euo pipefail
@ -310,4 +310,4 @@ in
exit 1 exit 1
;; ;;
esac esac
'' ''

View File

@ -1,12 +1,13 @@
# starship is a minimal, fast, and extremely customizable prompt for any shell! # starship is a minimal, fast, and extremely customizable prompt for any shell!
{ { config
config, , lib
lib, , ...
... }:
}: let let
accent = "#${config.lib.stylix.colors.base0D}"; accent = "#${config.lib.stylix.colors.base0D}";
background-alt = "#${config.lib.stylix.colors.base01}"; background-alt = "#${config.lib.stylix.colors.base01}";
in { in
{
programs.starship = { programs.starship = {
enable = false; enable = false;
settings = { settings = {
@ -21,7 +22,7 @@ in {
"\n" "\n"
"$character" "$character"
]; ];
directory = {style = accent;}; directory = { style = accent; };
character = { character = {
success_symbol = "[](${accent})"; success_symbol = "[](${accent})";

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.starship = { programs.starship = {
enable = false; enable = false;
package = pkgs.starship; package = pkgs.starship;

View File

@ -1,4 +1,4 @@
{username, ...}: { { username, ... }: {
home.file = { home.file = {
".config/swappy/config".text = '' ".config/swappy/config".text = ''
[Default] [Default]

View File

@ -1,4 +1,4 @@
{config, ...}: { { config, ... }: {
services.swaync = { services.swaync = {
enable = true; enable = true;
settings = { settings = {

View File

@ -1,4 +1,4 @@
{...}: { { ... }: {
programs.tealdeer = { programs.tealdeer = {
enable = true; enable = true;
settings = { settings = {

View File

@ -1,5 +1,5 @@
# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window. # Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
{pkgs, ...}: { { pkgs, ... }: {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
mouse = true; mouse = true;

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
programs.vscode = { programs.vscode = {

View File

@ -1,9 +1,9 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
... }:
}: let let
terminal = "kitty"; terminal = "kitty";
base00 = "0F1419"; base00 = "0F1419";
base01 = "131721"; base01 = "131721";
@ -20,7 +20,7 @@
base0E = "D2A6FF"; base0E = "D2A6FF";
base0F = "E6B673"; base0F = "E6B673";
in in
with lib; { with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -30,9 +30,9 @@ in
layer = "top"; layer = "top";
position = "top"; position = "top";
modules-center = ["network" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock"]; # Eterna: [ "hyprland/window" ] modules-center = [ "network" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock" ]; # Eterna: [ "hyprland/window" ]
modules-left = ["custom/startmenu" "hyprland/window"]; # Eternal: [ "hyprland/workspaces" "cpu" "memory" "network" ] modules-left = [ "custom/startmenu" "hyprland/window" ]; # Eternal: [ "hyprland/workspaces" "cpu" "memory" "network" ]
modules-right = ["tray" "idle_inhibitor" "custom/notification" "battery" "custom/exit"]; # Eternal: [ "idle_inhibitor" "pulseaudio" "clock" "custom/notification" "tray" ] modules-right = [ "tray" "idle_inhibitor" "custom/notification" "battery" "custom/exit" ]; # Eternal: [ "idle_inhibitor" "pulseaudio" "clock" "custom/notification" "tray" ]
"hyprland/workspaces" = { "hyprland/workspaces" = {
format = "{name}"; format = "{name}";
@ -75,7 +75,7 @@ in
#on-click = "${terminal} -e sh -c df -h ; read"; #on-click = "${terminal} -e sh -c df -h ; read";
}; };
"network" = { "network" = {
format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"]; format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
format-ethernet = " {bandwidthDownBits}"; format-ethernet = " {bandwidthDownBits}";
format-wifi = " {bandwidthDownBits}"; format-wifi = " {bandwidthDownBits}";
format-disconnected = "󰤮"; format-disconnected = "󰤮";
@ -99,7 +99,7 @@ in
phone = ""; phone = "";
portable = ""; portable = "";
car = ""; car = "";
default = ["" "" ""]; default = [ "" "" "" ];
}; };
on-click = "pavucontrol"; on-click = "pavucontrol";
}; };
@ -149,7 +149,7 @@ in
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-charging = "󰂄 {capacity}%"; format-charging = "󰂄 {capacity}%";
format-plugged = "󱘖 {capacity}%"; format-plugged = "󱘖 {capacity}%";
format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; format-icons = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
on-click = ""; on-click = "";
tooltip = false; tooltip = false;
}; };
@ -353,4 +353,4 @@ in
'' ''
]; ];
}; };
} }

View File

@ -1,14 +1,14 @@
{ { pkgs
pkgs, , lib
lib, , host
host, , config
config, , ...
... }:
}: let let
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
inherit (import ../../../hosts/${host}/variables.nix) clock24h; inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in in
with lib; { with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -17,7 +17,7 @@ in
{ {
layer = "top"; layer = "top";
position = "top"; position = "top";
modules-center = ["hyprland/workspaces"]; modules-center = [ "hyprland/workspaces" ];
modules-left = [ modules-left = [
"custom/startmenu" "custom/startmenu"
"hyprland/window" "hyprland/window"
@ -274,4 +274,4 @@ in
'' ''
]; ];
}; };
} }

View File

@ -1,9 +1,9 @@
{ { pkgs
pkgs, , config
config, , lib
lib, , ...
... }:
}: let let
terminal = "kitty"; terminal = "kitty";
base00 = "0F1419"; base00 = "0F1419";
base01 = "131721"; base01 = "131721";
@ -20,7 +20,7 @@
base0E = "D2A6FF"; base0E = "D2A6FF";
base0F = "E6B673"; base0F = "E6B673";
in in
with lib; { with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -30,9 +30,9 @@ in
layer = "top"; layer = "top";
position = "top"; position = "top";
modules-left = ["custom/startmenu" "tray" "hyprland/window"]; modules-left = [ "custom/startmenu" "tray" "hyprland/window" ];
modules-center = ["hyprland/workspaces"]; modules-center = [ "hyprland/workspaces" ];
modules-right = ["idle_inhibitor" "custom/notification" "pulseaudio" "battery" "clock" "custom/exit"]; modules-right = [ "idle_inhibitor" "custom/notification" "pulseaudio" "battery" "clock" "custom/exit" ];
"hyprland/workspaces" = { "hyprland/workspaces" = {
format = "{name}"; format = "{name}";
@ -75,7 +75,7 @@ in
#on-click = "${terminal} -e sh -c df -h ; read"; #on-click = "${terminal} -e sh -c df -h ; read";
}; };
"network" = { "network" = {
format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"]; format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
format-ethernet = " {bandwidthDownBits}"; format-ethernet = " {bandwidthDownBits}";
format-wifi = " {bandwidthDownBits}"; format-wifi = " {bandwidthDownBits}";
format-disconnected = "󰤮"; format-disconnected = "󰤮";
@ -99,7 +99,7 @@ in
phone = ""; phone = "";
portable = ""; portable = "";
car = ""; car = "";
default = ["" "" ""]; default = [ "" "" "" ];
}; };
on-click = "pavucontrol"; on-click = "pavucontrol";
}; };
@ -149,7 +149,7 @@ in
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-charging = "󰂄 {capacity}%"; format-charging = "󰂄 {capacity}%";
format-plugged = "󱘖 {capacity}%"; format-plugged = "󱘖 {capacity}%";
format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; format-icons = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
on-click = ""; on-click = "";
tooltip = false; tooltip = false;
}; };
@ -353,4 +353,4 @@ in
'' ''
]; ];
}; };
} }

View File

@ -1,14 +1,14 @@
{ { pkgs
pkgs, , lib
lib, , host
host, , config
config, , ...
... }:
}: let let
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
inherit (import ../../../hosts/${host}/variables.nix) clock24h; inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in in
with lib; { with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -17,7 +17,7 @@ in
{ {
layer = "top"; layer = "top";
position = "top"; position = "top";
modules-center = ["hyprland/workspaces"]; modules-center = [ "hyprland/workspaces" ];
modules-left = [ modules-left = [
"custom/startmenu" "custom/startmenu"
"hyprland/window" "hyprland/window"
@ -280,4 +280,4 @@ in
'' ''
]; ];
}; };
} }

View File

@ -1,14 +1,14 @@
{ { pkgs
pkgs, , lib
lib, , host
host, , config
config, , ...
... }:
}: let let
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
inherit (import ../../../hosts/${host}/variables.nix) clock24h; inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in in
with lib; { with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -20,7 +20,7 @@ in
margin-top = 6; margin-top = 6;
margin-left = 6; margin-left = 6;
margin-right = 6; margin-right = 6;
modules-center = ["hyprland/workspaces"]; modules-center = [ "hyprland/workspaces" ];
modules-left = [ modules-left = [
"custom/startmenu" "custom/startmenu"
"cpu" "cpu"
@ -303,4 +303,4 @@ in
'' ''
]; ];
}; };
} }

View File

@ -1,13 +1,13 @@
{ { pkgs
pkgs, , lib
lib, , host
host, , config
config, , ...
... }:
}: let let
inherit (import ../../../hosts/${host}/variables.nix) clock24h; inherit (import ../../../hosts/${host}/variables.nix) clock24h;
in in
with lib; { with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@ -16,7 +16,7 @@ in
{ {
layer = "top"; layer = "top";
position = "top"; position = "top";
modules-center = ["hyprland/workspaces"]; modules-center = [ "hyprland/workspaces" ];
modules-left = [ modules-left = [
"custom/startmenu" "custom/startmenu"
"custom/arrow6" "custom/arrow6"
@ -302,4 +302,4 @@ in
'' ''
]; ];
}; };
} }

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
package = pkgs.wezterm; package = pkgs.wezterm;

View File

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
xdg = { xdg = {
enable = true; enable = true;
mime.enable = true; mime.enable = true;
@ -7,8 +7,8 @@
}; };
portal = { portal = {
enable = true; enable = true;
extraPortals = [pkgs.xdg-desktop-portal-hyprland]; extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
configPackages = [pkgs.hyprland]; configPackages = [ pkgs.hyprland ];
}; };
}; };
} }

View File

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

View File

@ -92,7 +92,7 @@
desc = "Move cursor down one page"; desc = "Move cursor down one page";
} }
{ {
on = ["g" "g"]; on = [ "g" "g" ];
run = "arrow top"; run = "arrow top";
desc = "Move cursor to the top"; desc = "Move cursor to the top";
} }
@ -133,7 +133,7 @@
} }
{ {
on = "<Space>"; on = "<Space>";
run = ["toggle" "arrow 1"]; run = [ "toggle" "arrow 1" ];
desc = "Toggle the current selection state"; desc = "Toggle the current selection state";
} }
{ {
@ -297,52 +297,52 @@
desc = "Jump to a file/directory via fzf"; desc = "Jump to a file/directory via fzf";
} }
{ {
on = ["m" "s"]; on = [ "m" "s" ];
run = "linemode size"; run = "linemode size";
desc = "Linemode: size"; desc = "Linemode: size";
} }
{ {
on = ["m" "p"]; on = [ "m" "p" ];
run = "linemode permissions"; run = "linemode permissions";
desc = "Linemode: permissions"; desc = "Linemode: permissions";
} }
{ {
on = ["m" "b"]; on = [ "m" "b" ];
run = "linemode btime"; run = "linemode btime";
desc = "Linemode: btime"; desc = "Linemode: btime";
} }
{ {
on = ["m" "m"]; on = [ "m" "m" ];
run = "linemode mtime"; run = "linemode mtime";
desc = "Linemode: mtime"; desc = "Linemode: mtime";
} }
{ {
on = ["m" "o"]; on = [ "m" "o" ];
run = "linemode owner"; run = "linemode owner";
desc = "Linemode: owner"; desc = "Linemode: owner";
} }
{ {
on = ["m" "n"]; on = [ "m" "n" ];
run = "linemode none"; run = "linemode none";
desc = "Linemode: none"; desc = "Linemode: none";
} }
{ {
on = ["c" "c"]; on = [ "c" "c" ];
run = "copy path"; run = "copy path";
desc = "Copy the file path"; desc = "Copy the file path";
} }
{ {
on = ["c" "d"]; on = [ "c" "d" ];
run = "copy dirname"; run = "copy dirname";
desc = "Copy the directory path"; desc = "Copy the directory path";
} }
{ {
on = ["c" "f"]; on = [ "c" "f" ];
run = "copy filename"; run = "copy filename";
desc = "Copy the filename"; desc = "Copy the filename";
} }
{ {
on = ["c" "n"]; on = [ "c" "n" ];
run = "copy name_without_ext"; run = "copy name_without_ext";
desc = "Copy the filename without extension"; desc = "Copy the filename without extension";
} }
@ -372,87 +372,87 @@
desc = "Goto the previous found"; desc = "Goto the previous found";
} }
{ {
on = ["," "m"]; on = [ "," "m" ];
run = ["sort mtime --reverse=no" "linemode mtime"]; run = [ "sort mtime --reverse=no" "linemode mtime" ];
desc = "Sort by modified time"; desc = "Sort by modified time";
} }
{ {
on = ["," "M"]; on = [ "," "M" ];
run = ["sort mtime --reverse" "linemode mtime"]; run = [ "sort mtime --reverse" "linemode mtime" ];
desc = "Sort by modified time (reverse)"; desc = "Sort by modified time (reverse)";
} }
{ {
on = ["," "b"]; on = [ "," "b" ];
run = ["sort btime --reverse=no" "linemode btime"]; run = [ "sort btime --reverse=no" "linemode btime" ];
desc = "Sort by birth time"; desc = "Sort by birth time";
} }
{ {
on = ["," "B"]; on = [ "," "B" ];
run = ["sort btime --reverse" "linemode btime"]; run = [ "sort btime --reverse" "linemode btime" ];
desc = "Sort by birth time (reverse)"; desc = "Sort by birth time (reverse)";
} }
{ {
on = ["," "e"]; on = [ "," "e" ];
run = "sort extension --reverse=no"; run = "sort extension --reverse=no";
desc = "Sort by extension"; desc = "Sort by extension";
} }
{ {
on = ["," "E"]; on = [ "," "E" ];
run = "sort extension --reverse"; run = "sort extension --reverse";
desc = "Sort by extension (reverse)"; desc = "Sort by extension (reverse)";
} }
{ {
on = ["," "a"]; on = [ "," "a" ];
run = "sort alphabetical --reverse=no"; run = "sort alphabetical --reverse=no";
desc = "Sort alphabetically"; desc = "Sort alphabetically";
} }
{ {
on = ["," "A"]; on = [ "," "A" ];
run = "sort alphabetical --reverse"; run = "sort alphabetical --reverse";
desc = "Sort alphabetically (reverse)"; desc = "Sort alphabetically (reverse)";
} }
{ {
on = ["," "n"]; on = [ "," "n" ];
run = "sort natural --reverse=no"; run = "sort natural --reverse=no";
desc = "Sort naturally"; desc = "Sort naturally";
} }
{ {
on = ["," "N"]; on = [ "," "N" ];
run = "sort natural --reverse"; run = "sort natural --reverse";
desc = "Sort naturally (reverse)"; desc = "Sort naturally (reverse)";
} }
{ {
on = ["," "s"]; on = [ "," "s" ];
run = ["sort size --reverse=no" "linemode size"]; run = [ "sort size --reverse=no" "linemode size" ];
desc = "Sort by size"; desc = "Sort by size";
} }
{ {
on = ["," "S"]; on = [ "," "S" ];
run = ["sort size --reverse" "linemode size"]; run = [ "sort size --reverse" "linemode size" ];
desc = "Sort by size (reverse)"; desc = "Sort by size (reverse)";
} }
{ {
on = ["," "r"]; on = [ "," "r" ];
run = "sort random --reverse=no"; run = "sort random --reverse=no";
desc = "Sort randomly"; desc = "Sort randomly";
} }
{ {
on = ["g" "h"]; on = [ "g" "h" ];
run = "cd ~"; run = "cd ~";
desc = "Go home"; desc = "Go home";
} }
{ {
on = ["g" "c"]; on = [ "g" "c" ];
run = "cd ~/.config"; run = "cd ~/.config";
desc = "Goto ~/.config"; desc = "Goto ~/.config";
} }
{ {
on = ["g" "d"]; on = [ "g" "d" ];
run = "cd ~/Downloads"; run = "cd ~/Downloads";
desc = "Goto ~/Downloads"; desc = "Goto ~/Downloads";
} }
{ {
on = ["g" "<Space>"]; on = [ "g" "<Space>" ];
run = "cd --interactive"; run = "cd --interactive";
desc = "Jump interactively"; desc = "Jump interactively";
} }
@ -544,7 +544,7 @@
]; ];
prepend_keymap = [ prepend_keymap = [
{ {
on = ["g" "i"]; on = [ "g" "i" ];
run = "plugin lazygit"; run = "plugin lazygit";
desc = "run lazygit"; desc = "run lazygit";
} }
@ -682,7 +682,7 @@
desc = "Swipe to the previous file"; desc = "Swipe to the previous file";
} }
{ {
on = ["c" "c"]; on = [ "c" "c" ];
run = "copy cell"; run = "copy cell";
desc = "Copy selected cell"; desc = "Copy selected cell";
} }
@ -781,7 +781,7 @@
} }
{ {
on = "I"; on = "I";
run = ["move first-char" "insert"]; run = [ "move first-char" "insert" ];
desc = "Move to the BOL, and enter insert mode"; desc = "Move to the BOL, and enter insert mode";
} }
{ {
@ -791,7 +791,7 @@
} }
{ {
on = "A"; on = "A";
run = ["move eol" "insert --append"]; run = [ "move eol" "insert --append" ];
desc = "Move to the EOL, and enter append mode"; desc = "Move to the EOL, and enter append mode";
} }
{ {
@ -806,17 +806,17 @@
} }
{ {
on = "V"; on = "V";
run = ["move bol" "visual" "move eol"]; run = [ "move bol" "visual" "move eol" ];
desc = "Select from BOL to EOL"; desc = "Select from BOL to EOL";
} }
{ {
on = "<C-A>"; on = "<C-A>";
run = ["move eol" "visual" "move bol"]; run = [ "move eol" "visual" "move bol" ];
desc = "Select from EOL to BOL"; desc = "Select from EOL to BOL";
} }
{ {
on = "<C-E>"; on = "<C-E>";
run = ["move bol" "visual" "move eol"]; run = [ "move bol" "visual" "move eol" ];
desc = "Select from BOL to EOL"; desc = "Select from BOL to EOL";
} }
{ {
@ -976,7 +976,7 @@
} }
{ {
on = "D"; on = "D";
run = ["delete --cut" "move eol"]; run = [ "delete --cut" "move eol" ];
desc = "Cut until the EOL"; desc = "Cut until the EOL";
} }
{ {
@ -986,12 +986,12 @@
} }
{ {
on = "C"; on = "C";
run = ["delete --cut --insert" "move eol"]; run = [ "delete --cut --insert" "move eol" ];
desc = "Cut until the EOL, and enter insert mode"; desc = "Cut until the EOL, and enter insert mode";
} }
{ {
on = "x"; on = "x";
run = ["delete --cut" "move 1 --in-operating"]; run = [ "delete --cut" "move 1 --in-operating" ];
desc = "Cut the current character"; desc = "Cut the current character";
} }
{ {
@ -1109,7 +1109,7 @@
} }
{ {
on = "<Enter>"; on = "<Enter>";
run = ["close --submit" "close_input --submit"]; run = [ "close --submit" "close_input --submit" ];
desc = "Submit the completion and input"; desc = "Submit the completion and input";
} }
{ {

View File

@ -11,26 +11,24 @@
tab_width = 1; tab_width = 1;
border_symbol = ""; border_symbol = "";
}; };
mode = {}; mode = { };
status = { status = {
overall = {bold = true;}; overall = { bold = true; };
sep_left = ["" ""]; sep_left = [ "" "" ];
sep_right = ["" ""]; sep_right = [ "" "" ];
}; };
which = { which = {
cols = 3; cols = 3;
separator = " "; separator = " ";
}; };
confirm = { confirm = {
border = {fg = "gray";}; border = { fg = "gray"; };
title = { title = {
fg = "blue"; fg = "blue";
bold = true; bold = true;
}; };
content = { content = { };
}; list = { };
list = {
};
btn_yes = { btn_yes = {
bg = "green"; bg = "green";
fg = "black"; fg = "black";
@ -41,40 +39,39 @@
fg = "black"; fg = "black";
bold = true; bold = true;
}; };
btn_labels = [" [Y]es " " (N)o "]; btn_labels = [ " [Y]es " " (N)o " ];
}; };
spot = { spot = {
border = {fg = "blue";}; border = { fg = "blue"; };
title = {fg = "blue";}; title = { fg = "blue"; };
tbl_col = {fg = "blue";}; tbl_col = { fg = "blue"; };
tbl_cell = { tbl_cell = {
fg = "yellow"; fg = "yellow";
reversed = true; reversed = true;
}; };
}; };
notify = { notify = {
title_info = {fg = "green";}; title_info = { fg = "green"; };
title_warn = {fg = "yellow";}; title_warn = { fg = "yellow"; };
title_error = {fg = "red";}; title_error = { fg = "red"; };
icon_info = ""; icon_info = "";
icon_warn = ""; icon_warn = "";
icon_error = ""; icon_error = "";
}; };
pick = {}; pick = { };
input = {}; input = { };
cmp = { cmp = {
active = {reversed = true;}; active = { reversed = true; };
inactive = { inactive = { };
};
icon_file = ""; icon_file = "";
icon_folder = ""; icon_folder = "";
icon_command = ""; icon_command = "";
}; };
tasks = {}; tasks = { };
help = {}; help = { };
filetype = {}; filetype = { };
icon = { icon = {
globs = []; globs = [ ];
dirs = [ dirs = [
{ {
name = ".config"; name = ".config";

View File

@ -1,8 +1,7 @@
{ { profile
profile, , pkgs
pkgs, , lib
lib, , ...
...
}: { }: {
imports = [ imports = [
./zshrc-personal.nix ./zshrc-personal.nix
@ -13,7 +12,7 @@
autosuggestion.enable = true; autosuggestion.enable = true;
syntaxHighlighting = { syntaxHighlighting = {
enable = true; enable = true;
highlighters = ["main" "brackets" "pattern" "regexp" "root" "line"]; highlighters = [ "main" "brackets" "pattern" "regexp" "root" "line" ];
}; };
historySubstringSearch.enable = true; historySubstringSearch.enable = true;

View File

@ -1,5 +1,5 @@
{pkgs, ...}: { { pkgs, ... }: {
home.packages = with pkgs; [zsh]; home.packages = with pkgs; [ zsh ];
home.file."./.zshrc-personal".text = '' home.file."./.zshrc-personal".text = ''

View File

@ -1,4 +1,4 @@
{host, ...}: { { host, ... }: {
imports = [ imports = [
../../hosts/${host} ../../hosts/${host}
../../modules/drivers ../../modules/drivers

View File

@ -1,4 +1,4 @@
{host, ...}: { { host, ... }: {
imports = [ imports = [
../../hosts/${host} ../../hosts/${host}
../../modules/drivers ../../modules/drivers

Some files were not shown because too many files have changed in this diff Show More