extern/zaneyos
1
0
Fork 1
mirror of https://gitlab.com/Zaney/zaneyos.git synced 2025-08-13 07:37:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated NIX file to nix formatting standard

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
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

18
flake.nix
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;

9
hosts/default/hardware.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" ];
}; };

1
hosts/default/host-packages.nix
View File

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

9
hosts/nixstation/hardware.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")

11
hosts/zaneyos-oem/hardware.nix
View File

@ -1,12 +1,11 @@
# 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")

2
hosts/zaneyos-oem/host-packages.nix
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
]; ];
} }

13
modules/core/default.nix
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

7
modules/core/greetd.nix
View File

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

15
modules/core/network.nix
View File

@ -1,11 +1,12 @@
{ { 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;

6
modules/core/nfs.nix
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;

7
modules/core/nh.nix
View File

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

1
modules/core/packages.nix
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

6
modules/core/printing.nix
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;

3
modules/core/sddm.nix
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";
} }

13
modules/core/stylix.nix
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;

6
modules/core/system.nix
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;

13
modules/core/thunar.nix
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;

19
modules/core/user.nix
View File

@ -1,13 +1,14 @@
{ { 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;

6
modules/core/xserver.nix
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 = {

9
modules/drivers/amd-drivers.nix
View File

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

3
modules/drivers/default.nix
View File

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

12
modules/drivers/intel-drivers.nix
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";
}; };

9
modules/drivers/local-hardware-clock.nix
View File

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

9
modules/drivers/nvidia-drivers.nix
View File

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

9
modules/drivers/nvidia-prime-drivers.nix
View File

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

9
modules/drivers/vm-guest-services.nix
View File

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

6
modules/home/alacritty.nix
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 = {

1
modules/home/bashrc-personal.nix
View File

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

7
modules/home/bat.nix
View File

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

6
modules/home/default.nix
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

6
modules/home/evil-helix.nix
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 [

13
modules/home/fzf.nix
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;

6
modules/home/ghostty.nix
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

6
modules/home/git.nix
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}";

6
modules/home/hyprland/binds.nix
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}"

6
modules/home/hyprland/default.nix
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

6
modules/home/hyprland/exec-once.nix
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

15
modules/home/hyprland/hyprland.nix
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

6
modules/home/hyprland/windowrules.nix
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 = [

3
modules/home/lazygit.nix
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 {

7
modules/home/nvf.nix
View File

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

13
modules/home/rofi/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}";

9
modules/home/scripts/default.nix
View File

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

12
modules/home/scripts/zcli.nix
View File

@ -1,9 +1,9 @@
{ { 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" ''

13
modules/home/starship-ddubs-1.nix
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 = {

12
modules/home/waybar/Jerry-waybar.nix
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";

14
modules/home/waybar/waybar-curved.nix
View File

@ -1,10 +1,10 @@
{ { 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

12
modules/home/waybar/waybar-ddubs-2.nix
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";

14
modules/home/waybar/waybar-ddubs.nix
View File

@ -1,10 +1,10 @@
{ { 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

14
modules/home/waybar/waybar-nekodyke.nix
View File

@ -1,10 +1,10 @@
{ { 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

14
modules/home/waybar/waybar-simple.nix
View File

@ -1,10 +1,10 @@
{ { 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; {

6
modules/home/yazi/default.nix
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;

9
modules/home/yazi/theme.nix
View File

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

9
modules/home/zsh/default.nix
View File

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

6
profiles/nvidia-laptop/default.nix
View File

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