Added alejandra formatter to flake.nix

Added alejandra input (for now)
Reformatted all NIX files

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

 Changes to be committed:
	modified:   flake.lock
	modified:   flake.nix
	modified:   hosts/default/default.nix
	modified:   hosts/default/hardware.nix
	modified:   hosts/nixstation/default.nix
	modified:   hosts/nixstation/hardware.nix
	modified:   hosts/nixstation/host-packages.nix
	modified:   hosts/zaneyos-24-vm/default.nix
	modified:   hosts/zaneyos-24-vm/hardware.nix
	modified:   hosts/zaneyos-oem/default.nix
	modified:   hosts/zaneyos-oem/hardware.nix
	modified:   modules/core/boot.nix
	modified:   modules/core/cachix.nix
	modified:   modules/core/default.nix
	modified:   modules/core/flatpak.nix
	modified:   modules/core/fonts.nix
	modified:   modules/core/greetd.nix
	modified:   modules/core/hardware.nix
	modified:   modules/core/network.nix
	modified:   modules/core/nfs.nix
	modified:   modules/core/nh.nix
	modified:   modules/core/overlays.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/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-amd-hybrid.nix
	modified:   modules/drivers/nvidia-drivers.nix
	modified:   modules/drivers/nvidia-prime-drivers.nix
	modified:   modules/drivers/vm-guest-services.nix
	modified:   modules/home/bash.nix
	modified:   modules/home/bashrc-personal.nix
	modified:   modules/home/cli/bat.nix
	modified:   modules/home/cli/bottom.nix
	modified:   modules/home/cli/btop.nix
	modified:   modules/home/cli/cava.nix
	modified:   modules/home/cli/fzf.nix
	modified:   modules/home/cli/gh.nix
	modified:   modules/home/cli/git.nix
	modified:   modules/home/cli/htop.nix
	modified:   modules/home/cli/lazygit.nix
	modified:   modules/home/editors/antigravity.nix
	modified:   modules/home/editors/doom-emacs-install.nix
	modified:   modules/home/editors/doom-emacs.nix
	modified:   modules/home/editors/evil-helix.nix
	modified:   modules/home/editors/nvf.nix
	modified:   modules/home/emoji.nix
	modified:   modules/home/gtk.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/default.nix
	modified:   modules/home/hyprland/env.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/noctalia.nix
	modified:   modules/home/obs-studio.nix
	modified:   modules/home/overview.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/note-from-clipboard.nix
	modified:   modules/home/scripts/note.nix
	modified:   modules/home/scripts/nvidia-offload.nix
	modified:   modules/home/scripts/rofi-launcher.nix
	modified:   modules/home/scripts/screenshootin.nix
	modified:   modules/home/scripts/squirtle.nix
	modified:   modules/home/scripts/task-waybar.nix
	modified:   modules/home/scripts/wallsetter.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/terminals/ghostty.nix
	modified:   modules/home/terminals/kitty.nix
	modified:   modules/home/terminals/wezterm.nix
	modified:   modules/home/virtmanager.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-dwm-2.nix
	modified:   modules/home/waybar/waybar-jerry.nix
	modified:   modules/home/waybar/waybar-nekodyke.nix
	modified:   modules/home/waybar/waybar-simple.nix
	modified:   modules/home/wlogout/default.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/yazi/yazi.nix
	modified:   modules/home/zoxide.nix
	modified:   modules/home/zsh/default.nix
	modified:   modules/home/zsh/zshrc-personal.nix
	modified:   profiles/amd-hybrid/default.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-12-08 00:20:22 -05:00
commit 191d97feed
123 changed files with 3293 additions and 3215 deletions

108
flake.lock generated
View file

@ -1,5 +1,27 @@
{
"nodes": {
"alejandra": {
"inputs": {
"fenix": "fenix",
"flakeCompat": "flakeCompat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1751513446,
"narHash": "sha256-pnRh5ysSgMSOQxvL82sNJRwD/CiSYWplrGRU2WLoNKQ=",
"owner": "kamadorueda",
"repo": "alejandra",
"rev": "c68bef57c1db3add865493d9cb741a14618bdc28",
"type": "github"
},
"original": {
"owner": "kamadorueda",
"repo": "alejandra",
"type": "github"
}
},
"antigravity-nix": {
"inputs": {
"flake-utils": "flake-utils",
@ -89,6 +111,28 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"alejandra",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1730615655,
"narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
"owner": "nix-community",
"repo": "fenix",
"rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"firefox-gnome-theme": {
"flake": false,
"locked": {
@ -220,6 +264,22 @@
"type": "github"
}
},
"flakeCompat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -262,11 +322,11 @@
]
},
"locked": {
"lastModified": 1764866045,
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
"lastModified": 1765170903,
"narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
"rev": "20561be440a11ec57a89715480717baf19fe6343",
"type": "github"
},
"original": {
@ -358,11 +418,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1765064213,
"narHash": "sha256-tyWaUCIf/v0FaSE02V9Cxt9InuB2SPm4Wz++Q8P9POA=",
"lastModified": 1765170393,
"narHash": "sha256-rrIFbnlGNu/iljpuSHX5T4NOARZ8Fq3IBrwa0gv3gvE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9a9b8ba4a9b114c8b2c577bd53e6d35bfb8e0d96",
"rev": "87fa37f7bb685f6888fa6f1dcd8066184a38b755",
"type": "github"
},
"original": {
@ -435,11 +495,11 @@
]
},
"locked": {
"lastModified": 1765053872,
"narHash": "sha256-HXnApDWc4vlx6Mh9OJu0fYn5oqUQHva82qS54M3gnJw=",
"lastModified": 1765147737,
"narHash": "sha256-gB7SYd9o5QL5y+heFVl/lH1qsOlcBTFRqT3MU0dFOGc=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"rev": "969bddd382b8014ca2e76d1a8f1159276775f813",
"rev": "f3b6c1d60bcdf8cc68d5177c7bc3d2332419bf4b",
"type": "github"
},
"original": {
@ -505,11 +565,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1764904740,
"narHash": "sha256-TzqXUQlESmS5XGJ3tR1/xdoU0vySyp6YUUpmGF5F0kY=",
"lastModified": 1765119282,
"narHash": "sha256-iI0fuBBYJMnOprGD2L+rum2P8lHMcZ5n35hzdlpwayI=",
"owner": "notashelf",
"repo": "nvf",
"rev": "249cabe0c5392c384c82fa9d28d3f49fbeb04266",
"rev": "26c4a7e3c33e739d474ddaf52aa4c5f3d11922ba",
"type": "github"
},
"original": {
@ -520,6 +580,7 @@
},
"root": {
"inputs": {
"alejandra": "alejandra",
"antigravity-nix": "antigravity-nix",
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
@ -531,6 +592,23 @@
"zen-browser": "zen-browser"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1730555913,
"narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"stylix": {
"inputs": {
"base16": "base16",
@ -550,11 +628,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1764982414,
"narHash": "sha256-LqCQL0BVLQYtOIBfWSHkNbRoQ+nCeCdfj7/Ggmb4x3w=",
"lastModified": 1765065096,
"narHash": "sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0+/DxfAU=",
"owner": "danth",
"repo": "stylix",
"rev": "b1c99fd9525bae86f20018e96d68176002ad18b0",
"rev": "84d9d55885d463d461234f3aac07b2389a2577d8",
"type": "github"
},
"original": {

View file

@ -32,46 +32,51 @@
url = "github:0xc000022070/zen-browser-flake/beta";
inputs.nixpkgs.follows = "nixpkgs";
};
alejandra = {
url = "github:kamadorueda/alejandra";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
{ nixpkgs
, home-manager
, nixvim
, nix-flatpak
, ...
} @ inputs:
let
system = "x86_64-linux";
host = "zaneyos-24-vm";
profile = "vm";
username = "dwilliams";
outputs = {
nixpkgs,
home-manager,
nixvim,
nix-flatpak,
alejandra,
...
} @ inputs: let
system = "x86_64-linux";
host = "zaneyos-24-vm";
profile = "vm";
username = "dwilliams";
# Deduplicate nixosConfigurations while preserving the top-level 'profile'
mkNixosConfig = gpuProfile:
nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
inherit username;
inherit host;
inherit profile; # keep using the let-bound profile for modules/scripts
};
modules = [
./modules/core/overlays.nix
./profiles/${gpuProfile}
nix-flatpak.nixosModules.nix-flatpak
];
# Deduplicate nixosConfigurations while preserving the top-level 'profile'
mkNixosConfig = gpuProfile:
nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
inherit username;
inherit host;
inherit profile; # keep using the let-bound profile for modules/scripts
};
in
{
nixosConfigurations = {
amd = mkNixosConfig "amd";
nvidia = mkNixosConfig "nvidia";
nvidia-laptop = mkNixosConfig "nvidia-laptop";
amd-hybrid = mkNixosConfig "amd-hybrid";
intel = mkNixosConfig "intel";
vm = mkNixosConfig "vm";
modules = [
./modules/core/overlays.nix
./profiles/${gpuProfile}
nix-flatpak.nixosModules.nix-flatpak
];
};
in {
nixosConfigurations = {
amd = mkNixosConfig "amd";
nvidia = mkNixosConfig "nvidia";
nvidia-laptop = mkNixosConfig "nvidia-laptop";
amd-hybrid = mkNixosConfig "amd-hybrid";
intel = mkNixosConfig "intel";
vm = mkNixosConfig "vm";
};
formatter.x86_64-linux = inputs.alejandra.packages.x86_64-linux.default;
};
}

View file

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

View file

@ -1,35 +1,36 @@
# 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, ... }:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{
device = "/dev/disk/by-uuid/dd005850-6230-40c4-9d70-8c8cf443658d";
fsType = "ext4";
};
fileSystems."/" = {
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";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/C2A6-DF56";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
swapDevices = [ ];
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

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

View file

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

View file

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

View file

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

View file

@ -1,37 +1,41 @@
# 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, ... }:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/9287-3738";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/9287-3738";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/mnt/nas" =
{ device = "192.168.40.11:/volume1/DiskStation54TB";
fsType = "nfs";
};
fileSystems."/mnt/nas" = {
device = "192.168.40.11:/volume1/DiskStation54TB";
fsType = "nfs";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087"; }
];
swapDevices = [
{device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087";}
];
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;

View file

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

View file

@ -1,20 +1,21 @@
# 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")
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/e5fc1006-4d0b-41db-8c43-22b3cb8110c6";
@ -24,7 +25,7 @@
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/9287-3738";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/mnt/nas" = {
@ -33,7 +34,7 @@
};
swapDevices = [
{ device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087"; }
{device = "/dev/disk/by-uuid/a6e9dd8b-6767-44f4-84fa-30d02d90d087";}
];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,11 +1,13 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
boot = {
kernelPackages = pkgs.linuxPackages_zen;
kernelModules = [ "v4l2loopback" ];
extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
kernel.sysctl = { "vm.max_map_count" = 2147483642; };
kernelModules = ["v4l2loopback"];
extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
kernel.sysctl = {"vm.max_map_count" = 2147483642;};
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
# Appimage Support

View file

@ -1,5 +1,4 @@
{ lib, ... }:
{
{lib, ...}: {
nix.settings = {
substituters = lib.mkAfter [
"https://cache.nixos.org"

View file

@ -2,12 +2,10 @@
inputs,
host,
...
}:
let
}: let
# Import the host-specific variables.nix
vars = import ../../hosts/${host}/variables.nix;
in
{
in {
imports = [
./boot.nix
./flatpak.nix
@ -20,7 +18,11 @@ in
./packages.nix
./printing.nix
# Conditionally import the display manager module
(if vars.displayManager == "tui" then ./greetd.nix else ./sddm.nix)
(
if vars.displayManager == "tui"
then ./greetd.nix
else ./sddm.nix
)
./security.nix
./services.nix
./steam.nix

View file

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

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
fonts = {
packages = with pkgs; [
dejavu_fonts

View file

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

View file

@ -1,10 +1,9 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
hardware = {
sane = {
enable = true;
extraBackends = [ pkgs.sane-airscan ];
disabledDefaultBackends = [ "escl" ];
extraBackends = [pkgs.sane-airscan];
disabledDefaultBackends = ["escl"];
};
logitech.wireless.enable = false;
logitech.wireless.enableGraphical = false;

View file

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

View file

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

View file

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

View file

@ -1,4 +1,4 @@
{ inputs, ... }: {
{inputs, ...}: {
nixpkgs.overlays = [
# Provide pkgs.google-antigravity via antigravity-nix overlay
inputs.antigravity-nix.overlays.default

View file

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

View file

@ -1,31 +1,34 @@
{ pkgs, inputs, ... }:
{
environment.systemPackages = with pkgs; [
quickshell
# Qt6 related kits(for slove Qt5Compat problem)
qt6.qt5compat
qt6.qtbase
qt6.qtquick3d
qt6.qtwayland
qt6.qtdeclarative
qt6.qtsvg
# alternate options
# libsForQt5.qt5compat
kdePackages.qt5compat
libsForQt5.qt5.qtgraphicaleffects
];
# necessary environment variables
environment.variables = {
QML_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
QML2_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
};
# make sure the Qt application is working properly
environment.sessionVariables = {
QT_QPA_PLATFORM = "wayland;xcb";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
};
}
{
pkgs,
inputs,
...
}: {
environment.systemPackages = with pkgs; [
quickshell
# Qt6 related kits(for slove Qt5Compat problem)
qt6.qt5compat
qt6.qtbase
qt6.qtquick3d
qt6.qtwayland
qt6.qtdeclarative
qt6.qtsvg
# alternate options
# libsForQt5.qt5compat
kdePackages.qt5compat
libsForQt5.qt5.qtgraphicaleffects
];
# necessary environment variables
environment.variables = {
QML_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
QML2_IMPORT_PATH = "${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml";
};
# make sure the Qt application is working properly
environment.sessionVariables = {
QT_QPA_PLATFORM = "wayland;xcb";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
};
}

View file

@ -65,7 +65,7 @@ in {
services.displayManager = {
sddm = {
package = pkgs.kdePackages.sddm;
extraPackages = [ sddm-astronaut ];
extraPackages = [sddm-astronaut];
enable = true;
wayland.enable = true;
theme = "sddm-astronaut-theme";
@ -87,8 +87,8 @@ in {
vars = import ../../hosts/${host}/variables.nix;
keyboardLayout = vars.keyboardLayout or "us";
keyboardVariant = vars.keyboardVariant or "";
in ({ XKB_DEFAULT_LAYOUT = keyboardLayout; }
// lib.optionalAttrs (keyboardVariant != "") { XKB_DEFAULT_VARIANT = keyboardVariant; });
in ({XKB_DEFAULT_LAYOUT = keyboardLayout;}
// lib.optionalAttrs (keyboardVariant != "") {XKB_DEFAULT_VARIANT = keyboardVariant;});
environment.systemPackages = [ sddm-astronaut ];
environment.systemPackages = [sddm-astronaut];
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,28 +1,40 @@
{ host, ... }:
let
{host, ...}: let
vars = import ../../hosts/${host}/variables.nix;
keyboardLayout = vars.keyboardLayout or "us";
keyboardVariant = vars.keyboardVariant or "";
# Treat only known US-based variants as implying layout = "us".
usVariants = [ "dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl" ];
normalizeUSVariant = v: if v == "us-intl" then "intl" else v;
usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"];
normalizeUSVariant = v:
if v == "us-intl"
then "intl"
else v;
# If layout itself is a US variant (e.g., "dvorak", "us-intl"), normalize it
layoutFromLayout = if builtins.elem keyboardLayout usVariants then "us" else keyboardLayout;
variantFromLayout = if builtins.elem keyboardLayout usVariants then normalizeUSVariant keyboardLayout else "";
layoutFromLayout =
if builtins.elem keyboardLayout usVariants
then "us"
else keyboardLayout;
variantFromLayout =
if builtins.elem keyboardLayout usVariants
then normalizeUSVariant keyboardLayout
else "";
# If the provided variant is a US variant, force layout to us; otherwise keep layout
layoutFromVariant = if builtins.elem keyboardVariant usVariants then "us" else layoutFromLayout;
layoutFromVariant =
if builtins.elem keyboardVariant usVariants
then "us"
else layoutFromLayout;
variantFinal =
if builtins.elem keyboardVariant usVariants then normalizeUSVariant keyboardVariant
else if variantFromLayout != "" then variantFromLayout
if builtins.elem keyboardVariant usVariants
then normalizeUSVariant keyboardVariant
else if variantFromLayout != ""
then variantFromLayout
else keyboardVariant;
xkbLayout = layoutFromVariant;
xkbVariant = variantFinal;
in
{
in {
services.xserver = {
enable = false;
xkb = {

View file

@ -1,19 +1,18 @@
{ lib
, pkgs
, config
, ...
}:
with lib;
let
cfg = config.drivers.amdgpu;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.drivers.amdgpu;
in {
options.drivers.amdgpu = {
enable = mkEnableOption "Enable AMD Drivers";
};
config = mkIf cfg.enable {
systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ];
services.xserver.videoDrivers = [ "amdgpu" ];
systemd.tmpfiles.rules = ["L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"];
services.xserver.videoDrivers = ["amdgpu"];
};
}

View file

@ -1,6 +1,4 @@
{ ...
}:
{
{...}: {
imports = [
./amd-drivers.nix
./intel-drivers.nix

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,16 +1,15 @@
{ lib
, pkgs
, config
, ...
}:
with lib;
let
cfg = config.local.hardware-clock;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.local.hardware-clock;
in {
options.local.hardware-clock = {
enable = mkEnableOption "Change Hardware Clock To Local Time";
};
config = mkIf cfg.enable { time.hardwareClockInLocalTime = true; };
config = mkIf cfg.enable {time.hardwareClockInLocalTime = true;};
}

View file

@ -1,9 +1,12 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.drivers.nvidia-amd-hybrid;
in
{
in {
options.drivers.nvidia-amd-hybrid = {
enable = mkEnableOption "Enable AMD iGPU + NVIDIA dGPU (Prime offload)";
# AMD iGPU Bus ID (e.g., PCI:5:0:0). Expose as option for future host wiring.
@ -24,7 +27,7 @@ in
# Enforce kernel 6.12 when this hybrid config is selected
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = {
modesetting.enable = true;

View file

@ -1,19 +1,18 @@
{ lib
, pkgs
, config
, ...
}:
with lib;
let
cfg = config.drivers.nvidia;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.drivers.nvidia;
in {
options.drivers.nvidia = {
enable = mkEnableOption "Enable Nvidia Drivers";
};
config = mkIf cfg.enable {
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = {
# Modesetting is required.
modesetting.enable = true;

View file

@ -1,13 +1,12 @@
{ lib
, pkgs
, config
, ...
}:
with lib;
let
cfg = config.drivers.nvidia-prime;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.drivers.nvidia-prime;
in {
options.drivers.nvidia-prime = {
enable = mkEnableOption "Enable Nvidia Prime Hybrid GPU Offload";
intelBusID = mkOption {

View file

@ -1,13 +1,12 @@
{ lib
, pkgs
, config
, ...
}:
with lib;
let
cfg = config.vm.guest-services;
in
{
lib,
pkgs,
config,
...
}:
with lib; let
cfg = config.vm.guest-services;
in {
options.vm.guest-services = {
enable = mkEnableOption "Enable Virtual Machine Guest Services";
};
@ -15,6 +14,6 @@ in
config = mkIf cfg.enable {
services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true;
services.spice-webdavd.enable = false; #Causes build failure davsfs2 unsupported neon version 9-12-25
services.spice-webdavd.enable = false; #Causes build failure davsfs2 unsupported neon version 9-12-25
};
}

View file

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

View file

@ -1,20 +1,20 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ bash ];
{pkgs, ...}: {
home.packages = with pkgs; [bash];
home.file."./.bashrc-personal".text = ''
# This file allows you to define your own aliases, functions, etc
# below are just some examples of what you can use this file for
#!/usr/bin/env bash
# Set defaults
#
#export EDITOR="nvim"
#export VISUAL="nvim"
#alias c="clear"
#eval "$(zoxide init bash)"
#eval "$(oh-my-posh init bash --config $HOME/.config/powerlevel10k_rainbow.omp.json)"
# This file allows you to define your own aliases, functions, etc
# below are just some examples of what you can use this file for
#!/usr/bin/env bash
# Set defaults
#
#export EDITOR="nvim"
#export VISUAL="nvim"
#alias c="clear"
#eval "$(zoxide init bash)"
#eval "$(oh-my-posh init bash --config $HOME/.config/powerlevel10k_rainbow.omp.json)"
'';
}

View file

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

View file

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

View file

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

View file

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

View file

@ -1,14 +1,13 @@
# 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,5 +1,4 @@
{ ... }:
{
{...}: {
programs = {
gh.enable = true;
};

View file

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

View file

@ -1,4 +1,4 @@
{ config, ... }: {
{config, ...}: {
programs.htop = {
enable = true;
settings =
@ -25,18 +25,18 @@
highlight_threads = 1;
}
// (with config.lib.htop;
leftMeters [
(bar "AllCPUs2")
(bar "Memory")
(bar "Swap")
(text "Zram")
])
leftMeters [
(bar "AllCPUs2")
(bar "Memory")
(bar "Swap")
(text "Zram")
])
// (with config.lib.htop;
rightMeters [
(text "Tasks")
(text "LoadAverage")
(text "Uptime")
(text "Systemd")
]);
rightMeters [
(text "Tasks")
(text "LoadAverage")
(text "Uptime")
(text "Systemd")
]);
};
}

View file

@ -1,10 +1,12 @@
# Lazygit is a simple terminal UI for git commands.
{ config, lib, ... }:
let
{
config,
lib,
...
}: let
accent = "#${config.lib.stylix.colors.base0D}";
muted = "#${config.lib.stylix.colors.base03}";
in
{
in {
programs.lazygit = {
enable = true;
settings = lib.mkForce {
@ -18,8 +20,8 @@ in
};
gui = {
theme = {
activeBorderColor = [ accent "bold" ];
inactiveBorderColor = [ muted ];
activeBorderColor = [accent "bold"];
inactiveBorderColor = [muted];
};
showListFooter = false;
showRandomTip = false;

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
# Google Antigravity IDE helper, exposed via antigravity-nix overlay as pkgs.google-antigravity
home.packages = with pkgs; [
google-antigravity

View file

@ -1,12 +1,9 @@
{ pkgs, ... }:
let
{pkgs, ...}: let
doom-icon = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/jeetelongname/doom-banners/master/splashes/doom/doom-emacs-color2.svg";
sha256 = "1xxi5ra1z8njsqaqiaq96wyn1sc967l42kvjzbji1zrjj8za6bgq";
};
in
{
in {
# 1. Create a script to install Doom Emacs
home.packages = [
(pkgs.writeShellScriptBin "get-doom" ''
@ -73,6 +70,6 @@ in
icon = doom-icon;
terminal = false;
type = "Application";
categories = [ "Development" "TextEditor" ];
categories = ["Development" "TextEditor"];
};
}

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
emacs-pgtk
git

View file

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

View file

@ -1,8 +1,9 @@
{ inputs
, config
, ...
{
inputs,
config,
...
}: {
imports = [ inputs.nvf.homeManagerModules.default ];
imports = [inputs.nvf.homeManagerModules.default];
programs.nvf = {
enable = true;
@ -50,55 +51,55 @@
keymaps = [
{
key = "jk";
mode = [ "i" ];
mode = ["i"];
action = "<ESC>";
desc = "Exit insert mode";
}
{
key = "<leader>nh";
mode = [ "n" ];
mode = ["n"];
action = ":nohl<CR>";
desc = "Clear search highlights";
}
{
key = "<leader>ff";
mode = [ "n" ];
mode = ["n"];
action = "<cmd>Telescope find_files<cr>";
desc = "Search files by name";
}
{
key = "<leader>lg";
mode = [ "n" ];
mode = ["n"];
action = "<cmd>Telescope live_grep<cr>";
desc = "Search files by contents";
}
{
key = "<leader>fe";
mode = [ "n" ];
mode = ["n"];
action = "<cmd>Neotree toggle<cr>";
desc = "File browser toggle";
}
{
key = "<C-h>";
mode = [ "i" ];
mode = ["i"];
action = "<Left>";
desc = "Move left in insert mode";
}
{
key = "<C-j>";
mode = [ "i" ];
mode = ["i"];
action = "<Down>";
desc = "Move down in insert mode";
}
{
key = "<C-k>";
mode = [ "i" ];
mode = ["i"];
action = "<Up>";
desc = "Move up in insert mode";
}
{
key = "<C-l>";
mode = [ "i" ];
mode = ["i"];
action = "<Right>";
desc = "Move right in insert mode";
}
@ -108,7 +109,7 @@
spellcheck = {
enable = true;
languages = [ "en" ];
languages = ["en"];
programmingWordlist.enable = true;
};
@ -223,7 +224,7 @@
comments = {
comment-nvim.enable = true;
};
luaConfigPost = ''
-- Nix LSP (nil) configuration for auto-eval-inputs
local lspconfig = require('lspconfig')
@ -236,7 +237,7 @@
},
},
})
-- Auto-update programming wordlist on first startup
vim.api.nvim_create_autocmd("VimEnter", {
callback = function()
@ -258,7 +259,7 @@
dirtytalkUpdate = ''
# Create the spell directory if it doesn't exist
mkdir -p "$HOME/.local/share/nvim/site/spell"
# Try to run DirtytalkUpdate in headless mode with better error handling
if ! ${config.programs.nvf.finalPackage}/bin/nvim --headless -c "DirtytalkUpdate" -c "qa!" 2>/dev/null; then
echo "Note: DirtytalkUpdate will run automatically on first Neovim startup"

View file

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

View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
gtk = {
iconTheme = {
name = "Papirus-Dark";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
services = {
hypridle = {
enable = true;

View file

@ -4,8 +4,7 @@
pkgs,
lib,
...
}:
let
}: let
vars = import ../../../hosts/${host}/variables.nix;
extraMonitorSettings = vars.extraMonitorSettings or "";
keyboardLayout = vars.keyboardLayout or "us";
@ -13,24 +12,37 @@ let
stylixImage = vars.stylixImage or null;
# Treat only known US-based variants as implying layout = "us".
usVariants = [ "dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl" ];
normalizeUSVariant = v: if v == "us-intl" then "intl" else v;
usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"];
normalizeUSVariant = v:
if v == "us-intl"
then "intl"
else v;
# If layout itself is a US variant (e.g., "dvorak", "us-intl"), normalize it
layoutFromLayout = if builtins.elem keyboardLayout usVariants then "us" else keyboardLayout;
variantFromLayout = if builtins.elem keyboardLayout usVariants then normalizeUSVariant keyboardLayout else "";
layoutFromLayout =
if builtins.elem keyboardLayout usVariants
then "us"
else keyboardLayout;
variantFromLayout =
if builtins.elem keyboardLayout usVariants
then normalizeUSVariant keyboardLayout
else "";
# If the provided variant is a US variant, force layout to us; otherwise keep layout
layoutFromVariant = if builtins.elem keyboardVariant usVariants then "us" else layoutFromLayout;
layoutFromVariant =
if builtins.elem keyboardVariant usVariants
then "us"
else layoutFromLayout;
variantFinal =
if builtins.elem keyboardVariant usVariants then normalizeUSVariant keyboardVariant
else if variantFromLayout != "" then variantFromLayout
if builtins.elem keyboardVariant usVariants
then normalizeUSVariant keyboardVariant
else if variantFromLayout != ""
then variantFromLayout
else keyboardVariant;
hyprKbLayout = layoutFromVariant;
hyprKbVariant = variantFinal;
in
{
in {
home.packages = with pkgs; [
swww
grim
@ -61,32 +73,34 @@ in
systemd = {
enable = true;
enableXdgAutostart = true;
variables = [ "--all" ];
variables = ["--all"];
};
xwayland = {
enable = true;
};
settings = {
input = ({
kb_layout = hyprKbLayout;
kb_options = [
"grp:alt_caps_toggle"
"caps:super"
];
numlock_by_default = true;
repeat_delay = 300;
follow_mouse = 1;
float_switch_override_focus = 0;
sensitivity = 0;
touchpad = {
natural_scroll = true;
disable_while_typing = true;
scroll_factor = 0.8;
};
} // lib.optionalAttrs (hyprKbVariant != "") { kb_variant = hyprKbVariant; });
input =
{
kb_layout = hyprKbLayout;
kb_options = [
"grp:alt_caps_toggle"
"caps:super"
];
numlock_by_default = true;
repeat_delay = 300;
follow_mouse = 1;
float_switch_override_focus = 0;
sensitivity = 0;
touchpad = {
natural_scroll = true;
disable_while_typing = true;
scroll_factor = 0.8;
};
}
// lib.optionalAttrs (hyprKbVariant != "") {kb_variant = hyprKbVariant;};
gestures = {
gesture = [ "3, horizontal, workspace" ];
gesture = ["3, horizontal, workspace"];
workspace_swipe_distance = 500;
workspace_swipe_invert = true;
workspace_swipe_min_speed_to_force = 30;
@ -102,8 +116,7 @@ in
gaps_out = 8;
border_size = 2;
resize_on_border = true;
"col.active_border" =
"rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
"col.active_border" = "rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
"col.inactive_border" = "rgb(${config.lib.stylix.colors.base01})";
};
@ -183,9 +196,7 @@ in
extraConfig = "
monitor=,preferred,auto,auto
monitor=Virtual-1,1920x1080@60,auto,1
${
extraMonitorSettings
}
${extraMonitorSettings}
# To enable blur on waybar uncomment the line below
# Thanks to SchotjeChrisman
#layerrule = blur,waybar

View file

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

View file

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

View file

@ -1,10 +1,14 @@
{ config, pkgs, inputs, lib, ... }:
let
{
config,
pkgs,
inputs,
lib,
...
}: let
system = pkgs.stdenv.hostPlatform.system;
noctaliaPath = inputs.noctalia.packages.${system}.default;
configDir = "${noctaliaPath}/share/noctalia-shell";
in
{
in {
# Install the Noctalia package for this user (CLI, assets, etc.)
home.packages = [
noctaliaPath
@ -12,7 +16,7 @@ in
# Seed the Noctalia QuickShell shell code into ~/.config/quickshell/noctalia-shell
# once, then leave it writable so the GUI and the user can tweak it.
home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] ''
set -eu
DEST="$HOME/.config/quickshell/noctalia-shell"
SRC="${configDir}"

View file

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

View file

@ -1,8 +1,10 @@
{ config, lib, ... }:
let
overviewSource = ./overview;
in
{
config,
lib,
...
}: let
overviewSource = ./overview;
in {
# Quickshell-overview is a Qt6 QML app for Hyprland workspace overview
# It shows all workspaces with live window previews, drag-and-drop support
# Toggled via: SUPER + TAB (bound in hyprland/binds.nix)
@ -10,11 +12,11 @@ in
# Seed the Quickshell overview code into ~/.config/quickshell/overview
# Copy (not symlink) so QML module resolution works and users can edit files
home.activation.seedOverviewCode = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
home.activation.seedOverviewCode = lib.hm.dag.entryAfter ["writeBoundary"] ''
set -eu
DEST="$HOME/.config/quickshell/overview"
SRC="${overviewSource}"
if [ ! -d "$DEST" ]; then
mkdir -p "$HOME/.config/quickshell"
cp -R "$SRC" "$DEST"

View file

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

View file

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

View file

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

View file

@ -1,6 +1,7 @@
{ pkgs
, config
, ...
{
pkgs,
config,
...
}: {
programs = {
rofi = {
@ -16,193 +17,191 @@
display-run = " Run";
display-filebrowser = " File";
};
theme =
let
inherit (config.lib.formats.rasi) mkLiteral;
in
{
"*" = {
bg = mkLiteral "#${config.stylix.base16Scheme.base00}";
bg-alt = mkLiteral "#${config.stylix.base16Scheme.base09}";
foreground = mkLiteral "#${config.stylix.base16Scheme.base01}";
selected = mkLiteral "#${config.stylix.base16Scheme.base08}";
active = mkLiteral "#${config.stylix.base16Scheme.base0B}";
text-selected = mkLiteral "#${config.stylix.base16Scheme.base00}";
text-color = mkLiteral "#${config.stylix.base16Scheme.base05}";
border-color = mkLiteral "#${config.stylix.base16Scheme.base0F}";
urgent = mkLiteral "#${config.stylix.base16Scheme.base0E}";
};
"window" = {
transparency = "real";
width = mkLiteral "1000px";
location = mkLiteral "center";
anchor = mkLiteral "center";
fullscreen = false;
x-offset = mkLiteral "0px";
y-offset = mkLiteral "0px";
cursor = "default";
enabled = true;
border-radius = mkLiteral "15px";
background-color = mkLiteral "@bg";
};
"mainbox" = {
enabled = true;
spacing = mkLiteral "0px";
orientation = mkLiteral "horizontal";
children = map mkLiteral [
"imagebox"
"listbox"
];
background-color = mkLiteral "transparent";
};
"imagebox" = {
padding = mkLiteral "20px";
background-color = mkLiteral "transparent";
background-image = mkLiteral ''url("~/Pictures/Wallpapers/Rainnight.jpg", height)'';
orientation = mkLiteral "vertical";
children = map mkLiteral [
"inputbar"
"dummy"
"mode-switcher"
];
};
"listbox" = {
spacing = mkLiteral "20px";
padding = mkLiteral "20px";
background-color = mkLiteral "transparent";
orientation = mkLiteral "vertical";
children = map mkLiteral [
"message"
"listview"
];
};
"dummy" = {
background-color = mkLiteral "transparent";
};
"inputbar" = {
enabled = true;
spacing = mkLiteral "10px";
padding = mkLiteral "10px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "@bg-alt";
text-color = mkLiteral "@foreground";
children = map mkLiteral [
"textbox-prompt-colon"
"entry"
];
};
"textbox-prompt-colon" = {
enabled = true;
expand = false;
str = "";
background-color = mkLiteral "inherit";
text-color = mkLiteral "inherit";
};
"entry" = {
enabled = true;
background-color = mkLiteral "inherit";
text-color = mkLiteral "inherit";
cursor = mkLiteral "text";
placeholder = "Search";
placeholder-color = mkLiteral "inherit";
};
"mode-switcher" = {
enabled = true;
spacing = mkLiteral "20px";
background-color = mkLiteral "transparent";
text-color = mkLiteral "@foreground";
};
"button" = {
padding = mkLiteral "15px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "@bg-alt";
text-color = mkLiteral "inherit";
cursor = mkLiteral "pointer";
};
"button selected" = {
background-color = mkLiteral "@selected";
text-color = mkLiteral "@foreground";
};
"listview" = {
enabled = true;
columns = 1;
lines = 8;
cycle = true;
dynamic = true;
scrollbar = false;
layout = mkLiteral "vertical";
reverse = false;
fixed-height = true;
fixed-columns = true;
spacing = mkLiteral "10px";
background-color = mkLiteral "transparent";
text-color = mkLiteral "@foreground";
cursor = "default";
};
"element" = {
enabled = true;
spacing = mkLiteral "15px";
padding = mkLiteral "8px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "transparent";
text-color = mkLiteral "@text-color";
cursor = mkLiteral "pointer";
};
"element normal.normal" = {
background-color = mkLiteral "inherit";
text-color = mkLiteral "@text-color";
};
"element normal.urgent" = {
background-color = mkLiteral "@urgent";
text-color = mkLiteral "@text-color";
};
"element normal.active" = {
background-color = mkLiteral "inherit";
text-color = mkLiteral "@text-color";
};
"element selected.normal" = {
background-color = mkLiteral "@selected";
text-color = mkLiteral "@foreground";
};
"element selected.urgent" = {
background-color = mkLiteral "@urgent";
text-color = mkLiteral "@text-selected";
};
"element selected.active" = {
background-color = mkLiteral "@urgent";
text-color = mkLiteral "@text-selected";
};
"element-icon" = {
background-color = mkLiteral "transparent";
text-color = mkLiteral "inherit";
size = mkLiteral "36px";
cursor = mkLiteral "inherit";
};
"element-text" = {
background-color = mkLiteral "transparent";
text-color = mkLiteral "inherit";
cursor = mkLiteral "inherit";
vertical-align = mkLiteral "0.5";
horizontal-align = mkLiteral "0.0";
};
"message" = {
background-color = mkLiteral "transparent";
};
"textbox" = {
padding = mkLiteral "15px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "@bg-alt";
text-color = mkLiteral "@foreground";
vertical-align = mkLiteral "0.5";
horizontal-align = mkLiteral "0.0";
};
"error-message" = {
padding = mkLiteral "15px";
border-radius = mkLiteral "20px";
background-color = mkLiteral "@bg";
text-color = mkLiteral "@foreground";
};
theme = let
inherit (config.lib.formats.rasi) mkLiteral;
in {
"*" = {
bg = mkLiteral "#${config.stylix.base16Scheme.base00}";
bg-alt = mkLiteral "#${config.stylix.base16Scheme.base09}";
foreground = mkLiteral "#${config.stylix.base16Scheme.base01}";
selected = mkLiteral "#${config.stylix.base16Scheme.base08}";
active = mkLiteral "#${config.stylix.base16Scheme.base0B}";
text-selected = mkLiteral "#${config.stylix.base16Scheme.base00}";
text-color = mkLiteral "#${config.stylix.base16Scheme.base05}";
border-color = mkLiteral "#${config.stylix.base16Scheme.base0F}";
urgent = mkLiteral "#${config.stylix.base16Scheme.base0E}";
};
"window" = {
transparency = "real";
width = mkLiteral "1000px";
location = mkLiteral "center";
anchor = mkLiteral "center";
fullscreen = false;
x-offset = mkLiteral "0px";
y-offset = mkLiteral "0px";
cursor = "default";
enabled = true;
border-radius = mkLiteral "15px";
background-color = mkLiteral "@bg";
};
"mainbox" = {
enabled = true;
spacing = mkLiteral "0px";
orientation = mkLiteral "horizontal";
children = map mkLiteral [
"imagebox"
"listbox"
];
background-color = mkLiteral "transparent";
};
"imagebox" = {
padding = mkLiteral "20px";
background-color = mkLiteral "transparent";
background-image = mkLiteral ''url("~/Pictures/Wallpapers/Rainnight.jpg", height)'';
orientation = mkLiteral "vertical";
children = map mkLiteral [
"inputbar"
"dummy"
"mode-switcher"
];
};
"listbox" = {
spacing = mkLiteral "20px";
padding = mkLiteral "20px";
background-color = mkLiteral "transparent";
orientation = mkLiteral "vertical";
children = map mkLiteral [
"message"
"listview"
];
};
"dummy" = {
background-color = mkLiteral "transparent";
};
"inputbar" = {
enabled = true;
spacing = mkLiteral "10px";
padding = mkLiteral "10px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "@bg-alt";
text-color = mkLiteral "@foreground";
children = map mkLiteral [
"textbox-prompt-colon"
"entry"
];
};
"textbox-prompt-colon" = {
enabled = true;
expand = false;
str = "";
background-color = mkLiteral "inherit";
text-color = mkLiteral "inherit";
};
"entry" = {
enabled = true;
background-color = mkLiteral "inherit";
text-color = mkLiteral "inherit";
cursor = mkLiteral "text";
placeholder = "Search";
placeholder-color = mkLiteral "inherit";
};
"mode-switcher" = {
enabled = true;
spacing = mkLiteral "20px";
background-color = mkLiteral "transparent";
text-color = mkLiteral "@foreground";
};
"button" = {
padding = mkLiteral "15px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "@bg-alt";
text-color = mkLiteral "inherit";
cursor = mkLiteral "pointer";
};
"button selected" = {
background-color = mkLiteral "@selected";
text-color = mkLiteral "@foreground";
};
"listview" = {
enabled = true;
columns = 1;
lines = 8;
cycle = true;
dynamic = true;
scrollbar = false;
layout = mkLiteral "vertical";
reverse = false;
fixed-height = true;
fixed-columns = true;
spacing = mkLiteral "10px";
background-color = mkLiteral "transparent";
text-color = mkLiteral "@foreground";
cursor = "default";
};
"element" = {
enabled = true;
spacing = mkLiteral "15px";
padding = mkLiteral "8px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "transparent";
text-color = mkLiteral "@text-color";
cursor = mkLiteral "pointer";
};
"element normal.normal" = {
background-color = mkLiteral "inherit";
text-color = mkLiteral "@text-color";
};
"element normal.urgent" = {
background-color = mkLiteral "@urgent";
text-color = mkLiteral "@text-color";
};
"element normal.active" = {
background-color = mkLiteral "inherit";
text-color = mkLiteral "@text-color";
};
"element selected.normal" = {
background-color = mkLiteral "@selected";
text-color = mkLiteral "@foreground";
};
"element selected.urgent" = {
background-color = mkLiteral "@urgent";
text-color = mkLiteral "@text-selected";
};
"element selected.active" = {
background-color = mkLiteral "@urgent";
text-color = mkLiteral "@text-selected";
};
"element-icon" = {
background-color = mkLiteral "transparent";
text-color = mkLiteral "inherit";
size = mkLiteral "36px";
cursor = mkLiteral "inherit";
};
"element-text" = {
background-color = mkLiteral "transparent";
text-color = mkLiteral "inherit";
cursor = mkLiteral "inherit";
vertical-align = mkLiteral "0.5";
horizontal-align = mkLiteral "0.0";
};
"message" = {
background-color = mkLiteral "transparent";
};
"textbox" = {
padding = mkLiteral "15px";
border-radius = mkLiteral "10px";
background-color = mkLiteral "@bg-alt";
text-color = mkLiteral "@foreground";
vertical-align = mkLiteral "0.5";
horizontal-align = mkLiteral "0.0";
};
"error-message" = {
padding = mkLiteral "15px";
border-radius = mkLiteral "20px";
background-color = mkLiteral "@bg";
text-color = mkLiteral "@foreground";
};
};
};
};
}

View file

@ -1,28 +1,29 @@
{ pkgs
, username
, profile
, ...
{
pkgs,
username,
profile,
...
}: {
home.packages = [
(import ./emopicker9000.nix { inherit pkgs; })
(import ./hm-find.nix { inherit pkgs; })
(import ./keybinds.nix { inherit pkgs; })
(import ./qs-keybinds.nix { inherit pkgs; })
(import ./note.nix { inherit pkgs; })
(import ./note-from-clipboard.nix { inherit pkgs; })
(import ./nvidia-offload.nix { inherit pkgs; })
(import ./rofi-launcher.nix { inherit pkgs; })
(import ./screenshootin.nix { inherit pkgs; })
(import ./squirtle.nix { inherit pkgs; })
(import ./task-waybar.nix { inherit pkgs; })
(import ./emopicker9000.nix {inherit pkgs;})
(import ./hm-find.nix {inherit pkgs;})
(import ./keybinds.nix {inherit pkgs;})
(import ./qs-keybinds.nix {inherit pkgs;})
(import ./note.nix {inherit pkgs;})
(import ./note-from-clipboard.nix {inherit pkgs;})
(import ./nvidia-offload.nix {inherit pkgs;})
(import ./rofi-launcher.nix {inherit pkgs;})
(import ./screenshootin.nix {inherit pkgs;})
(import ./squirtle.nix {inherit pkgs;})
(import ./task-waybar.nix {inherit pkgs;})
(import ./wallsetter.nix {
inherit pkgs;
inherit username;
})
(import ./web-search.nix { inherit pkgs; })
(import ./web-search.nix {inherit pkgs;})
# Cheatsheets viewer + parser
(import ./cheatsheets-parser.nix { inherit pkgs; })
(import ./qs-cheatsheets.nix { inherit pkgs; })
(import ./cheatsheets-parser.nix {inherit pkgs;})
(import ./qs-cheatsheets.nix {inherit pkgs;})
(import ./zcli.nix {
inherit pkgs profile;
backupFiles = [

View file

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

View file

@ -1,9 +1,11 @@
{ config, pkgs, ... }:
let
{
config,
pkgs,
...
}: let
gemini-launcher = pkgs.writeShellScriptBin "gemini-launcher" ''
#!${pkgs.bash}/bin/bash
# Define the path to your API key file
KEY_FILE="${config.home.homeDirectory}/gem.key"
@ -18,9 +20,7 @@ let
exec ${pkgs.kitty}/bin/kitty -e bash -c "echo 'NOTE: Gemini API key file not found at ~/.gem.key.'; echo 'To use a key, create this file with content: export GEMINI_API_KEY=\"YOUR_KEY\"'; echo; echo 'Starting Gemini CLI, which will fall back to web-based login...'; echo; exec ${pkgs.gemini-cli}/bin/gemini"
fi
'';
in
{
in {
home.packages = [
gemini-launcher
];
@ -32,6 +32,6 @@ in
exec = "gemini-launcher";
terminal = false;
type = "Application";
categories = [ "Development" "Utility" ];
categories = ["Development" "Utility"];
};
}

View file

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

View file

@ -1,4 +1,4 @@
{ pkgs }:
{pkgs}:
pkgs.writeShellScriptBin "list-keybinds" ''
# check if rofi is already running
if pidof rofi > /dev/null; then
@ -6,7 +6,7 @@ pkgs.writeShellScriptBin "list-keybinds" ''
fi
msg='☣️ NOTE ☣️: Clicking with Mouse or Pressing ENTER will have NO function'
# Parse keybind entries from the Nix config and format for rofi display
BIND_NIX="$HOME/zaneyos/modules/home/hyprland/binds.nix"
if [[ -f "$BIND_NIX" ]]; then
@ -16,18 +16,18 @@ pkgs.writeShellScriptBin "list-keybinds" ''
/noctaliaBind/ { in_block = 1; next }
/rofiBind/ { in_block = 1; next }
/bindd[ ]*=/ && /\[/ { in_block = 1; next }
in_block {
# Check for end of array
if (/^[ ]*\]/) {
in_block = 0
next
}
# Extract quoted string from line
if (match($0, /"([^"]+)"/, arr)) {
line = arr[1]
# Split by comma to get: mods, key, desc, action, params
n = split(line, parts, ",")
if (n >= 3) {
@ -35,17 +35,17 @@ pkgs.writeShellScriptBin "list-keybinds" ''
mods = parts[1]
key = parts[2]
desc = parts[3]
gsub(/^[ \t]+|[ \t]+$/, "", mods)
gsub(/^[ \t]+|[ \t]+$/, "", key)
gsub(/^[ \t]+|[ \t]+$/, "", desc)
# Build display keybind
if (mods != "" && key != "") {
display = mods " + " key
gsub(/\$modifier/, "SUPER", display)
gsub(/ +/, " ", display)
# Output: "KEYBIND: Description"
if (desc != "") {
printf "%s: %s\n", display, desc

View file

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

View file

@ -1,4 +1,4 @@
{ pkgs, ... }:
{pkgs, ...}:
pkgs.writeShellScriptBin "note" ''
# Colors for nice output
@ -16,7 +16,7 @@ pkgs.writeShellScriptBin "note" ''
# XDG-compliant notes directory and file
NOTES_DIR="$HOME/.local/share/notes"
NOTES_FILE="$NOTES_DIR/notes.txt"
# Create notes directory if it doesn't exist
mkdir -p "$NOTES_DIR"
@ -42,24 +42,24 @@ pkgs.writeShellScriptBin "note" ''
local note_text="$1"
local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
local date_only=$(date '+%Y-%m-%d')
# Create notes file if it doesn't exist
touch "$NOTES_FILE"
# Get next note number
local note_num=1
if [ -f "$NOTES_FILE" ] && [ -s "$NOTES_FILE" ]; then
note_num=$(grep -E "^#[0-9]+" "$NOTES_FILE" | sed 's/^#\([0-9]*\).*/\1/' | sort -n | tail -1)
note_num=$((note_num + 1))
fi
# Add the note with proper formatting
{
echo "#$note_num [$timestamp]"
echo "$note_text"
echo ""
} >> "$NOTES_FILE"
echo -e "''${GREEN}✓''${NC} Note #$note_num added ''${GRAY}($date_only)''${NC}"
}
@ -70,14 +70,14 @@ pkgs.writeShellScriptBin "note" ''
echo -e "''${GRAY}Use ''${CYAN}note <text>''${GRAY} to add your first note''${NC}"
return
fi
echo -e "''${BOLD}''${BLUE}📝 Your Notes''${NC}"
echo -e "''${GRAY}📁 $NOTES_FILE''${NC}"
echo -e "''${GRAY}$(printf '%.0s─' {1..50})''${NC}"
local in_note=false
local note_content=""
while IFS= read -r line; do
# Check if line starts with # followed by numbers and space and [
if echo "$line" | grep -q "^#[0-9][0-9]* \["; then
@ -86,13 +86,13 @@ pkgs.writeShellScriptBin "note" ''
echo -e "$note_content"
echo ""
fi
# Extract note number and timestamp
local num=$(echo "$line" | sed 's/^#\([0-9]*\) \[.*/\1/')
local timestamp=$(echo "$line" | sed 's/^#[0-9]* \[\(.*\)\]/\1/')
local date_part=$(echo "$timestamp" | cut -d' ' -f1)
local time_part=$(echo "$timestamp" | cut -d' ' -f2)
echo -e "''${BOLD}''${CYAN}#$num''${NC} ''${GRAY}[$date_part ''${YELLOW}$time_part''${GRAY}]''${NC}"
in_note=true
note_content=""
@ -113,13 +113,13 @@ pkgs.writeShellScriptBin "note" ''
note_content=""
fi
done < "$NOTES_FILE"
# Print last note if file doesn't end with empty line
if [ "$in_note" = true ] && [ -n "$note_content" ]; then
echo -e "$note_content"
echo ""
fi
local total_notes=$(grep -c "^#[0-9]" "$NOTES_FILE")
echo -e "''${GRAY}$(printf '%.0s─' {1..50})''${NC}"
echo -e "''${GRAY}Total: ''${BOLD}$total_notes''${NC} ''${GRAY}notes''${NC}"
@ -128,27 +128,27 @@ pkgs.writeShellScriptBin "note" ''
# Function to delete a note
delete_note() {
local note_num="$1"
if [ ! -f "$NOTES_FILE" ] || [ ! -s "$NOTES_FILE" ]; then
echo -e "''${RED}✗''${NC} No notes found"
return 1
fi
if ! echo "$note_num" | grep -q "^[0-9][0-9]*$"; then
echo -e "''${RED}✗''${NC} Invalid note number: $note_num"
return 1
fi
# Check if note exists
if ! grep -q "^#$note_num " "$NOTES_FILE"; then
echo -e "''${RED}✗''${NC} Note #$note_num not found"
return 1
fi
# Create temporary file without the specified note
local temp_file=$(mktemp)
local skip_lines=false
while IFS= read -r line; do
if echo "$line" | grep -q "^#[0-9][0-9]* "; then
local current_num=$(echo "$line" | sed 's/^#\([0-9]*\) .*/\1/')
@ -159,7 +159,7 @@ pkgs.writeShellScriptBin "note" ''
skip_lines=false
fi
fi
if [ "$skip_lines" = false ]; then
echo "$line" >> "$temp_file"
elif [ -z "$line" ]; then
@ -167,7 +167,7 @@ pkgs.writeShellScriptBin "note" ''
skip_lines=false
fi
done < "$NOTES_FILE"
mv "$temp_file" "$NOTES_FILE"
echo -e "''${GREEN}✓''${NC} Note #$note_num deleted"
}
@ -178,11 +178,11 @@ pkgs.writeShellScriptBin "note" ''
echo -e "''${YELLOW}📝 No notes to clear''${NC}"
return
fi
local total_notes=$(grep -c "^#[0-9]" "$NOTES_FILE")
echo -e "''${YELLOW}⚠''${NC} This will delete all $total_notes notes. Are you sure? ''${GRAY}[y/N]''${NC}"
read -r confirmation
if echo "$confirmation" | grep -qi "^y"; then
> "$NOTES_FILE"
echo -e "''${GREEN}✓''${NC} All notes cleared"
@ -204,7 +204,7 @@ pkgs.writeShellScriptBin "note" ''
piped_content="$piped_content"$'\n'"$line"
fi
done
if [ -n "$piped_content" ]; then
add_note "$piped_content"
else
@ -213,7 +213,7 @@ pkgs.writeShellScriptBin "note" ''
fi
return
fi
# Handle command line arguments
case "$1" in
"")

View file

@ -1,5 +1,4 @@
{ pkgs }:
{pkgs}:
pkgs.writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0

View file

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

View file

@ -1,5 +1,4 @@
{ pkgs }:
{pkgs}:
pkgs.writeShellScriptBin "screenshootin" ''
grim -g "$(slurp)" - | swappy -f -
''

View file

@ -1,23 +1,22 @@
{ pkgs }:
{pkgs}:
pkgs.writeShellScriptBin "squirtle" ''
echo "
 ████████ ██████
 ██████████████ ██████████
 ████████ ██████
 ██████████████ ██████████
 ████████████████████ ██████████████
 ████████████████████████ ██████████████
██████████████████████████████████████████
████████████████████████████████████████
██████████████████████████████████████
 ██████████████████████████████████
 ████████████████████████████████
 ██████████████████████████████
 ██████████████████████████
 ██████████████████████
 ██████████████████████
 ██████████████████████
 ████ ████████████
 ██████████
████████████████████████████████████████
██████████████████████████████████████
 ██████████████████████████████████
 ████████████████████████████████
 ██████████████████████████████
 ██████████████████████████
 ██████████████████████
 ██████████████████████
 ██████████████████████
 ████ ████████████
 ██████████
 ██████ 
"
''

View file

@ -1,5 +1,4 @@
{ pkgs }:
{pkgs}:
pkgs.writeShellScriptBin "task-waybar" ''
sleep 0.1
${pkgs.swaynotificationcenter}/bin/swaync-client -t &

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{pkgs, ...}:
pkgs.writeShellScriptBin "wallsetter" ''
TIMEOUT=720

View file

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

File diff suppressed because it is too large Load diff

View file

@ -1,13 +1,12 @@
# 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 = {
@ -22,7 +21,7 @@ in
"\n"
"$character"
];
directory = { style = accent; };
directory = {style = accent;};
character = {
success_symbol = "[❯](${accent})";

View file

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

View file

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

View file

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

View file

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

View file

@ -1,5 +1,4 @@
{ 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 (_: {
@ -9,8 +8,7 @@ let
shopt -u globstar
'';
});
in
{
in {
programs.ghostty = {
enable = true;
package = myGhostty; # to fix a but in current builds of ghostty

View file

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

View file

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

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