Compare commits

..

150 commits

Author SHA1 Message Date
Don Williams
9c0c13d3ca Added cpufrew power mgmt but disabled by default
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   hosts/default/host-packages.nix
2026-05-09 14:51:24 -04:00
Don Williams
a5ca67a7fb Added override for openssl-v1.1.1w needed by discord
Discord and direnv still call opnessl-v1.1.1w
Which is EOL

Addeing this override until they update their versions

 On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   modules/core/packages.nix
	modified:   modules/home/editors/vscode.nix
2026-05-01 11:10:11 -04:00
Don Williams
b7d06714bf Upd: latest kernel disable VFR in HL
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   flake.lock
	modified:   modules/core/boot.nix
	modified:   modules/home/hyprland/hyprland.nix
2026-04-25 04:06:46 -04:00
Don Williams
81c9573ea0 Removed bugsvim LUA code and nix file 2026-04-17 16:20:41 -04:00
Don Williams
408d1ede6d Updated flake after removing bugsvim
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   flake.lock
2026-04-17 16:14:41 -04:00
Don Williams
65ed66cab3 Removed neovim / treesitter overlays
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   modules/core/overlays.nix
2026-04-17 16:03:04 -04:00
Don Williams
5ec9a48d94 Removed bugsvim not worth effort
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   hosts/default/variables.nix
	modified:   hosts/zaneyos-24-vm/variables.nix
	modified:   hosts/zaneyos-next/variables.nix
	modified:   hosts/zaneyos-oem/variables.nix
	modified:   hosts/zos-nix-mirror/variables.nix
	modified:   modules/home/default.nix
	modified:   modules/options.nix
2026-04-17 16:01:58 -04:00
Don Williams
f3088ee10a added SHA hash for treesitter 2026-04-17 15:55:57 -04:00
Don Williams
72d852522d Fixing treesitter getting hash 2026-04-17 15:48:41 -04:00
Don Williams
df923a20ff pinning treesitter to 25.6
neovim is at 11.6 for snacks plugin compatiblity
Now treesitter must be set to match
pinning treesitter to 25.6

 On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   modules/core/overlays.nix
2026-04-17 15:39:31 -04:00
Don Williams
288dee5e72 Added the improved GPU detection to zlci/install script
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   modules/home/scripts/zcli.nix
2026-04-09 18:43:00 -04:00
Don Williams
03d38b6991 Upd flake to fix NIX CVE
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   flake.lock
modified:   flake.nix
modified:   hosts/zos-nix-mirror/variables.nix
modified:   modules/core/packages.nix
2026-04-07 20:03:22 -04:00
Don Williams
7ca10cff3a Added hyprshutdown 2026-04-05 17:32:42 -04:00
Don Williams
e12d75770f Added zos-nix-mirror host for testing mirror boot
On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	new file:   hosts/zos-nix-mirror/default.nix
	new file:   hosts/zos-nix-mirror/hardware-configuration.nix
	new file:   hosts/zos-nix-mirror/hardware.nix
	new file:   hosts/zos-nix-mirror/host-packages.nix
	new file:   hosts/zos-nix-mirror/variables.nix
2026-04-05 15:49:09 -04:00
Don Williams
710ff2683a Fixing issues with mirror drive boot 2026-04-05 15:16:17 -04:00
Don Williams
18c76fc667 Fixed boot mirror install issues
SDDM wouldn't start, and added python3 are required pkg
so install-zaneyos script works with mirrored boot drives

 On branch zos-next-grub
 Your branch is up to date with 'origin/zos-next-grub'.

 Changes to be committed:
	modified:   packages.nix
	modified:   ../home/install-zaneyos.sh
2026-04-05 14:49:37 -04:00
Don Williams
3b4f0e1128 Set branch to zos-next-grub 2026-04-05 13:43:08 -04:00
Don Williams
2b69ea7fd7 Added grub and BTRFS mirrored boot drives
Currently the mirrored option only works with the config that
matches the ddubs nix-iso project layout

 On branch zos-next-grub
 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   hosts/default/variables.nix
	modified:   modules/core/boot.nix
	modified:   modules/home/install-zaneyos.sh
	modified:   modules/options.nix
2026-04-05 13:37:35 -04:00
Don Williams
c9103d7edf Making more improvements to GPU detection 2026-04-04 14:26:51 -04:00
Don Williams
5689b4db97 Improving GPU detection 2026-04-04 13:31:27 -04:00
Don Williams
e9f38a2ccd Updated flake and CHANGELOG 2026-04-04 12:22:00 -04:00
Don Williams
dcc235c61b Fixed anonymous lambda 2026-04-04 12:05:11 -04:00
Don Williams
16e5cde4c6 Changed awww to flake input 2026-04-04 12:02:09 -04:00
Don Williams
b24637898b Added overlay to nvim 11.6 breaks snacks inline image 2026-04-04 11:46:02 -04:00
Don Williams
ae761a2c26 Removed nodePacakages.xxx not supported 2026-04-04 11:43:12 -04:00
Don Williams
fd663c28ca Updated CHANGELOG 2026-04-03 14:04:05 -04:00
Don Williams
02a9137346 Fixed gtk.gtk4 theme and git eval warnings
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/cli/git.nix
	modified:   modules/home/gtk.nix
2026-03-24 01:35:54 -04:00
Don Williams
89517a3996 Updated flake, fixed lualine error in nixvim
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   flake.lock
	modified:   modules/home/editors/nixvim.nix
2026-03-24 01:33:25 -04:00
Don Williams
0b088ae561 Updated flake 2026-03-20 22:48:27 -04:00
Don Williams
2bed1729a5 Update host settings
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   hosts/zaneyos-next/variables.nix
2026-03-20 22:31:41 -04:00
Don Williams
f5bee5d1d6 Updated flake 2026-03-20 20:55:50 -04:00
Don Williams
d09b4bc4c0 Updated flake 2026-03-19 04:18:42 -04:00
Don Williams
872fb5556c Updated CHANGELOG and version 2026-03-16 04:12:44 -04:00
Don Williams
c5cc844fd6 Hardening qs-wallpaper, qs-wlogout 2026-03-16 03:57:58 -04:00
Don Williams
cf0027b580 Switching to waybar on VM 2026-03-16 03:01:29 -04:00
Don Williams
1adff2c543 Switching to stdenv.cc 2026-03-16 02:46:12 -04:00
Don Williams
dc0ebda415 fixing build errors with bugsvim 2026-03-16 02:38:41 -04:00
Don Williams
886146aa28 Removed unwrapped clang 2026-03-16 02:35:15 -04:00
Don Williams
ad0fd3b202 bad package name 2026-03-16 02:31:18 -04:00
Don Williams
20c08c50d6 Switch to unwrapped gcc/clang for bugsvim 2026-03-16 02:28:44 -04:00
Don Williams
bac5511b8b Updated flake add gcc/clang build error 2026-03-16 02:25:40 -04:00
Don Williams
36a3b1e989 Added bugsvim to zos-next
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   hosts/default/variables.nix
	modified:   hosts/zaneyos-24-vm/variables.nix
	modified:   hosts/zaneyos-next/variables.nix
	modified:   hosts/zaneyos-oem/variables.nix
	modified:   modules/home/default.nix
	new file:   modules/home/editors/bugsvim-nvim/.luacheckrc
	new file:   modules/home/editors/bugsvim-nvim/.luarc.json
	new file:   modules/home/editors/bugsvim-nvim/.stylua.toml
	new file:   modules/home/editors/bugsvim-nvim/init.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/config/globals.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/config/lazy.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/config/options.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/html.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/init.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua
	new file:   modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua
	new file:   modules/home/editors/bugsvim.nix
	modified:   modules/options.nix
2026-03-16 02:08:14 -04:00
Don Williams
8513395fd9 Updated flake 2026-03-10 23:44:37 -04:00
Don Williams
f9caa87197 Removed old host 2026-03-08 13:32:35 -04:00
Don Williams
d6e1a6c1dd Merge branch 'zos-next-unstable' into 'zos-next'
Moving to unstable branch as test removed unneeded overlays

See merge request Zaney/zaneyos!191
2026-03-07 21:41:53 -05:00
Don Williams
1b8971aa20 Moving to unstable branch as test removed unneeded overlays 2026-03-07 21:41:53 -05:00
Don Williams
f1aaa44a9f Merge branch 'zos-next-unstable' into 'zos-next'
Added scrolling and monocle layouts - fixed SUPER J/K to be layout aware

See merge request Zaney/zaneyos!189
2026-03-04 18:46:59 -05:00
Don Williams
2654872867 Added scrolling and monocle layouts - fixed SUPER J/K to be layout aware 2026-03-04 18:46:58 -05:00
Don Williams
bc95bf78b8 Merge branch 'zos-next-unstable' into 'zos-next'
Move to unstable branch, dropped pyprland for DropTerminal many other fixes

See merge request Zaney/zaneyos!188
2026-03-04 17:43:44 -05:00
Don Williams
f1e6e37d1a Move to unstable branch, dropped pyprland for DropTerminal many other fixes 2026-03-04 17:43:44 -05:00
Don Williams
fd651fcca7 Updated flake
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
2026-03-04 00:33:56 -05:00
Don Williams
3c92bdc854 Updated flake
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
2026-03-02 04:05:34 -05:00
Don Williams
7bed90e2d2 Added overlay for deno and added nixpkgs stable to flake
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.nix
	modified:   modules/core/overlays.nix
2026-03-02 03:49:10 -05:00
Don Williams
56c5206e18 Removed comma after togglesplit 2026-02-26 17:47:41 -05:00
Don Williams
695959035b Fixed zos-next gpu setting 2026-02-26 15:43:07 -05:00
Don Williams
052b690e39 Typo in togglesplit command 2026-02-26 15:40:31 -05:00
Don Williams
acb3ddb125 Fixing GPU detection 2026-02-26 15:27:07 -05:00
Don Williams
bdcfb17a63 Updated flake and fixed HL binds for togglespit
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
        modified:   hosts/zaneyos-next/variables.nix
	modified:   modules/home/hyprland/binds.nix
2026-02-26 15:25:13 -05:00
Don Williams
a1104b4c1b Updated install scripts to detect newer AMD GPUs
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/home/install-zaneyos.sh
2026-02-24 18:29:40 -05:00
Don Williams
a69d86baa8 Updated flake, diabled zls, marksman 2026-02-19 19:46:34 -05:00
Don Williams
71629bd238 Updated zcli GPU detection script for newer AMD GPUs
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/scripts/zcli.nix
2026-02-19 18:47:15 -05:00
Don Williams
caefd49890 Removed kill binding didn't work 2026-02-16 23:15:53 -05:00
Don Williams
5d7497d5cf Added binding to kill hyprland if hung
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/hyprland/binds.nix
2026-02-16 23:00:04 -05:00
Don Williams
16f8835012 Updted CHANGELOG removing hyprpanel and webkitgtk
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
2026-02-16 22:35:45 -05:00
Don Williams
e73671b09b Removed hyprpanel feature. Not being updated noctalia replaced it
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/scripts/docs-parser.nix
	modified:   modules/home/scripts/qs-docs.nix
	modified:   modules/home/scripts/qs-panels.nix
	modified:   modules/home/scripts/qs-wallpapers-restore.nix
2026-02-16 22:31:03 -05:00
Don Williams
9a2f569365 Removed audactity made overlay to disble libepub
audactity and tumbler libepub causing webgitkit to build from source
which takes hours on every rebuild

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   ../flake.lock
	modified:   default/host-packages.nix
	deleted:    nixstation/default.nix
	deleted:    nixstation/hardware.nix
	deleted:    nixstation/host-packages.nix
	deleted:    nixstation/variables.nix
	modified:   zaneyos-24-vm/host-packages.nix
	modified:   zaneyos-next/host-packages.nix
	modified:   zaneyos-oem/host-packages.nix
2026-02-16 22:19:40 -05:00
Don Williams
bc3c7b8e74 Added overlay for tumbler disable EPUB causes webkitgtk to builld source
Only thumbnails for EPUB files are impacted

/nix/store/fn300dz18wisc4nkbhmhgs2mnxd1yj91-nixos-system-zaneyos-next-25.11.20260208.17b3e84
└───/nix/store/wb79p57khq59qxy5902dggldh93hjicp-system-path
    └───/nix/store/adaiszkbn3p7x0m2m11dziaam2gp82kn-tumbler-4.20.1
        └───/nix/store/wylxx7axqwzf7miy4g30m3g6j959328k-libgepub-0.7.3
            └───/nix/store/4i6mqkahm

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/core/overlays.nix
2026-02-16 22:00:26 -05:00
Don Williams
d54f3c37bf Added check for python3 to install script
I added a python script to better handle editing config files

 On branch zos-next
 Your branch is behind 'origin/zos-next' by 2 commits, and can be fast-forwarded.
   (use "git pull" to update your local branch)

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/home/install-zaneyos.sh
2026-02-09 19:07:37 -05:00
Don Williams
d44f5e6a6f Updated flake 2026-02-08 14:21:23 -05:00
Don Williams
dddfeb6ea7 Updated flake
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
2026-01-26 22:31:52 -05:00
Don Williams
f78bb9b67d Added overrides for default apps per host
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   FAQ.es.md
	modified:   FAQ.md
	modified:   hosts/default/variables.nix
	modified:   hosts/nixstation/variables.nix
	modified:   hosts/zaneyos-24-vm/variables.nix
	modified:   hosts/zaneyos-next/variables.nix
	modified:   hosts/zaneyos-oem/variables.nix
	modified:   modules/home/xdg.nix
	modified:   modules/options.nix
2026-01-26 09:10:58 -05:00
Don Williams
6253bf8a29 Added session-target to Hypridle.nix 2026-01-23 09:45:05 -05:00
Don Williams
c2f9e6cec2 Updted flake - added additional fonts 2026-01-23 01:03:56 -05:00
Don Williams
5e0c53ec12 Update flake 2026-01-20 17:21:04 -05:00
Don Williams
e82f67e56e Upd flake, changed markdown to multimarkdown
Pkg markdown caused dotnet and dotnet-swr to compile, which takes hours
 switched to mulitmarkdown
 Now dotnet packages come compiled dotnet-wrapped

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
	modified:   hosts/zaneyos-next/variables.nix
	modified:   modules/core/packages.nix
2026-01-15 17:40:47 -05:00
Don Williams
ce1355b40e Changed markdown to multimarkdown
markdown is .NET based and it caused dotnet and dotnet-swr to build
from source. Which takes hours

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/editors/evil-helix.nix
	modified:   modules/home/editors/nixvim.nix
2026-01-15 17:09:50 -05:00
Don Williams
f6eda0f4ac Disable AntiGravity editor - compiles dotnet-vmr 2026-01-15 11:48:56 -05:00
Don Williams
4afdb00d4e Updated noctalia input 2026-01-15 10:11:39 -05:00
Don Williams
343e371569 Getting noctalia to update on rebuilds/updates' 2026-01-15 10:01:15 -05:00
Don Williams
0fc2f6cc5b Updted flake set qs -c noctalia-shell to start 2026-01-15 09:54:15 -05:00
Don Williams
90706ee726 Ran analysis on zos-next vs main
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	new file:   ZaneyOS-zos-next-PreMerge-check-1-8.25.md
2026-01-08 05:02:56 -05:00
Don Williams
ac43e57694 Updated flake 2026-01-07 22:36:46 -05:00
Don Williams
6e8d5a2351 Updated CHANGELOG
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
2026-01-07 21:09:40 -05:00
Don Williams
8694b9552f Updated flake 2026-01-07 20:56:45 -05:00
Don Williams
f1a74345ac Disabled noctalia service, old revison loads
Updted the bindings and startup
Matches main branch

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/hyprland/binds.nix
	modified:   modules/home/hyprland/exec-once.nix
	modified:   modules/home/noctalia.nix
2026-01-06 01:26:52 -05:00
Don Williams
9c528312b8 Fixed typo and errors in noctalia.nix systemd
Also removed pypr from exec-once
Removed extra newline in dbus activation line

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/hyprland/exec-once.nix
	modified:   modules/home/noctalia.nix
2026-01-05 07:31:54 -05:00
Don Williams
ecf50e4a1d Ran nix fmt
No code changes

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/core/nfs.nix
	modified:   modules/core/printing.nix
	modified:   modules/core/sddm.nix
	modified:   modules/core/stylix.nix
	modified:   modules/core/thunar.nix
	modified:   modules/core/xserver.nix
	modified:   modules/home/cli/git.nix
	modified:   modules/home/hyprland/default.nix
	modified:   modules/home/hyprland/hyprland.nix
	modified:   modules/home/waybar/waybar-curved.nix
	modified:   profiles/amd/default.nix
	modified:   profiles/intel/default.nix
	modified:   profiles/nvidia-laptop/default.nix
	modified:   profiles/nvidia/default.nix
2026-01-04 17:11:54 -05:00
Don Williams
9c0111e5b9 Fixing syntax error in waybar file 2026-01-04 16:59:04 -05:00
Don Williams
44f91c805f Fixing alejandra error
The issue was that forAllSystems returns a set of system names (strings),
not packages. The formatter attribute needs to map each system to its
corresponding formatter package. I updated it to use
nixpkgs.legacyPackages.${system}.alejandra which correctly
references the alejandra package for each system architecture.

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.nix
2026-01-04 16:53:26 -05:00
Don Williams
0e969230eb Updated CHANGELOG 2026-01-03 16:51:38 -05:00
Don Williams
37bfbdb00e Updated flake after change to nix-systems
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
2026-01-03 16:45:09 -05:00
Don Williams
cddcfe970b Merge branch 'more_arm_changes' into 'zos-next'
switch to nix-systems

See merge request Zaney/zaneyos!180
2026-01-03 16:35:40 -05:00
Steven Scott
3176cb0dcd switch to nix-systems 2026-01-03 16:35:40 -05:00
Don Williams
12d2756ee7 Fix: Noctalia-shell started twice
Removed from exec-once  It's started as systemctl --user service

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/hyprland/exec-once.nix
2026-01-03 15:16:18 -05:00
Don Williams
9f1ebb8a5d Updated flake, added zos-next test host
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
	modified:   flake.nix
	new file:   hosts/zaneyos-next/default.nix
	new file:   hosts/zaneyos-next/hardware.nix
	new file:   hosts/zaneyos-next/host-packages.nix
	new file:   hosts/zaneyos-next/variables.nix
2026-01-03 15:08:51 -05:00
Don Williams
ea021d7a0d Merge branch 'home_packages_cleanup' into 'zos-next'
clean up home/default.nix

See merge request Zaney/zaneyos!179
2026-01-03 14:29:16 -05:00
Steven Scott
38cd7adda6 clean up home/default.nix 2026-01-03 12:50:28 -05:00
Don Williams
29a1d7716b Merge branch 'keyboard_wake' into 'zos-next'
enable keyboard wake from idle

See merge request Zaney/zaneyos!178
2026-01-01 00:32:05 -05:00
Steven Scott
b5f8d4576e enable keyboard wake from idle 2026-01-01 00:15:27 -05:00
Don Williams
dd329839b9 Added support for amd-nvidia-hybrid
Had to rename some varaibles. As there is also an intel-AMD hybrid
(I have an old one)  So later I will be adding that is also but this
amd-nvidia-hybrid is for current HW and amd-hybrid varaible was too
generic

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   ../install-zaneyos.sh
	modified:   ../modules/drivers/nvidia-amd-hybrid.nix
	modified:   ../modules/options.nix
	renamed:    amd-hybrid/default.nix -> amd-nvidia-hybrid/default.nix
	modified:   default.nix
2025-12-28 08:27:54 -05:00
Don Williams
459ff1afd0 updated binds for noctalia shell run from systemd
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/hyprland/binds.nix
2025-12-26 19:12:26 -05:00
Don Williams
9e3683d939 Merge branch 'arm_support' into 'zos-next'
add support for running on arm64 devices

See merge request Zaney/zaneyos!175
2025-12-26 19:00:06 -05:00
Steven Scott
b5648bdc83 add support for running on arm64 devices 2025-12-26 19:00:05 -05:00
Don Williams
eab3576258 Fixed pathing to noctalia config files
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/noctalia.nix
2025-12-26 16:53:41 -05:00
Don Williams
3a356dcfca Added systemd user service for noctalia
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/noctalia.nix
2025-12-26 16:45:57 -05:00
Don Williams
3f4c4d8e21 Removed incorrect module
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/core/default.nix
	deleted:    modules/core/noctalia-shell.nix
2025-12-26 16:38:39 -05:00
Don Williams
ab1ae81513 Added systemd service for noctalia-shell
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/core/default.nix
	new file:   modules/core/noctalia-shell.nix
2025-12-26 16:18:09 -05:00
Don Williams
8e0aac6837 Adding opt files back and hostid
I am restoring the other waybar & animations
options back to hosts/default/variables.nix
hostid is needed per host

 On branch zos-next
 Your branch is ahead of 'origin/zos-next' by 1 commit.
   (use "git push" to publish your local commits)

 Changes to be committed:
	modified:   hosts/default/variables.nix
2025-12-24 20:18:47 -05:00
Don Williams
975a419da3 Adding opts back to variables.nix 2025-12-24 20:18:37 -05:00
Don Williams
ae66771fb2 Added Caligula TUI for writing ISOs
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/core/packages.nix
2025-12-24 11:54:49 -05:00
Don Williams
1dd7d7a2a6 Merge branch 'flatpak_tweaks' into 'zos-next'
clean up flatpak

See merge request Zaney/zaneyos!173
2025-12-24 10:35:41 -05:00
Steven Scott
22c8133ebc clean up flatpak 2025-12-24 10:35:41 -05:00
Don Williams
f48eeac44c renamed scanner.nix to match scanners.nix in default.nix 2025-12-23 21:47:03 -05:00
Don Williams
d7eca39717 Updated CHANGELOG 2025-12-23 21:39:56 -05:00
Don Williams
1b3366577c Merge branch 'allow-sane-disabling' into 'zos-next'
add sane & local hardware clock options

See merge request Zaney/zaneyos!171
2025-12-23 21:25:32 -05:00
Steven Scott
e7047d9018 add sane & local hardware clock options 2025-12-23 21:25:32 -05:00
Don Williams
88c2272b61 Removed old upgrade docs, fixed ff2 sizing
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/fastfetch/fastfetch2.config.jsonc
	deleted:    modules/src/UPGRADE-2.3-to-2.4.es.md
	deleted:    modules/src/UPGRADE-2.3-to-2.4.md
	deleted:    modules/src/ZaneyOS-Upgrade.es.md
	deleted:    modules/src/ZaneyOS-Upgrade.md
	deleted:    modules/src/compare-zaneyos-config.sh
	deleted:    modules/src/revert-to-2.3.sh
	deleted:    modules/src/upgrade-2.3-to-2.4.sh
2025-12-23 17:30:14 -05:00
Don Williams
b3df6d414d Migrated fastfetches to zos
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/fastfetch/default.nix
	new file:   modules/home/fastfetch/fastfetch-system-times.config.jsonc
	new file:   modules/home/fastfetch/fastfetch1.config.jsonc
	new file:   modules/home/fastfetch/fastfetch2.config.jsonc
	new file:   modules/home/fastfetch/fastfetch3.config.jsonc
	new file:   modules/home/fastfetch/fastfetch4.config.jsonc
	new file:   modules/home/fastfetch/fastfetch5.config.jsonc
	modified:   modules/home/scripts/default.nix
	new file:   modules/home/scripts/ff.nix
	new file:   modules/home/scripts/ff1.nix
	new file:   modules/home/scripts/ff2.nix
	new file:   modules/home/scripts/ff3.nix
	new file:   modules/home/scripts/ff4.nix
	new file:   modules/home/scripts/ff5.nix
2025-12-23 17:18:10 -05:00
Don Williams
14f3f217cf Merge branch 'obs-studio_option' into 'zos-next'
allow obs studio to be disabled

See merge request Zaney/zaneyos!170
2025-12-23 02:06:59 -05:00
Steven Scott
ebbe6af5b1 allow obs studio to be disabled 2025-12-23 01:54:56 -05:00
Don Williams
22df7e11e4 Merge branch 'unstable_overlay' into 'zos-next'
add nixpkgs-unstable overlay

See merge request Zaney/zaneyos!169
2025-12-22 22:17:01 -05:00
Steven Scott
d10bb8dd1e add nixpkgs-unstable overlay 2025-12-22 21:38:33 -05:00
Don Williams
e445d7bb66 disabled smartd when VM is selected
Prevents rebuild switch failures

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   profiles/vm/default.nix
2025-12-22 18:09:19 -05:00
Don Williams
c183db84a4 Sorted/catagorized zcli help
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/scripts/zcli.nix
2025-12-22 16:45:25 -05:00
Don Williams
9ed856ea45 UPD: zcli add/del host update new feature list-hosts
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/scripts/zcli.nix
2025-12-22 16:31:47 -05:00
Don Williams
1ff5a24d47 Updated CHANGELOG 2025-12-22 16:01:04 -05:00
Don Williams
28efd07bbb removed zcli cleanup logging to zcli-cleanup-logs dir
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/scripts/zcli.nix
2025-12-22 15:20:33 -05:00
Don Williams
c83e8a504e Updating ZCLI to use new host paradigm not GPU
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/home/scripts/zcli.nix
2025-12-22 15:07:21 -05:00
Don Williams
490f46da09 Small formatting error and removed old error msg
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 14:43:37 -05:00
Don Williams
5a0c24742a removed helium brings in X11 pkgs.
Fixed summary info before install starts

 On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/core/overlays.nix
	modified:   modules/core/packages.nix
	modified:   modules/home/waybar/waybar-jak-catppuccin.nix
	modified:   modules/home/waybar/waybar-jak-ml4w-modern.nix
	modified:   modules/home/waybar/waybar-jak-oglo-simple.nix
	deleted:    pkgs/helium/default.nix
2025-12-22 14:39:34 -05:00
Don Williams
b5da1d723b Moving more functions to python
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	new file:   scripts/update_timezone.py
2025-12-22 14:30:04 -05:00
Don Williams
f67aa577a6 Hopefully last bash error
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 14:24:18 -05:00
Don Williams
049f569bcb Removed REPLACE banner and fixed bash script error
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 14:20:12 -05:00
Don Williams
c9cae4f3ae Moved editing variables to own script
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	new file:   scripts/update_vars.py
2025-12-22 14:16:12 -05:00
Don Williams
e219557b38 Trying python
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 14:07:51 -05:00
Don Williams
4efeb4b4cb SED attempt #2
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 14:04:03 -05:00
Don Williams
6b71f5ae81 going back to SED AWK not working
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 14:02:22 -05:00
Don Williams
8a4a32ba33 once more into the breech 2025-12-22 13:51:38 -05:00
Don Williams
a938f5c018 rewrite #1 2025-12-22 13:47:27 -05:00
Don Williams
8414db64d3 Trying again 2025-12-22 13:44:15 -05:00
Don Williams
9a0f22f2ef I hate awk/grep/regrex errors
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 13:40:39 -05:00
Don Williams
a20e469957 Fixing installer script
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-22 13:37:40 -05:00
Don Williams
28f7f562ac Install script pulled wrong branch 2025-12-22 13:25:49 -05:00
Don Williams
1c55718181 Adding helium to potentially replace brave
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/core/overlays.nix
	modified:   modules/core/packages.nix
	new file:   pkgs/helium/default.nix
2025-12-22 13:23:01 -05:00
Don Williams
73551e9e72 Updated ZOS-next version to 2.3.NG
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   modules/core/system.nix
2025-12-22 11:57:48 -05:00
Don Williams
c6c0a767a5 1st pass updating install and zcli to new paradigm
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/home/install-zaneyos.sh
2025-12-22 10:49:05 -05:00
Don Williams
24ef66e9e9 Merge branch 'options_module' into 'zos-next'
refactor variables.nix files with comments to an options module

See merge request Zaney/zaneyos!166
2025-12-22 10:42:18 -05:00
Steven Scott
81e3414421 refactor variables.nix files with comments to an options module 2025-12-22 10:42:17 -05:00
Don Williams
28a7e66e20 Merge branch 'fix_zcli_output' into 'zos-next'
fix output of `zcli list-gens`

See merge request Zaney/zaneyos!165
2025-12-21 00:37:34 -05:00
Steven Scott
736d5e2911 fix output of zcli list-gens 2025-12-21 00:37:33 -05:00
131 changed files with 3644 additions and 4926 deletions

View file

@ -5,442 +5,143 @@
---
# 🚀 **Current Release - ZaneyOS v2.6.1**
# 🚀 **Current Release - ZaneyOS v2.6.2**
- Removed `discord` and `discord-canary`
- They use an outdated `electron`
- That build uses and `openssl v1.1.1w`
- That ius OEL and marked insecure in NIXOS
- Users can use an alternativve client until discord is updated
- Disabled `zen browser` in `zaneyos/modules/home/default.nix`
- Needs to be migrated to being enabled via host variable
- Changed from `zen` to `latest` kernel
- Linux kernel v7.0 is much better than 6.19_zen
- Disabled `vfr = true;` in hyprland config
- It's not supportorted after `v54.3`
- Disabling now to avoid error on next update
- Added `awww` as flake input for installs < 25.11
- Fixed eval warnings:
- `gtk.gtk4.theme` set to `null`
- `git.signing.format` set to `null`
- `nixvim` lualine theme set to `auto`
- Changed to NixOS unstable branch
- Ported `DropTerminal` from `KoolDots` to ZaneyOS
- Replaces pyprland and some python dependencies
- Hyprland updated to v0.54
- Added support for scrolling and monocle layouts
- Fixed hyprland float-all bindings
- Updated Window Rules for new Hyprland format
- Disabled steam by default
- Removed `adb.enable` no longer supported and not needed for ZaneyOS
- Changed `nixfmt-rfc-style` package for updated `nitfmt`
- `nixfmt-rfc-style` no longer supported
- Fixed other evaluation warnings with `Xorg` package changes
#### 📅 **Updated: April 25th, 2026**
# 🚀 **Current Release - ZaneyOS v2.6.0**
- Moved to latest kernel vs. zen kernel
- Kernel 7.0.x is better than 6.19.zen
- Disabled `vfr` in hyprland config
- It's not supported post hyprland v0.54.3
#### 📅 **Updated: April 5th, 2026**
- Added support for grub
- Supports single drive w/grub
- Supports BTRFS mirrored boot drives
- Currenly only supporting ddubs `nix-iso` BTRFS mirror cfg
#### 📅 **Updated: April 3rd, 2026**
- Pinned `neovim` to v11.6
- `neovim` v12.0 breaks inline image preview in `snacks` plugin
- This only effects `bugsvim` neovim config
- `nixvim` and `nvf` don't use `snacks` plugin
- Swapped `awww` for `swww`
- `swww` is no longer maintained
- removed `--format xrgb` flag also no needed
- removed `--format xrgb` flag also not needed
- Added flake for `awww` was getting error on 25.11 installs of ZOS
#### 📅 **Updated: March 24th, 2026**
- Fixed `nixvim` config error
- `lualine` theme set to auto
- Fixed evaluation warnings
- `gtk.gtk4` theme set to `null`
- `git.signing.format` set to `null`
#### 📅 **Updated: March 16th, 2026**
- Fixed issues with `qs-wallpaper,qs-wlogout`
- Forced Qt/QML logs to console in qs-wallpapers, qs-vid-wallpapers, and qs-wlogout
- Soo the wrapper scripts can parse selections/commands when launched from Waybar/Rofi.
- Made disown non‑fatal in qs-wallpapers-apply, qs-vid-wallpapers-apply, and qs-wallpapers-restore.
#### 📅 **Updated: March 4th, 2026**
- Fixed eval warnings
- for XORG name changes
- `nixfmt-rfc-style` moved to `nixfmt`
- ZSH `dotDir` change in Home Manager
- Ported `DropTerminal` from KoolDots
- Replaces pyprland
- Moved to unstable branch, v26.05
- Recent upstream issues kept forcing me to patch to resolve
- Otherwise many large packages would build from source
- Fixed "Float All Windows" with Hyprland v0.54+
- Remapped `legacy keybinds menu` binding to Quickshell menu
- Fixed windowrule for Picture-in-Picture
- `$modifier` was in wrong location in config file.
- It was in the `general{}` section needs to be outside
- Updated the Window Rules for the new format in Hyprland v0.53+
- Removed the overlays and fixes needed when on Stable branch
#### 📅 **Updated: February 19th, 2026**
- Fixed `zcli` GPU detection for newer AMD GPUs
- Fixed the fix to properly detect VMs
- `nixvim.nix` changes
- Disabled Zig language server
- Disabled marksman language server
- Caused dotnet lib to be compiled (takes hours)
- Updated `zcli` GPU detection for newer AMD GPUs
- `nixvim.nix` Changes:
- Disabled Zig Language Server
- Wasn't using it
- Disabled Marksmand Language Server
- Caused dotnet libs to build from source (takes hours)
#### 📅 **Updated: February 16th, 2026**
- Removed `hyprpanel`
- No longer maintained
- Vendor created `wayle` to replace it
- Replaced in ZaneyOS with 'noctalia-shell'
- `webkitgtk` being built from source
- Removed audacity is called `wxwidgets`
- Created overlay for `tumbler` to disable `libepub`
- These caused the build from source issue
- Building `webkitgtk` takes hours every rebuild/update
#### 📅 **Updated: January 31st, 2026**
- Changed default login manager to `TUI`
- Issues recently (again) with SDDM and some GPUs
- Often related to SDDM wayland support option
- Some GPUs need it enabled, others disabled
#### 📅 **Updated: January 28th, 2026**
- Disabled gnome in stylix. Caused install failure
#### 📅 **Updated: January 26th, 2026**
- `noctalia-shell` regression:
- Removed `noctalia-shell` systemd service
- Caused old version of `noctalia-shell`
- Adjusted `noctalia-shell` bindings to match change
- Default applications now settable
- Globally for all hosts
- `zaneyos/modules/home/xdg.nix`
- Per host
- `zaneyos/hosts/HOSTNAME/variables.nix`
- Host settings override `xdg.nix` settings
#### 📅 **Updated: January 23rd, 2026**
- Added additional fonts
- Fixed issue with Hypridle and Home Manager
- Added `systemdTarget = "hyprland-session.target";`
- Thank you `Yang Kexuan` for the fix
- Reference issue: [5899](https://github.com/nix-community/home-manager/issues/5899)
#### 📅 **Updated: January 5th, 2026**
- Removed extra newline in `exec-once.nix`
- Fixed typo in `noctalia.nix`
- Added docs reference per systemd spec
- Improved code overall
- Thanks `lichen.gel.calm` for finding these issues
- Disabled `noctalia-shell` systemd service
- Caused older revision of `noctalia-shell` to load
- Now started from hyprland
#### 📅 **Updated: December 29th, 2025**
- Removed extra `noctalia-shell` startup
- Added initial support for AMD, NVIDIA Hybrid laptops
- Keypress to recover from DPMS now enabled by default
#### 📅 **Updated: December 21st, 2025**
- Added user systemd service for `noctalia-shell`
- Updated Hyprland bindings to accomodate change
- Updated `nixvim`
## `nixvim` Features Migrated from Bugsvim
#### Custom Diagnostic Icons
```lua
Error = " "
Warn = " "
Hint = ""
Info = ""
```
- Custom unicode symbols for each diagnostic severity level
- Integrated into vim.diagnostic.config() for gutter display
#### Diagnostic Display Options
- **Sign Column**: Shows diagnostic icons in the gutter with custom text and highlight groups
- **Virtual Text**: Inline diagnostics with custom prefix (`●`) and 2-space spacing
- **Virtual Lines**: Enhanced visibility for error context without cluttering
- **Underline**: Visual underline for error locations
- **Floating Window**: Hover diagnostics with rounded borders and source attribution
- **Severity Sorting**: Errors prioritized over warnings
### 2. Text Yank Highlighting
**Migration**: Highlight yanked text for 200ms (IncSearch highlight group)
- Autocmd-based implementation in extraConfigLua
- Uses vim.hl.on_yank for smooth visual feedback
### 3. LSP Attachment Keybindings
**Enhanced LSP Integration** with on-attach callbacks:
```
K - Hover documentation
gd - Goto definition
gD - Goto declaration
gi - Goto implementation
gr - References
<leader>rn - Rename symbol
<leader>ca - Code action
```
- Buffer-local scope prevents global pollution
- Guard against multiple registrations with flag check
### 4. Startup Dashboard
**Migration**: alpha-nvim with custom banner generation
#### Dynamic Header Generation
- Primary: `toilet -f ansi-shadow NIXOS`
- Secondary: `figlet -f "ANSI Shadow" NIXOS`
- Tertiary: `figlet NIXOS`
- Fallback: ASCII art banner (9 lines)
#### Dashboard Buttons
| Shortcut | Action | Command |
|----------|--------|---------|
| `f` | Find file | Telescope find_files |
| `r` | Recent files | Telescope oldfiles |
| `g` | Live grep | Telescope live_grep |
| `n` | New file | :enew |
| `e` | File browser | Neotree toggle |
| `q` | Quit | :qa |
#### Footer
Dynamic version display: `NixVim • Neovim X.Y.Z`
### 5. Theme Integration
**Migration**: Tokyo Night colorscheme with Stylix integration
- Tokyo Night colors for status line (lualine)
- Notify background color tied to Stylix palette: `#${config.lib.stylix.colors.base01}`
- Consistent color management across UI components
## Comprehensive Feature Set
### UI/Visuals Migrated
- Lualine status line (Tokyo Night theme)
- Bufferline for buffer management
- Indent-blankline for visual indentation
- Colorizer for inline color display
- Illuminate for reference highlighting
- Which-key for keybinding discovery (Helix preset)
### Core Editing
- Treesitter for syntax highlighting
- Neo-tree file browser
- Telescope fuzzy finder with media_files extension
- Project.nvim for project management
- Hop/Leap motion plugins
- vim-surround for text manipulation
- Comment.nvim for toggle comments
### Advanced Features
- snacks.nvim ecosystem (terminal, scratch buffers, zen mode, git integration, notifier)
- Noice for enhanced UI/messages
- Notify for notifications
- todo-comments for task navigation
- nvim-autopairs with Treesitter support
### Language Support
**LSP Servers**: nil_ls, lua_ls, pyright, ts_ls, html, cssls, clangd, zls, marksman, hyprls, tailwindcss, bashls
**Formatters**:
- Nix: alejandra
- Lua: stylua
- JavaScript/TypeScript: prettierd
- Shell: shfmt
**Completion**: blink-cmp with luasnip snippets
### Development Tools
- Git integration: gitsigns + diffview
- Markdown preview
- Trouble diagnostics panel
- Terminal: toggleterm with float direction
## Implementation Details
### Module Structure
- **File**: `modules/home/editors/nixvim.nix` (743 lines)
- **Framework**: Nixvim home-manager module
- **Theme**: Tokyo Night (primary), Catppuccin (fallback)
- **Runtime Tools**: 23+ packages (bat, chafa, fd, figlet, lazygit, prettierd, ripgrep, etc.)
## Keybinding Highlights
```
jk - Exit insert mode
<leader>ff - Find files
<leader>fm - Find media files
<leader>lg - Live grep
<leader>fe - File explorer toggle
<leader>t - Toggle terminal
<leader>. - Toggle comment (line/visual)
<leader>z - Zen mode
<leader>Z - Zoom
<leader>gg - Lazygit
<c-/> - Terminal (via snacks)
]t / [t - Next/prev TODO comment
<leader>n - Notification history
```
#### 📅 **Updated: December 21st, 2025**
- Added user systemd service for `noctalia-shell`
- Updated Hyprland bindings to accomodate change
- Updated `nixvim`
## `nixvim` Features Migrated from Bugsvim
#### Custom Diagnostic Icons
```lua
Error = " "
Warn = " "
Hint = ""
Info = ""
```
- Custom unicode symbols for each diagnostic severity level
- Integrated into vim.diagnostic.config() for gutter display
#### Diagnostic Display Options
- **Sign Column**: Shows diagnostic icons in the gutter with custom text and highlight groups
- **Virtual Text**: Inline diagnostics with custom prefix (`●`) and 2-space spacing
- **Virtual Lines**: Enhanced visibility for error context without cluttering
- **Underline**: Visual underline for error locations
- **Floating Window**: Hover diagnostics with rounded borders and source attribution
- **Severity Sorting**: Errors prioritized over warnings
### 2. Text Yank Highlighting
**Migration**: Highlight yanked text for 200ms (IncSearch highlight group)
- Autocmd-based implementation in extraConfigLua
- Uses vim.hl.on_yank for smooth visual feedback
### 3. LSP Attachment Keybindings
**Enhanced LSP Integration** with on-attach callbacks:
```
K - Hover documentation
gd - Goto definition
gD - Goto declaration
gi - Goto implementation
gr - References
<leader>rn - Rename symbol
<leader>ca - Code action
```
- Buffer-local scope prevents global pollution
- Guard against multiple registrations with flag check
### 4. Startup Dashboard
**Migration**: alpha-nvim with custom banner generation
#### Dynamic Header Generation
- Primary: `toilet -f ansi-shadow NIXOS`
- Secondary: `figlet -f "ANSI Shadow" NIXOS`
- Tertiary: `figlet NIXOS`
- Fallback: ASCII art banner (9 lines)
#### Dashboard Buttons
| Shortcut | Action | Command |
|----------|--------|---------|
| `f` | Find file | Telescope find_files |
| `r` | Recent files | Telescope oldfiles |
| `g` | Live grep | Telescope live_grep |
| `n` | New file | :enew |
| `e` | File browser | Neotree toggle |
| `q` | Quit | :qa |
#### Footer
Dynamic version display: `NixVim • Neovim X.Y.Z`
### 5. Theme Integration
**Migration**: Tokyo Night colorscheme with Stylix integration
- Tokyo Night colors for status line (lualine)
- Notify background color tied to Stylix palette: `#${config.lib.stylix.colors.base01}`
- Consistent color management across UI components
## Comprehensive Feature Set
### UI/Visuals Migrated
- Lualine status line (Tokyo Night theme)
- Bufferline for buffer management
- Indent-blankline for visual indentation
- Colorizer for inline color display
- Illuminate for reference highlighting
- Which-key for keybinding discovery (Helix preset)
### Core Editing
- Treesitter for syntax highlighting
- Neo-tree file browser
- Telescope fuzzy finder with media_files extension
- Project.nvim for project management
- Hop/Leap motion plugins
- vim-surround for text manipulation
- Comment.nvim for toggle comments
### Advanced Features
- snacks.nvim ecosystem (terminal, scratch buffers, zen mode, git integration, notifier)
- Noice for enhanced UI/messages
- Notify for notifications
- todo-comments for task navigation
- nvim-autopairs with Treesitter support
### Language Support
**LSP Servers**: nil_ls, lua_ls, pyright, ts_ls, html, cssls, clangd, zls, marksman, hyprls, tailwindcss, bashls
**Formatters**:
- Nix: alejandra
- Lua: stylua
- JavaScript/TypeScript: prettierd
- Shell: shfmt
**Completion**: blink-cmp with luasnip snippets
### Development Tools
- Git integration: gitsigns + diffview
- Markdown preview
- Trouble diagnostics panel
- Terminal: toggleterm with float direction
## Implementation Details
### Module Structure
- **File**: `modules/home/editors/nixvim.nix` (743 lines)
- **Framework**: Nixvim home-manager module
- **Theme**: Tokyo Night (primary), Catppuccin (fallback)
- **Runtime Tools**: 23+ packages (bat, chafa, fd, figlet, lazygit, prettierd, ripgrep, etc.)
## Keybinding Highlights
```
jk - Exit insert mode
<leader>ff - Find files
<leader>fm - Find media files
<leader>lg - Live grep
<leader>fe - File explorer toggle
<leader>t - Toggle terminal
<leader>. - Toggle comment (line/visual)
<leader>z - Zen mode
<leader>Z - Zoom
<leader>gg - Lazygit
<c-/> - Terminal (via snacks)
]t / [t - Next/prev TODO comment
<leader>n - Notification history
```
#### 📅 **Updated: December 21st, 2025**
- Updated:
- `nixvim.nix` now uses `blink-cmp` for completion/suggestions
- This replaces `nvim-cmp`
- `blink-cmp` is better, integrated in nixvim
- Removed LUA code related to `nvim-cmp`
- Removed `hyprpanel`
- Not being maintained
- Vendor is building it's replacement `wayle`
- It's been replaced by `noctalia-shell`
#### 📅 **Updated: January 6th, 2026**
- Disabled `noctalia-shell` service
- Caused old version to be loaded
- Re-Added `noctalia-shell` to Hyprland startup
- Removed `pypr` from Hyprland startup
- `pyprland` isn't used by default anymore
- Fixed error in waybar file
- Fixed `alejandra` error running `nix fmt`
- As a result of changing to `nix-systems`
#### 📅 **Updated: January 3rd, 2026**
- Changed:
- moved to `nix-systems`
- better management of Architecture types
- Fixed:
- Output of `zcli list-gens` corrected
- Thanks `@codingismy11to71`
- Pressing a key now also does DPMS wakeup
- Noctalia Shell started twice
- Removed it from hyprland exec-once
- It runs as systemctl user service
- Corrected the keybinds to work with systemd user service
- Cleanup:
- Home mgr packages
#### 📅 **Updated: December 24th, 2025**
- Added:
- Option to disable/enable scanners
- Hardware clock options enhanced
- Moved flatpak to own config file and out of flake.nix
- Thnaks [codingismy11to7](https://github.com/codingismy11to7)
- `Caligula` TUI for writing ISOs
#### 📅 **Updated: December 22th, 2025**
- Huge refactor in flake and how variables are handled
- Huge shout out to [codingismy11to7](https://github.com/codingismy11to7)
- Using hostname for flake, not GPU profile
- Greatly simplied functions to reference per-host variables
- Install script updated and now also uses Python for better text handling
- Same commands as before using `zcli` util.
- Removed redundant git clones during install
- Hosts are saved in the flake no need to `zcli update-host`
- Updated `zcli` `add-host` and `del-host` updated '
- New feature `zcli list-hosts` added
#### 📅 **Updated: December 20th, 2025**
- Refactored:
- Introduced `modules/options.nix` as a central location for `zaneyos` option definitions.
- Updated `flake.nix` to import `modules/core` directly.
- Documentation:
- Updated `README.md`, `WARP.md`, `FAQ.md`, and `cheatsheets/project-guide.md` to reflect the new structure.
- Updated Spanish documentation (`README.es.md`, `FAQ.es.md`, etc.).
#### 📅 **Updated: December 14th, 2025**

View file

@ -1,6 +1,6 @@
[English](FAQ.md) | [Español](FAQ.es.md)
# 💬 Preguntas frecuentes de ZaneyOS
# 💬 Preguntas frecuentes de ZaneyOS para v2.5.6
- **Fecha:** 14 de deciembre de 2025
@ -139,32 +139,6 @@ zcli doom status # Verifica estado de instalación
</div>
</details>
<details>
<summary>**¿Cómo configuro aplicaciones predeterminadas (PDF, navegador) por host?**</summary>
- Edita `~/zaneyos/hosts/<HOSTNAME>/variables.nix` y descomenta `mimeDefaultApps`.
- Home Manager usará esto vía `modules/home/xdg.nix` para escribir tu `~/.config/mimeapps.list`.
- Usa IDs `.desktop` reales de `/usr/share/applications` o `~/.local/share/applications`.
```nix
# hosts/<HOSTNAME>/variables.nix
# Aplicaciones predeterminadas a nivel de host (consumidas por xdg.mimeApps)
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Navegador web
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # o brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Archivos
# "inode/directory" = ["thunar.desktop"]; # gestor de archivos
# "text/plain" = ["nvim.desktop"]; # o code.desktop
# };
```
</details>
## Atajos Principales de Hyprland
A continuación se muestran los atajos de teclado para Hyprland, formateados para
@ -190,7 +164,7 @@ fácil referencia.
- `$modifier + C` → Ejecutar `hyprpicker -a`
- `$modifier + G` → Abrir `GIMP`
- `$modifier + V` → Mostrar historial de portapapeles vía `cliphist`
- `$modifier + T` → Alternar terminal con `pypr`
- `$modifier + Shift + T` → Alternar terminal desplegable con `DropTerminal`
- `$modifier + M` → Abrir `pavucontrol`
## Gestión de Ventanas
@ -264,6 +238,34 @@ fácil referencia.
<div style="margin-left: 20px;">
<details>
<summary>**¿Cómo configuro aplicaciones predeterminadas (PDF, navegador) por host?**</summary>
- Edita `~/zaneyos/hosts/<HOSTNAME>/variables.nix` dentro del bloque `zaneyos = { ... }` y descomenta `mimeDefaultApps`.
- Home Manager consume `zaneyos.mimeDefaultApps` vía `modules/home/xdg.nix` para escribir `~/.config/mimeapps.list`.
- Usa IDs `.desktop` reales de `/usr/share/applications` o `~/.local/share/applications`.
```nix
zaneyos = {
# ... otros ajustes ...
# Aplicaciones predeterminadas (consumidas por xdg.mimeApps)
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Navegador web
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # o brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Archivos
# "inode/directory" = ["thunar.desktop"]; # gestor de archivos
# "text/plain" = ["nvim.desktop"]; # o code.desktop
# };
};
```
</details>
<details>
<summary>**¿Cómo agrego flatpaks?**</summary>
@ -413,9 +415,9 @@ Edita la línea `extraMonitorSettings`. **Ejemplos:**
- Monitor Único: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Monitores Múltiples:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- Para configuraciones multi-monitor más complejas, puedes usar la aplicación
GUI, `nwg-displays` Esta mostrará tus monitores conectados actualmente
@ -479,7 +481,7 @@ agrega tus paquetes.
ncdu
nvtopPackages.full
oh-my-posh
pyprland
DropTerminal
shellcheck
multimarkdown
nodejs_23
@ -838,7 +840,7 @@ settings = {
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
"DropTerminal --spawn-only"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];

58
FAQ.md
View file

@ -1,6 +1,6 @@
[English](FAQ.md) | [Español](FAQ.es.md)
# 💬 ZaneyOS FAQ
# 💬 ZaneyOS FAQ for v2.5.6
- **Date:** 14-Decemnber-2025
@ -160,7 +160,7 @@ Below are the keybindings for Hyprland, formatted for easy reference.
- `$modifier + C` → Run `hyprpicker -a`
- `$modifier + G` → Open `GIMP`
- `$modifier + V` → Show clipboard history via `cliphist`
- `$modifier + T` → Toggle terminal with `pypr`
- `$modifier + Shift + T` → Toggle dropdown terminal with `DropTerminal`
- `$modifier + M` → Open `pavucontrol`
## Window Management
@ -231,25 +231,27 @@ Below are the keybindings for Hyprland, formatted for easy reference.
<details>
<summary>**How do I set default apps (PDF, browser) per host?**</summary>
- Edit `~/zaneyos/hosts/<HOSTNAME>/variables.nix` and uncomment `mimeDefaultApps`.
- Home Manager will consume these via `modules/home/xdg.nix` to write your `~/.config/mimeapps.list`.
- Edit `~/zaneyos/hosts/<HOSTNAME>/variables.nix` inside the `zaneyos = { ... }` block and uncomment `mimeDefaultApps`.
- Home Manager consumes `zaneyos.mimeDefaultApps` via `modules/home/xdg.nix` and writes `~/.config/mimeapps.list`.
- Use real `.desktop` IDs from `/usr/share/applications` or `~/.local/share/applications`.
```nix
# hosts/<HOSTNAME>/variables.nix
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
zaneyos = {
# ... other settings ...
# Default applications (picked up by HM xdg.mimeApps)
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
};
```
</details>
@ -401,9 +403,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Multiple Monitors:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- For more complex, multi-monitor configurations, you may wish to use the GUI
application, `nwg-displays` This will show your currently connected monitors
@ -467,7 +469,7 @@ packages.
ncdu
nvtopPackages.full
oh-my-posh
pyprland
DropTerminal
shellcheck
multimarkdown
nodejs_23
@ -824,7 +826,7 @@ settings = {
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
"DropTerminal --spawn-only"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
@ -1596,9 +1598,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Multiple Monitors:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- For more complex, multi-monitor configurations, you may wish to use the GUI
application, `nwg-displays` This will show your currently connected monitors
@ -1662,7 +1664,7 @@ packages.
ncdu
nvtopPackages.full
oh-my-posh
pyprland
DropTerminal
shellcheck
multimarkdown
nodejs_23
@ -2015,7 +2017,7 @@ settings = {
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
"DropTerminal --spawn-only"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];

View file

@ -4,7 +4,7 @@
## ZaneyOS 🟰 Mejores Configs ❄️ NixOS
\*\* Actualizado: 16 de enero de 2026
\*\* Actualizado: 8 de deciembre de 2025
ZaneyOS es una forma sencilla de reproducir mi configuración en cualquier sistema NixOS.
Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración y más.
@ -47,6 +47,13 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
- Guía para Principiantes de Nix: [English](cheatsheets/nix-beginner-guide.md) | [Español](cheatsheets/nix-beginner-guide.es.md)
- Guía de Personalización de Hyprland: [English](cheatsheets/hyprland-customization-guide.md) | [Español](cheatsheets/hyprland-customization-guide.es.md)
### Ten en cuenta:
> **Este proyecto tiene un [Wiki](https://zaney.org/wiki/zaneyos-2.3/). ¡Aprende a usar ZaneyOS aquí!**
> **ddubs ha puesto mucho esfuerzo en el
> [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq), así que debería ser preciso.
> Sin embargo, si notas que algo está mal, crea un issue o contáctanos en Discord.**
#### 🍖 Requisitos
- Debes estar ejecutando NixOS, versión 23.11+.
@ -82,6 +89,13 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
- Muchas personas pacientes y con ganas de ayudar te apoyan usando ZaneyOS.
- No dudes en pasar por el Discord para pedir ayuda.
<div align="center">
Hazte un favor y
[lee el wiki](https://zaney.org/wiki/zaneyos-2.3/).
</div>
#### 📦 ¿Cómo instalo paquetes?
- Puedes buscar en [Nix Packages](https://search.nixos.org/packages?) y
@ -95,7 +109,9 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
- Siéntete libre de abrir un issue en el repo. Por favor etiqueta las solicitudes
de funcionalidades comenzando el título con [feature request], ¡gracias!
- Contáctanos también en [Discord](https://discord.gg/XhZmNTnhtp) para una respuesta potencialmente más rápida.
- Contáctanos también en [Discord](https://discord.gg/2cRdBs8) para una respuesta potencialmente más rápida.
- No olvides revisar el [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq)
# Atajos de Hyprland
@ -123,7 +139,7 @@ A continuación los atajos de Hyprland, en formato de referencia rápida. La col
- `$modifier + O` → Lanzar `OBS Studio`
- `$modifier + Alt + C` → Selector de color
- `$modifier + G` → Abrir `GIMP`
- `$modifier + T` → Alternar terminal con `pypr`
- `$modifier + Shift + T` → Alternar terminal desplegable con `DropTerminal`
- `$modifier + Alt + M` → Abrir `pavucontrol`
### Gestión de ventanas
@ -224,7 +240,7 @@ Luego:
![Comando del script de instalación de ZaneyOS](img/install-script.jpg)
```
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
```
#### El proceso de instalación se verá así:
@ -255,7 +271,7 @@ nix-shell -p git vim
2. Clona este repo y entra:
```
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
cd zaneyos
También puedes ejecutar el script `install.sh` si quieres.
@ -295,9 +311,8 @@ Ahora, cuando quieras reconstruir, tienes el alias `fr` que reconstruye el flake
Gracias por toda su ayuda
- KoolDots https://github.com/LinuxBeginnings
- Jakookit https://github.com/jakookit
- Justaguylinux https://codeberg.org/Justaguylinux
- Justaguylinux https://github.com/drewgrif
- Jerry Starke https://github.com/JerrySM64
## ¡Disfruta!

View file

@ -4,7 +4,7 @@
## ZaneyOS 🟰 Best ❄️ NixOS Configs
\*\* Updated: January 16th, 2026
\*\* Updated: December 8th,2025
ZaneyOS is a simple way of reproducing my configuration on any NixOS system.
This includes the wallpaper, scripts, applications, config files, and more.
@ -55,6 +55,14 @@ This includes the wallpaper, scripts, applications, config files, and more.
[English](cheatsheets/hyprland-customization-guide.md) |
[Español](cheatsheets/hyprland-customization-guide.es.md)
### Please note:
> **This project has a [Wiki](https://zaney.org/wiki/zaneyos-2.3/). Find out how
> to use ZaneyOS here!** **ddubs has put a lot of effort into the
> [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq) so it should be accurate.
> However, please if you notice that something is wrong with it create an issue
> or reach out to us on Discord.**
#### 🍖 Requirements
- You must be running on NixOS, version 24.05+.
@ -94,6 +102,13 @@ This includes the wallpaper, scripts, applications, config files, and more.
running ZaneyOS.
- Feel free to reach out on the Discord for any help with anything.
<div align="center">
Please do yourself a favor and
[read the wiki](https://zaney.org/wiki/zaneyos-2.3/).
</div>
#### 📦 How To Install Packages?
- You can search the [Nix Packages](https://search.nixos.org/packages?) &
@ -108,9 +123,11 @@ This includes the wallpaper, scripts, applications, config files, and more.
- Please feel free to raise an issue on the repo, please label a feature request
with the title beginning with [feature request], thank you!
- Contact us on [Discord](https://discord.gg/XhZmNTnhtp) as well, for a potentially
- Contact us on [Discord](https://discord.gg/2cRdBs8) as well, for a potentially
faster response.
- Don't forget to checkout the [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq)
# Hyprland Keybindings
Below are the keybindings for Hyprland, formatted for easy reference. The right
@ -139,7 +156,7 @@ when `barChoice = "noctalia"`).
- `$modifier + O` → Launch `OBS Studio`
- `$modifier + Alt + C` → Color Picker
- `$modifier + G` → Open `GIMP`
- `$modifier + T` → Toggle terminal with `pypr`
- `$modifier + Shift + T` → Toggle dropdown terminal with `DropTerminal`
- `$modifier + Alt + M` → Open `pavucontrol`
### Window Management
@ -245,7 +262,7 @@ Then:
![ZaneyOS Install Script Command](img/install-script.jpg)
```
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
```
#### The install process will look something like this:
@ -276,7 +293,7 @@ nix-shell -p git vim
2. Clone this repo & enter it:
```
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
cd zaneyos
You can still run the `install.sh` script if you want to.
@ -291,33 +308,36 @@ cp -r hosts/default hosts/<your-desired-hostname>
git add .
```
4. Edit `hosts/<your-desired-hostname>/variables.nix`
```nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/hardware.nix```
4. Edit `hosts/<your-desired-hostname>/variables.nix`.
5. Edit `flake.nix` and fill in your username, profile, and hostname.
6. Generate your hardware.nix like so:
```
nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/hardware.nix
```
7. Run this to enable flakes and install the flake replacing hostname with
profile. I.e. `intel`, `nvidia`, `nvidia-laptop`, `amd-hybrid`, or `vm`
```
NIX_CONFIG="experimental-features = nix-command flakes"
sudo nixos-rebuild switch --flake .#profile
```
Now when you want to rebuild the configuration you have access to an alias
called `fr` that will rebuild the flake and you do not have to be in the
`zaneyos` folder for it to work.
</details>
### Special Recognitions:
Thank you for all your assistance
- KoolDots https://github.com/LinuxBeginnings
- JakKoolit https://github.com/Jakoolit
- Justaguylinux https://codeberg.org/Justaguylinux
- Jakookit https://github.com/jakookit
- Justaguylinux https://github.com/drewgrif
- Jerry Starke https://github.com/JerrySM64
## Hope you enjoy!
```

View file

@ -54,6 +54,8 @@ High-level architecture (big picture)
- hosts/<hostname>/
- default.nix imports hardware.nix and host-packages.nix.
- variables.nix is the primary control surface (display manager, terminal/browser defaults, waybarChoice, stylix image, 24h clock, Thunar/printing/NFS flags, intel/nvidia Bus IDs, etc.).
|- modules/options.nix
- Defines the schema for `zaneyos` configuration options (e.g. enable flags, theme choices).
|- modules/core
- Composes NixOS modules: boot, flatpak, fonts, hardware, network, nfs, nh, quickshell, packages, printing, display manager (greetd/sddm), security, services (PipeWire/SSH/Bluetooth/fstrim; smartd conditional), steam, stylix, syncthing, system (nix settings, locales, env), thunar, user (Home Manager), virtualization, xserver.
- quickshell.nix installs quickshell with Qt6 dependencies and required environment variables (needed for noctalia-shell).

View file

@ -0,0 +1,25 @@
# Pre-Merge Check — zos-next vs main (2026-01-08)
## Merge blockers
- `flake.nix` no longer passes `system` into `nixpkgs.lib.nixosSystem`; evaluation will fail. Add `system = "<arch>";`.
- `specialArgs` no longer includes `host`, but `modules/core/user.nix` still expects it. Re-add `host` to `specialArgs` (and pass to HM).
- `nixosConfigurations` keys changed from GPU-profile names to host names; scripts/docs (fr/fu, README examples) that call `.#amd`, `.#nvidia`, etc., will break unless updated.
## Design changes to verify
- New options schema (`modules/options.nix`); every host must set `zaneyos.gpuProfile` and `zaneyos.hostName`.
- Display manager selection via `zaneyos.displayManager`; both `ly` and `sddm` are imported and guarded by `mkIf`.
- Scanning moved to new `modules/core/scanners.nix`, gated by `zaneyos.scannerEnable` (default true) and adds `scanner` group.
- Boot logic now arch-aware: `systemd-boot` only on x86_64; `generic-extlinux-compatible` on aarch64; non-x86 uses generic kernel (not zen).
- `smartd` now follows `zaneyos.enableSmartD` (default true); set false for VMs to match old behavior.
- Host variables now live under `zaneyos = { … };` in each `hosts/<name>/variables.nix`.
- Home modules are always imported but gated (`tmuxEnable`, `weztermEnable`, `alacrittyEnable`, `ghosttyEnable`, `vscodeEnable`, `doomEmacsEnable`, etc.).
- `overlays.nix` adds `pkgs.unstable`; `packages.nix` includes an empty `unstablePkgs` list (currently unused).
## Recommended actions before merging
- Patch `flake.nix`: restore `system` and `host` in `specialArgs`, then run `nix flake check`.
- Update docs/aliases/scripts to the new host-based outputs or add compatibility wrappers for old profile targets.
- For VM hosts, set `zaneyos.enableSmartD = false`.
- Smoke-test on x86_64 and (if applicable) aarch64 to confirm bootloader/kernels.

View file

@ -1,58 +0,0 @@
# Add GNOME Desktop (overview)
This guide gives **basic steps** and **which files to edit** to add GNOME to ZaneyOS.
In NixOS, you enable it through NixOS options in a module (a `.nix` file), then pick a display manager (login screen).
This repo already has **SDDM** (graphical) and **LY** (text) login support. You can keep using either — both can start GNOME sessions.
## Files to edit (minimal list)
1. `modules/core/default.nix`
- Import your new GNOME module so it becomes part of the system config.
2. `modules/core/xserver.nix`
- GNOME needs `services.xserver.enable = true;` (this file currently disables X11).
3. `modules/core/gnome.nix` (new file you create)
- Turn on GNOME’s desktop manager.
4. `hosts/<hostname>/variables.nix`
- Make sure your `displayManager` is set to either `"sddm"` or `"tui"` (for LY), since those are already supported here.
## Suggested minimal GNOME module (example)
```nix path=null start=null
{ ... }:
{
services.xserver = {
enable = true;
desktopManager.gnome.enable = true;
};
}
```
## Where to import the GNOME module
In `modules/core/default.nix`, add your GNOME file to the imports list:
```nix path=null start=null
imports = [
# ...
./gnome.nix
# ...
];
```
## Flatpak: GNOME Extensions Manager
To add the Flatpak app **Extension Manager** (for GNOME extensions), edit `modules/core/flatpak.nix` and add its ID:
```nix path=null start=null
services.flatpak.packages = [
"com.mattjakeman.ExtensionManager"
];
```
## `git add .` and rebuild
Once you have the file created. In the ZaneyOS directory run `git add . ` then `zcli rebuild`

View file

@ -50,7 +50,7 @@ Ejemplo: Añadir copyq al inicio
# ...
exec-once = [
# ...
"pypr &"
"DropTerminal --spawn-only"
"copyq"
];
# ...

View file

@ -50,7 +50,7 @@ Example: Add copyq to autostart
# ...
exec-once = [
# ...
"pypr &"
"DropTerminal --spawn-only"
"copyq"
];
# ...

View file

@ -50,7 +50,7 @@ Lista de aplicaciones/comandos que se lanzan al iniciar Hyprland.
# ...
exec-once = [
# ...
"pypr &" # pyprland para terminal desplegable SUPERSHIFT + T
"DropTerminal --spawn-only" # precarga terminal desplegable (Super+Shift+T)
"copyq"
];
# ...

View file

@ -72,7 +72,7 @@ If you want to start the `copyq` application every time you log in, you can add
# ...
exec-once = [
# ...
"pypr &" # pyprland for drop down term SUPERSHIFT + T
"DropTerminal --spawn-only" # preload dropdown terminal (Super+Shift+T)
];
# ...
```
@ -83,7 +83,7 @@ If you want to start the `copyq` application every time you log in, you can add
# ...
exec-once = [
# ...
"pypr &" # pyprland for drop down term SUPERSHIFT + T
"DropTerminal --spawn-only" # preload dropdown terminal (Super+Shift+T)
"copyq"
];
# ...

283
flake.lock generated
View file

@ -1,27 +1,5 @@
{
"nodes": {
"alejandra": {
"inputs": {
"fenix": "fenix",
"flakeCompat": "flakeCompat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1777149230,
"narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=",
"owner": "kamadorueda",
"repo": "alejandra",
"rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f",
"type": "github"
},
"original": {
"owner": "kamadorueda",
"repo": "alejandra",
"type": "github"
}
},
"antigravity-nix": {
"inputs": {
"flake-utils": "flake-utils",
@ -52,11 +30,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1777136912,
"narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=",
"lastModified": 1776083220,
"narHash": "sha256-78QngptaPiKhlDuhUMrN/GDSHhXtEgMqnRSe3sjhjhM=",
"ref": "refs/heads/main",
"rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66",
"revCount": 1363,
"rev": "27d68a7b8b81b3b9afced39b32e06639d470c040",
"revCount": 1353,
"type": "git",
"url": "https://codeberg.org/LGFae/awww"
},
@ -103,11 +81,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1776754714,
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
"lastModified": 1760703920,
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github"
},
"original": {
@ -133,36 +111,14 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"alejandra",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1768113825,
"narHash": "sha256-f09fAifGPEuRrz1DFY910jexq0DaBuQBbq7WcxQIUgs=",
"owner": "nix-community",
"repo": "fenix",
"rev": "55106e04d905c6a7726d0f6be77ed39a99f66a61",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1776136500,
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
"lastModified": 1775176642,
"narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
"rev": "179704030c5286c729b5b0522037d1d51341022c",
"type": "github"
},
"original": {
@ -211,11 +167,11 @@
]
},
"locked": {
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@ -284,22 +240,6 @@
"type": "github"
}
},
"flakeCompat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -340,11 +280,11 @@
]
},
"locked": {
"lastModified": 1778503501,
"narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=",
"lastModified": 1777086106,
"narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a",
"rev": "5826802354a74af18540aef0b01bc1320f82cc17",
"type": "github"
},
"original": {
@ -362,11 +302,11 @@
]
},
"locked": {
"lastModified": 1777594677,
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
"lastModified": 1776184304,
"narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
"rev": "3c7524c68348ef79ce48308e0978611a050089b2",
"type": "github"
},
"original": {
@ -377,11 +317,11 @@
},
"mnw": {
"locked": {
"lastModified": 1777828893,
"narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
"lastModified": 1770419553,
"narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
"rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
"type": "github"
},
"original": {
@ -430,11 +370,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"lastModified": 1776877367,
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
"type": "github"
},
"original": {
@ -444,52 +384,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2"
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1778510615,
"narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
"lastModified": 1777080231,
"narHash": "sha256-gpx+FmYpBAO4toBmQzcmdR6gVvVxT969UlB7Xz2jbFA=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
"rev": "f6fd130ad3b95c3c039fd7f882825c49f7e70bde",
"type": "github"
},
"original": {
@ -506,11 +416,11 @@
"noctalia-qs": "noctalia-qs"
},
"locked": {
"lastModified": 1778464608,
"narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=",
"lastModified": 1777079905,
"narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"rev": "761869a561548874fe7e293b157fd7841576b367",
"rev": "a50c92167c8d438000270f7eca36f6eea74f388e",
"type": "github"
},
"original": {
@ -525,15 +435,15 @@
"noctalia",
"nixpkgs"
],
"systems": "systems_3",
"systems": "systems_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1778377995,
"narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=",
"lastModified": 1776585574,
"narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=",
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"rev": "d8327a723eed6dd9aebe8e0b162126f390e827df",
"rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add",
"type": "github"
},
"original": {
@ -554,11 +464,11 @@
]
},
"locked": {
"lastModified": 1777598946,
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
"lastModified": 1775228139,
"narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
"rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
"type": "github"
},
"original": {
@ -573,15 +483,19 @@
"flake-parts": "flake-parts_2",
"mnw": "mnw",
"ndg": "ndg",
"nixpkgs": "nixpkgs_2",
"systems": "systems_4"
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1778408907,
"narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
"lastModified": 1777062815,
"narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=",
"owner": "notashelf",
"repo": "nvf",
"rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
"rev": "41394699260ffc533a688d0ca5b8888bd5e64233",
"type": "github"
},
"original": {
@ -592,7 +506,6 @@
},
"root": {
"inputs": {
"alejandra": "alejandra",
"antigravity-nix": "antigravity-nix",
"awww": "awww",
"home-manager": "home-manager",
@ -602,26 +515,10 @@
"noctalia": "noctalia",
"nvf": "nvf",
"stylix": "stylix",
"systems": "systems_3",
"zen-browser": "zen-browser"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1768083390,
"narHash": "sha256-TGWPJq2mXwxfAe83iZ18DIqXC4sOSj7RkW9b59h6Ox4=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "e42e8ff582ba12a88b6845525d08b6428e6d0fb9",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
@ -652,20 +549,24 @@
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_3",
"gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_3",
"nixpkgs": [
"nixpkgs"
],
"nur": "nur",
"systems": "systems_5",
"systems": [
"systems"
],
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1778104276,
"narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
"lastModified": 1776893932,
"narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=",
"owner": "danth",
"repo": "stylix",
"rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
"rev": "84971726c7ef0bb3669a5443e151cc226e65c518",
"type": "github"
},
"original": {
@ -692,16 +593,16 @@
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"repo": "default-linux",
"type": "github"
}
},
@ -720,36 +621,6 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
@ -769,11 +640,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1777041405,
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
"lastModified": 1772661346,
"narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
"rev": "13b5b0c299982bb361039601e2d72587d6846294",
"type": "github"
},
"original": {
@ -785,11 +656,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1777169200,
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
"lastModified": 1772934010,
"narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
"rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
"type": "github"
},
"original": {
@ -801,11 +672,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1777463218,
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
"lastModified": 1772909925,
"narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
"rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
"type": "github"
},
"original": {
@ -844,11 +715,11 @@
]
},
"locked": {
"lastModified": 1778377655,
"narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=",
"lastModified": 1777058936,
"narHash": "sha256-H7XdcjRBA4UROm6KNi+mR+E22LW8vb0jRfoz1GHpPCo=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3",
"rev": "9027d5218172c3aa2060d43e599d3304c9c13bc0",
"type": "github"
},
"original": {

View file

@ -2,13 +2,22 @@
description = "ZaneyOS";
inputs = {
systems.url = "github:nix-systems/default-linux";
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nvf.url = "github:notashelf/nvf";
stylix.url = "github:danth/stylix/master";
nvf = {
url = "github:notashelf/nvf";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
stylix = {
url = "github:danth/stylix/master";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
noctalia = {
@ -20,6 +29,7 @@
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
# Google Antigravity (IDE)
@ -32,13 +42,9 @@
url = "github:0xc000022070/zen-browser-flake/beta";
inputs.nixpkgs.follows = "nixpkgs";
};
alejandra = {
url = "github:kamadorueda/alejandra";
inputs.nixpkgs.follows = "nixpkgs";
};
awww = {
url = "git+https://codeberg.org/LGFae/awww";
inputs.nixpkgs.follows = "nixpkgs";
url = "git+https://codeberg.org/LGFae/awww";
inputs.nixpkgs.follows = "nixpkgs";
};
};
@ -47,40 +53,42 @@
home-manager,
nixvim,
nix-flatpak,
alejandra,
systems,
...
} @ inputs: let
system = "x86_64-linux";
host = "zaneyos-24-vm";
profile = "vm";
username = "dwilliams";
forAllSystems = nixpkgs.lib.genAttrs (import systems);
# Deduplicate nixosConfigurations while preserving the top-level 'profile'
mkNixosConfig = gpuProfile:
mkNixosConfig = host:
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
./modules/core
./modules/drivers
./hosts/${host}
./profiles
];
};
in {
nixosConfigurations = {
amd = mkNixosConfig "amd";
nvidia = mkNixosConfig "nvidia";
nvidia-laptop = mkNixosConfig "nvidia-laptop";
amd-nvidia-hybrid = mkNixosConfig "amd-nvidia-hybrid";
intel = mkNixosConfig "intel";
vm = mkNixosConfig "vm";
};
formatter.x86_64-linux = inputs.alejandra.packages.x86_64-linux.default;
hosts = [
"zos-nix-mirror"
"zaneyos-next"
"default"
"zaneyos-24-vm"
"zaneyos-oem"
];
in {
nixosConfigurations = builtins.listToAttrs (map (host: {
name = host;
value = mkNixosConfig host;
})
hosts);
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
};
}

View file

@ -2,5 +2,6 @@
imports = [
./hardware.nix
./host-packages.nix
./variables.nix
];
}

View file

@ -1,8 +1,8 @@
{configs, pkgs, ...}: {
{config, pkgs, ...}: {
environment.systemPackages = with pkgs; [
# Add local pacakaged here
];
# Add host specific flatpaks here
services = {
flatpak = {
@ -11,6 +11,7 @@
};
};
# For power mangement on laptops
services.auto-cpufreq.enable = false;
services.auto-cpufreq.settings = {
@ -25,4 +26,5 @@
};
}

View file

@ -1,148 +1,148 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Don Williams";
gitEmail = "don.e.williams@gmail.com";
_: {
# Welcome to your ZaneyOS configuration!
# This block is where you can customize your NixOS experience.
#
# For a comprehensive list of all available options, their descriptions,
# and default values, please refer to the following file:
# ../../modules/options.nix
#
# You can override any of those options here. Most settings are optional
# and can be removed to use the project defaults.
zaneyos = {
# Git Configuration
gitUsername = "Tyler Kelley";
gitEmail = "tylerzanekelley@gmail.com";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "tui";
# does not have to be the same as the directory name, but
# would be common
hostName = "my-hostname";
# Emable/disable bundled applications
tmuxEnable = false;
alacrittyEnable = false;
weztermEnable = false;
ghosttyEnable = false;
vscodeEnable = false;
antigravityEnable = false; # Google port of vscodium
# Note: This is evil-helix with VIM keybindings by default
helixEnable = false;
#To install: Enable here, zcli rebuild, then run zcli doom install
doomEmacsEnable = false;
gpuProfile = "vm";
# Python development tools are included by default
# Set Display Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "sddm";
# Hyprland Settings
# Examples:
# extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1";
# extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1";
# You can configure multiple monitors.
# Inside the quotes, create a new line for each monitor.
extraMonitorSettings = "
monitor = Virtual-1,1920x1080@60,auto,1
";
# Emable/disable bundled applications
tmuxEnable = false;
alacrittyEnable = false;
weztermEnable = false;
ghosttyEnable = false;
vscodeEnable = false;
antigravityEnable = false; # Google port of vscodium
# Note: This is evil-helix with VIM keybindings by default
helixEnable = false;
#To install: Enable here, zcli rebuild, then run zcli doom install
doomEmacsEnable = false;
# Neovim config: "nixvim" | "nvf"
neovimConfig = "nixvim";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Program Options
# Set Default Browser (google-chrome-stable for google-chrome)
# This does NOT install your browser
# You need to install it by adding it to the `packages.nix`
# or as a flatpak
browser = "brave";
# Program Options
# Set Default Browser (google-chrome-stable for google-chrome)
# This does NOT install your browser
# You need to install it by adding it to the `packages.nix`
# or as a flatpak
browser = "brave";
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
# Default applications for this host (written to ~/.config/mimeapps.list)
# Uncomment and adjust to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Text files
# "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop
# # Images and video
# "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop
# "video/mp4" = ["mpv.desktop"]; # or vlc.desktop
# # Folders (file manager)
# "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop
# };
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# Bootloader selection
# bootLoader = "systemd-boot"; # or "grub"
# grubMirroredBoots = [
# { path = "/boot"; devices = [ "/dev/disk/by-uuid/XXXX" ]; }
# { path = "/boot2"; devices = [ "/dev/disk/by-uuid/YYYY" ]; }
# ];
# Enable NFS
enableNFS = true;
# Themes, waybar and animation.
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
#stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Enable Printing Support
printEnable = false;
# Set Waybar
# Available Options:
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Enable Thunar GUI File Manager
# Yazi is alternate File Manager
thunarEnable = true;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Themes, waybar and animation.
# Only uncomment your selection
# The others much be commented out.
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpaper-stripes-logo.png;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Waybar
# Available Options:
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
}

View file

@ -2,5 +2,6 @@
imports = [
./hardware.nix
./host-packages.nix
./variables.nix
];
}

View file

@ -1,149 +1,172 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "dwilliams";
gitEmail = "don.e.williams@gmail.com";
_: {
# Welcome to your ZaneyOS configuration!
# This block is where you can customize your NixOS experience.
#
# For a comprehensive list of all available options, their descriptions,
# and default values, please refer to the following file:
# ../../modules/options.nix
#
# You can override any of those options here. Most settings are optional
# and can be removed to use the project defaults.
zaneyos = {
# Git Configuration ( For Pulling Software Repos )
gitUsername = "dwilliams";
gitEmail = "don.e.williams@gmail.com";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "tui";
hostName = "zaneyos-24-vm";
# Emable/disable bundled applications
tmuxEnable = true;
alacrittyEnable = true;
weztermEnable = true;
ghosttyEnable = true;
vscodeEnable = true;
antigravityEnable = true; # Google port of vscodium
# Note: This is evil-helix with VIM keybindings by default
helixEnable = true;
#To install: Enable here, zcli rebuild, then run zcli doom install
doomEmacsEnable = true;
enableSmartD = false;
# Python development tools
pythonEnable = false;
gpuProfile = "vm";
# Hyprland Settings
# Examples:
# extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1";
# extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1";
# You can configure multiple monitors.
# Inside the quotes, create a new line for each monitor.
extraMonitorSettings = "
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "tui";
# Emable/disable bundled applications
tmuxEnable = true;
alacrittyEnable = true;
weztermEnable = true;
ghosttyEnable = true;
vscodeEnable = true;
antigravityEnable = true; # Google port of vscodium
# Note: This is evil-helix with VIM keybindings by default
helixEnable = true;
#To install: Enable here, zcli rebuild, then run zcli doom install
doomEmacsEnable = true;
# Neovim config: "nixvim" | "nvf"
neovimConfig = "nixvim";
# Python development tools
pythonEnable = true;
# Hyprland Settings
# Examples:
# extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1";
# extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1";
# You can configure multiple monitors.
# Inside the quotes, create a new line for each monitor.
extraMonitorSettings = "
";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "waybar";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Program Options
# Set Default Browser (google-chrome-stable for google-chrome)
# This does NOT install your browser
# You need to install it by adding it to the `packages.nix`
# or as a flatpak
browser = "google-chrome";
# Program Options
# Set Default Browser (google-chrome-stable for google-chrome)
# This does NOT install your browser
# You need to install it by adding it to the `packages.nix`
# or as a flatpak
browser = "brave";
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
# Default applications for this host (written to ~/.config/mimeapps.list)
# Uncomment and adjust to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Text files
# "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop
# # Images and video
# "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop
# "video/mp4" = ["mpv.desktop"]; # or vlc.desktop
# # Folders (file manager)
# "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop
# };
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# Enable NFS
enableNFS = true;
# Enable NFS
enableNFS = true;
# Enable Printing Support
printEnable = false;
# Enable Printing Support
printEnable = false;
# Enable Thunar GUI File Manager
# Yazi is default File Manager
thunarEnable = true;
# Enable Thunar GUI File Manager
# Yazi is default File Manager
thunarEnable = true;
# Themes, waybar and animation.
# Only uncomment your selection
# The others much be commented out.
# Themes, waybar and animation.
# Only uncomment your selection
# The others much be commented out.
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
#stylixImage = ../../wallpapers/Rainnight.jpg;
stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Waybar
# Available Options:
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Waybar
# Available Options:
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
}

View file

@ -0,0 +1,7 @@
{...}: {
imports = [
./hardware.nix
./host-packages.nix
./variables.nix
];
}

View file

@ -0,0 +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")
];
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/52c176b4-8de0-4607-b52f-8ca391f8b469";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6EA3-CBC7";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/mnt/nas" = {
device = "192.168.40.11:/volume1/DiskStation54TB";
fsType = "nfs";
};
swapDevices = [];
security.sudo.wheelNeedsPassword = false;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

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

View file

@ -0,0 +1,141 @@
_: {
# Welcome to your ZaneyOS configuration!
# This block is where you can customize your NixOS experience.
#
# For a comprehensive list of all available options, their descriptions,
# and default values, please refer to the following file:
# ../../modules/options.nix
#
# You can override any of those options here. Most settings are optional
# and can be removed to use the project defaults.
zaneyos = {
# Git Configuration
gitUsername = "Don Williams";
gitEmail = "don.e.williams@gmail.com";
# does not have to be the same as the directory name, but
# would be common
hostName = "zaneyos-next";
gpuProfile = "vm";
# Set Display Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "sddm";
# Emable/disable bundled applications
tmuxEnable = true;
alacrittyEnable = true;
weztermEnable = true;
ghosttyEnable = true;
vscodeEnable = true;
antigravityEnable = true; # Google port of vscodium
# Note: This is evil-helix with VIM keybindings by default
helixEnable = true;
#To install: Enable here, zcli rebuild, then run zcli doom install
doomEmacsEnable = true;
# Neovim config: "nixvim" | "nvf"
neovimConfig = "nixvim";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "waybar";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Program Options
# Set Default Browser (google-chrome-stable for google-chrome)
# This does NOT install your browser
# You need to install it by adding it to the `packages.nix`
# or as a flatpak
browser = "google-chrome-stable";
# Default applications for this host (written to ~/.config/mimeapps.list)
# Uncomment and adjust to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Text files
# "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop
# # Images and video
# "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop
# "video/mp4" = ["mpv.desktop"]; # or vlc.desktop
# # Folders (file manager)
# "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop
# };
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# Themes, waybar and animation.
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Waybar
# Available Options:
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
}

View file

@ -2,5 +2,6 @@
imports = [
./hardware.nix
./host-packages.nix
./variables.nix
];
}

View file

@ -1,129 +1,141 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Don Williams";
gitEmail = "don.e.williams@gmail.com";
_: {
# Welcome to your ZaneyOS configuration!
# This block is where you can customize your NixOS experience.
#
# For a comprehensive list of all available options, their descriptions,
# and default values, please refer to the following file:
# ../../modules/options.nix
#
# You can override any of those options here. Most settings are optional
# and can be removed to use the project defaults.
zaneyos = {
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Don Williams";
gitEmail = "don.e.williams@gmail.com";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI
# SDDM background is set with stylixImage
displayManager = "sddm";
gpuProfile = "vm";
# Emable/disable bundled applications
tmuxEnable = true;
alacrittyEnable = true;
weztermEnable = true;
ghosttyEnable = true;
vscodeEnable = true;
antigravityEnable = false; # Google port of vscodium
helixEnable = true;
#To install rebuild, then run zcli doom install
doomEmacsEnable = false;
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI
# SDDM background is set with stylixImage
displayManager = "sddm";
# Python development tools
pythonEnable = false;
# Emable/disable bundled applications
tmuxEnable = true;
alacrittyEnable = true;
weztermEnable = true;
ghosttyEnable = true;
vscodeEnable = true;
antigravityEnable = false; # Google port of vscodium
helixEnable = true;
#To install rebuild, then run zcli doom install
doomEmacsEnable = false;
# Neovim config: "nixvim" | "nvf"
neovimConfig = "nixvim";
# P10K or starship prompt
userPrompt = "starship";
# Hyprland Settings
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
# Hyprland Settings
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
# Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
# Default applications for this host (written to ~/.config/mimeapps.list)
# Uncomment and adjust to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Text files
# "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop
# # Images and video
# "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop
# "video/mp4" = ["mpv.desktop"]; # or vlc.desktop
# # Folders (file manager)
# "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop
# };
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# Enable NFS
enableNFS = true;
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# Enable Printing Support
printEnable = false;
# Enable NFS
enableNFS = true;
# Enable Thunar GUI File Manager
thunarEnable = true;
# Enable Printing Support
printEnable = false;
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
#stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Enable Thunar GUI File Manager
thunarEnable = true;
# Set Waybar
# Available options:
waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
#stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Animation style
# Available options are:
animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set Waybar
# Available options:
waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
}

View file

@ -0,0 +1,7 @@
{...}: {
imports = [
./hardware.nix
./host-packages.nix
./variables.nix
];
}

View file

@ -0,0 +1,63 @@
{ 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 = [ ];
# --- Btrfs Mirror (RAID1) Configuration ---
# Using UUID ensures the mirror mounts even if /dev/sda fails
fileSystems."/" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@" "compress=zstd" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@home" "compress=zstd" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@nix" "compress=zstd" "noatime" ];
};
fileSystems."/.snapshots" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@snapshots" "compress=zstd" ];
};
# --- Mirrored EFI Partitions ---
# Added 'nofail' so the VM boots even if one virtual disk is missing
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0C60-CCDC";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" "nofail" ];
};
fileSystems."/boot2" =
{ device = "/dev/disk/by-uuid/0C61-7F7C";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" "nofail" ];
};
fileSystems."/mnt/nas" =
{ device = "192.168.40.11:/volume1/DiskStation54TB";
fsType = "nfs";
options = [ "rw" "bg" "tcp" "_netdev" ];
};
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -0,0 +1,68 @@
{
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 = [];
# --- Btrfs Mirror (RAID1) Configuration ---
# Using UUID ensures the mirror mounts even if /dev/sda fails
fileSystems."/" = {
device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = ["subvol=@" "compress=zstd"];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = ["subvol=@home" "compress=zstd"];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = ["subvol=@nix" "compress=zstd" "noatime"];
};
fileSystems."/.snapshots" = {
device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = ["subvol=@snapshots" "compress=zstd"];
};
# --- Mirrored EFI Partitions ---
# Added 'nofail' so the VM boots even if one virtual disk is missing
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0C60-CCDC";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022" "nofail"];
};
fileSystems."/boot2" = {
device = "/dev/disk/by-uuid/0C61-7F7C";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022" "nofail"];
};
fileSystems."/mnt/nas" = {
device = "192.168.40.11:/volume1/DiskStation54TB";
fsType = "nfs";
options = ["rw" "bg" "tcp" "_netdev"];
};
swapDevices = [];
security.sudo.wheelNeedsPassword = false;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

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

View file

@ -0,0 +1,154 @@
_: {
# Welcome to your ZaneyOS configuration!
# This block is where you can customize your NixOS experience.
#
# For a comprehensive list of all available options, their descriptions,
# and default values, please refer to the following file:
# ../../modules/options.nix
#
# You can override any of those options here. Most settings are optional
# and can be removed to use the project defaults.
zaneyos = {
# Git Configuration
gitUsername = "Don Williams";
gitEmail = "don.e.williams@gmail.com";
# does not have to be the same as the directory name, but
# would be common
hostName = "zos-nix-mirror";
gpuProfile = "vm";
# Set Display Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "sddm";
# Emable/disable bundled applications
tmuxEnable = true;
alacrittyEnable = true;
weztermEnable = true;
ghosttyEnable = true;
vscodeEnable = true;
antigravityEnable = true; # Google port of vscodium
# Note: This is evil-helix with VIM keybindings by default
helixEnable = true;
#To install: Enable here, zcli rebuild, then run zcli doom install
doomEmacsEnable = true;
# Neovim config: "nixvim" | "nvf"
neovimConfig = "nixvim";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Program Options
# Set Default Browser (google-chrome-stable for google-chrome)
# This does NOT install your browser
# You need to install it by adding it to the `packages.nix`
# or as a flatpak
browser = "google-chrome-stable";
# Default applications for this host (written to ~/.config/mimeapps.list)
# Uncomment and adjust to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Text files
# "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop
# # Images and video
# "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop
# "video/mp4" = ["mpv.desktop"]; # or vlc.desktop
# # Folders (file manager)
# "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop
# };
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# Bootloader selection
bootLoader = "grub"; # or "grub"
grubMirroredBoots = [
{
path = "/boot";
devices = ["/dev/disk/by-uuid/0C60-CCDC"];
}
{
path = "/boot2";
devices = ["/dev/disk/by-uuid/0C61-7F7C"];
}
];
# Themes, waybar and animation.
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
#stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Waybar
# Available Options:
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
}

View file

@ -28,19 +28,22 @@ print_header() {
echo -e "${GREEN}╚═══════════════════════════════════════════════════════════════════════╝${NC}"
}
# Function to print a configuration summary
# Function to print a configuration summary (robust formatting)
print_summary() {
echo -e "${CYAN}╔═══════════════════════════════════════════════════════════════════════╗${NC}"
echo -e "${CYAN}║ 📋 Installation Configuration Summary ║${NC}"
echo -e "${CYAN}╠═══════════════════════════════════════════════════════════════════════╣${NC}"
echo -e "${CYAN}║ 🖥️ Hostname: ${BLUE}${1}${NC}"
echo -e "${CYAN}║ 🎮 GPU Profile: ${BLUE}${2}${NC}"
echo -e "${CYAN}║ 👤 System Username: ${BLUE}${3}${NC}"
echo -e "${CYAN}║ 🌐 Timezone: ${BLUE}${4}${NC}"
echo -e "${CYAN}║ ⌨️ Keyboard Layout: ${BLUE}${5}${NC}"
echo -e "${CYAN}║ ⌨️ Keyboard Variant: ${BLUE}${6:-none}${NC}"
echo -e "${CYAN}║ 🖥️ Console Keymap: ${BLUE}${7:-$5}${NC}"
echo -e "${CYAN}╚═══════════════════════════════════════════════════════════════════════╝${NC}"
local hostname="$1" profile="$2" user="$3" tz="$4" layout="$5" variant="$6" console="$7"
local v
v="${variant:-none}"
printf "%b\n" "${CYAN}╔═══════════════════════════════════════════════════════════════════════╗${NC}"
printf "%b\n" "${CYAN}║ 📋 Installation Configuration Summary ║${NC}"
printf "%b\n" "${CYAN}╠═══════════════════════════════════════════════════════════════════════╣${NC}"
printf "%b\n" "${CYAN}║ 🖥️ Hostname: ${BLUE}${hostname}${NC}"
printf "%b\n" "${CYAN}║ 🎮 GPU Profile: ${BLUE}${profile}${NC}"
printf "%b\n" "${CYAN}║ 👤 System Username: ${BLUE}${user}${NC}"
printf "%b\n" "${CYAN}║ 🌐 Timezone: ${BLUE}${tz}${NC}"
printf "%b\n" "${CYAN}║ ⌨️ Keyboard Layout: ${BLUE}${layout}${NC}"
printf "%b\n" "${CYAN}║ ⌨️ Keyboard Variant: ${BLUE}${v}${NC}"
printf "%b\n" "${CYAN}║ 🖥️ Console Keymap: ${BLUE}${console:-$layout}${NC}"
printf "%b\n" "${CYAN}╚═══════════════════════════════════════════════════════════════════════╝${NC}"
}
# Function to print an error message
@ -87,6 +90,14 @@ if ! command -v lspci &>/dev/null; then
exit 1
fi
# Check for python3 (required for helper scripts)
if ! command -v python3 &>/dev/null; then
print_error "python3 is not installed."
echo -e "Please install python3, then re-run the install script."
echo -e "Example: nix-shell -p python3"
exit 1
fi
if [ -n "$(grep -i nixos </etc/os-release)" ]; then
echo -e "${GREEN}Verified this is NixOS.${NC}"
else
@ -222,47 +233,16 @@ Please type out your choice: " profile
echo -e "${GREEN}Selected GPU profile: $profile${NC}"
fi
print_header "⚠️ CRITICAL WARNING - Existing ZaneyOS Detected"
print_header "Repository Setup"
backupname=$(date +"%Y-%m-%d-%H-%M-%S")
if [ -d "zaneyos" ]; then
echo -e "${RED}╔═══════════════════════════════════════════════════════════════════════╗${NC}"
echo -e "${RED}║ ⚠️ IMPORTANT WARNING ⚠️ ║${NC}"
echo -e "${RED}║ ║${NC}"
echo -e "${RED}║ An existing ZaneyOS installation was detected at ~/zaneyos ║${NC}"
echo -e "${RED}║ ║${NC}"
echo -e "${RED}║ This installer will COMPLETELY REPLACE your existing configuration! ║${NC}"
echo -e "${RED}║ All customizations, packages, and settings will be LOST! ║${NC}"
echo -e "${RED}║ ║${NC}"
echo -e "${RED}║ ** A backup copy of your config will be created ** ║${NC}"
echo -e "${RED}║ * You will have to merge your changes back ** ║${NC}"
echo -e "${RED}║ ║${NC}"
echo -e "${RED}╚═══════════════════════════════════════════════════════════════════════╝${NC}"
echo ""
echo -e "${YELLOW}If you REALLY want to do a fresh installation (losing all customizations):${NC}"
read -p "Type 'REPLACE' to continue with fresh install or Ctrl+C to cancel: " confirmation
if [ "$confirmation" != "REPLACE" ]; then
echo -e "${GREEN}Installation cancelled. ${NC}"
exit 0
fi
echo -e "${GREEN}zaneyos exists, backing up to .config/zaneyos-backups folder.${NC}"
if [ -d ".config/zaneyos-backups" ]; then
echo -e "${GREEN}Moving current version of ZaneyOS to backups folder.${NC}"
mv "$HOME"/zaneyos .config/zaneyos-backups/"$backupname"
sleep 1
else
echo -e "${GREEN}Creating the backups folder & moving ZaneyOS to it.${NC}"
mkdir -p .config/zaneyos-backups
mv "$HOME"/zaneyos .config/zaneyos-backups/"$backupname"
sleep 1
fi
else
echo -e "${GREEN}Thank you for choosing ZaneyOS.${NC}"
echo -e "${GREEN}I hope you find your time here enjoyable!${NC}"
if [ -d "$HOME/zaneyos" ]; then
echo -e "${YELLOW}Backing up existing zaneyos-${backupname}${NC}"
mv "$HOME/zaneyos" "$HOME/zaneyos-${backupname}"
fi
print_header "Cloning ZaneyOS Repository"
git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
git clone https://gitlab.com/zaney/zaneyos.git -b zos-next-grub --depth=1 ~/zaneyos
cd ~/zaneyos || exit 1
print_header "Git Configuration"
@ -380,7 +360,8 @@ echo ""
print_summary "$hostName" "$profile" "$installusername" "$timezone" "$keyboardLayout" "$keyboardVariant" "$consoleKeyMap"
echo ""
echo -e "${YELLOW}Please review the configuration above.${NC}"
read -p "$(echo -e "${YELLOW}Continue with installation? (Y/N): ${NC}")" -n 1 -r
printf "%b" "${YELLOW}Continue with installation? (Y/N): ${NC}"
read -r REPLY
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo -e "${RED}Installation cancelled.${NC}"
@ -391,48 +372,45 @@ echo ""
echo -e "${GREEN}✓ Configuration accepted. Starting installation...${NC}"
echo ""
echo -e "${BLUE}Updating configuration files...${NC}"
echo -e " ${CYAN}installusername:${NC} $installusername"
echo -e " ${CYAN}hostName:${NC} $hostName"
echo -e " ${CYAN}profile:${NC} $profile"
echo -e " ${CYAN}timezone:${NC} $timezone"
echo -e " ${CYAN}keyboardLayout:${NC} $keyboardLayout"
echo " installusername: $installusername"
echo " hostName: $hostName"
echo " profile: $profile"
# Update flake.nix (simple pattern replacements that work)
# Create backup first, before any changes
# Update flake.nix safely without removing existing hosts
cp ./flake.nix ./flake.nix.bak
# Use sed for hostname (more reliable)
sed -i 's|^[[:space:]]*host[[:space:]]*=[[:space:]]*"[^"]*"| host = "'$hostName'"|' ./flake.nix.bak
# Use sed for profile (handles variable indentation)
sed -i 's|^[[:space:]]*profile[[:space:]]*=[[:space:]]*"[^"]*";| profile = "'$profile'";|' ./flake.nix.bak
# Use sed for username (handles variable indentation)
sed -i 's|^[[:space:]]*username[[:space:]]*=[[:space:]]*"[^"]*";| username = "'$installusername'";|' ./flake.nix.bak
echo -e "${GREEN}After sed replacements:${NC}"
grep -E "(host|profile|username) =" ./flake.nix.bak
cp ./flake.nix.bak ./flake.nix
rm ./flake.nix.bak
# Update timezone in system.nix
# 1) Update username if present
sed -i -E "s|^[[:space:]]*username[[:space:]]*=[[:space:]]*\"[^\"]*\";| username = \"${installusername}\";|" ./flake.nix
# 2) Ensure the new host is listed in the hosts array (append if missing)
awk -v h="$hostName" '
BEGIN { in_hosts=0; seen=0 }
/^\s*hosts\s*=\s*\[/ { in_hosts=1 }
in_hosts && /"[^"]+"/ {
if (index($0, "\"" h "\"") > 0) seen=1
}
in_hosts && /\];/ {
if (!seen) print " \"" h "\""
in_hosts=0
}
{ print }
' ./flake.nix >./flake.nix.tmp && mv ./flake.nix.tmp ./flake.nix
# (quiet) flake updated
# Update timezone in system.nix (robust quoting via Python helper)
cp ./modules/core/system.nix ./modules/core/system.nix.bak
awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak >./modules/core/system.nix
python3 ./scripts/update_timezone.py ./modules/core/system.nix "$timezone" || {
print_error "Failed to update time.timeZone in modules/core/system.nix"
exit 1
}
rm ./modules/core/system.nix.bak
# Update variables in host file (do all keys in one pass to avoid quoting issues)
# Update variables in host file; support both old style and new zaneyos options block
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
awk -v v_user="$gitUsername" \
-v v_email="$gitEmail" \
-v v_kb="$keyboardLayout" \
-v v_kv="$keyboardVariant" \
-v v_ckm="$consoleKeyMap" '
/^ gitUsername = / { sub(/"[^"]*"/, "\"" v_user "\"") }
/^ gitEmail = / { sub(/"[^"]*"/, "\"" v_email "\"") }
/^ keyboardLayout = / { sub(/"[^"]*"/, "\"" v_kb "\"") }
/^ keyboardVariant = / { sub(/"[^"]*"/, "\"" v_kv "\"") }
/^ consoleKeyMap = / { sub(/"[^"]*"/, "\"" v_ckm "\"") }
{ print }
' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix
python3 ./scripts/update_vars.py "./hosts/$hostName/variables.nix" \
"$gitUsername" "$gitEmail" "$hostName" "$profile" "$keyboardLayout" "$keyboardVariant" "$consoleKeyMap" || {
print_error "Failed to update hosts/$hostName/variables.nix"
echo "Check the file exists and the script at ./scripts/update_vars.py is present."
exit 1
}
rm ./hosts/$hostName/variables.nix.bak
echo "Configuration files updated successfully!"
@ -444,21 +422,22 @@ git add .
git config --global --unset-all user.name
git config --global --unset-all user.email
print_header "Generating Hardware Configuration -- Ignore ERROR: cannot access /bin"
print_header "Generating Hardware Configuration"
sudo nixos-generate-config --show-hardware-config >./hosts/$hostName/hardware.nix
print_header "Setting Nix Configuration"
NIX_CONFIG="experimental-features = nix-command flakes"
print_header "Initiating NixOS Build"
read -p "Ready to run initial build? (Y/N): " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
printf "%s" "Ready to run initial build? [y/N]: "
read -r REPLY
if ! [[ "$REPLY" =~ ^[Yy]$ ]]; then
echo -e "${RED}Build cancelled.${NC}"
exit 1
fi
sudo nixos-rebuild boot --flake ~/zaneyos/#${profile}
# Build using the selected HOST (GPU profile is configured inside the host files)
sudo nixos-rebuild boot --flake ~/zaneyos#${hostName}
# Check the exit status of the last command (nixos-rebuild)
if [ $? -eq 0 ]; then

View file

@ -2,14 +2,36 @@
pkgs,
config,
...
}: {
}: let
inherit (pkgs.stdenv.hostPlatform) isx86_64 isAarch64;
cfg = config.zaneyos;
in {
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelPackages =
if isx86_64
then pkgs.linuxPackages_latest
else pkgs.linuxPackages_zen;
kernelModules = ["v4l2loopback"];
extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
kernel.sysctl = {"vm.max_map_count" = 2147483642;};
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
loader = {
grub = {
enable = cfg.bootLoader == "grub";
device = "nodev";
efiSupport = true;
mirroredBoots = cfg.grubMirroredBoots;
};
systemd-boot.enable = isx86_64 && cfg.bootLoader == "systemd-boot";
efi.canTouchEfiVariables = true;
# this is the bootloader used for raspberry pi 4.
# we will presumably need more fine-grained configuration for what
# bootloader to use.
generic-extlinux-compatible.enable = isAarch64 && cfg.bootLoader != "grub";
};
# Appimage Support
binfmt.registrations.appimage = {
wrapInterpreterInShell = false;

View file

@ -1,12 +1,6 @@
{
inputs,
host,
...
}: let
# Import the host-specific variables.nix
vars = import ../../hosts/${host}/variables.nix;
in {
{inputs, ...}: {
imports = [
../options.nix
./boot.nix
./flatpak.nix
./fonts.nix
@ -15,14 +9,12 @@ in {
./nfs.nix
./nh.nix
./quickshell.nix
./overlays.nix
./packages.nix
./printing.nix
# Conditionally import the display manager module
(
if vars.displayManager == "tui"
then ./ly.nix
else ./sddm.nix
)
./ly.nix
./sddm.nix
./scanners.nix
./security.nix
./services.nix
./steam.nix

View file

@ -1,9 +1,8 @@
{pkgs, ...}: {
xdg.portal = {
enable = true;
extraPortals = [pkgs.xdg-desktop-portal-hyprland];
configPackages = [pkgs.hyprland];
};
{inputs, ...}: {
imports = [
inputs.nix-flatpak.nixosModules.nix-flatpak
];
services = {
flatpak = {
enable = true;
@ -15,7 +14,7 @@
#"com.github.tchx84.Flatseal" #Manage flatpak permissions - should always have this
#"com.rtosta.zapzap" # WhatsApp client
#"io.github.flattool.Warehouse" # Manage flatpaks, clean data, remove flatpaks and deps
#"it.mijorus.gearlever" # Manage and support AppImages
#"it.mijorus.gearlever" # Manage and support AppImages
#"io.github.freedoom.Phase1" # Classic Doom FPS 1
#"io.github.freedoom.Phase2" # Classic Doom FPS 2
#"io.github.dvlv.boxbuddyrs" # Manage distroboxes
@ -24,7 +23,7 @@
# Add other Flatpak IDs here, e.g., "org.mozilla.firefox"
];
# Optional: Automatically update Flatpaks when you run nixos-rebuild swit ch
# Optional: Automatically update Flatpaks when you run nixos-rebuild switch
update.onActivation = true;
};
};

View file

@ -9,6 +9,7 @@
ibm-plex
inter
jetbrains-mono
lilex
material-icons
maple-mono.NF
minecraftia

View file

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

View file

@ -1,13 +1,9 @@
{
host,
config,
lib,
...
}: let
# Import the host-specific variables.nix
vars = import ../../hosts/${host}/variables.nix;
useLy = vars.displayManager == "tui";
in {
config = lib.mkIf useLy {
}: {
config = lib.mkIf (config.zaneyos.displayManager == "tui") {
# Prefer ly when TUI is selected; avoid greetd conflicts
services.greetd.enable = lib.mkDefault false;

View file

@ -1,14 +1,14 @@
{
pkgs,
host,
options,
config,
...
}: let
inherit (import ../../hosts/${host}/variables.nix) hostId;
inherit (config.zaneyos) hostName hostId;
in {
networking = {
hostName = "${host}";
hostId = hostId;
inherit hostName;
inherit hostId;
networkmanager.enable = true;
timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
firewall = {

View file

@ -1,5 +1,5 @@
{host, ...}: let
inherit (import ../../hosts/${host}/variables.nix) enableNFS;
{config, ...}: let
inherit (config.zaneyos) enableNFS;
in {
services = {
rpcbind.enable = enableNFS;

View file

@ -2,6 +2,8 @@
nixpkgs.overlays = [
# Provide pkgs.google-antigravity via antigravity-nix overlay
inputs.antigravity-nix.overlays.default
# Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk
(_final: prev: {
xfce = prev.xfce // {

View file

@ -1,19 +1,21 @@
{
inputs,
pkgs,
host,
config,
...
}: let
vars = import ../../hosts/${host}/variables.nix;
inherit (vars) barChoice;
inherit (config.zaneyos) barChoice;
# Noctalia-specific packages
# gpu-screen-recorder requires x86_64 architecture
noctaliaPkgs =
if barChoice == "noctalia"
if pkgs.stdenv.hostPlatform.isx86_64 && barChoice == "noctalia"
then
with pkgs; [
matugen # color palette generator needed for noctalia-shell
app2unit # launcher for noctalia-shell
gpu-screen-recorder # needed for nnoctalia-shell
gpu-screen-recorder # needed for noctalia-shell
power-profiles-daemon # needed for noctalia-shell power cycle
]
else [];
in {
@ -50,22 +52,24 @@ in {
alejandra # nix formatter
amfora # Fancy Terminal Browser For Gemini Protocol
appimage-run # Needed For AppImage Support
atop # monitor tool
brave # Brave Browser
brightnessctl # For Screen Brightness Control
caligula # TUI for writing ISOs to flash
cliphist # Clipboard manager using rofi menu
cmatrix # Matrix Movie Effect In Terminal
cowsay # Great Fun Terminal Program
discord # Stable client
discord-canary # beta client
docker-compose # Allows Controlling Docker From A Single File
duf # Utility For Viewing Disk Usage In Terminal
dysk # Disk space util nice formattting
eza # Beautiful ls Replacement
ffmpeg # Terminal Video / Audio Editing
file-roller # Archive Manager
gearlever # Manage / run Appimages
icu # dep for gearlever
gedit # Simple Graphical Text Editor
gimp # Great Photo Editor
gpu-screen-recorder # needed for nnoctalia-shell
power-profiles-daemon # needed for noctalia-shell power cycle
google-chrome # Browser
mesa-demos # needed for inxi diag util
tuigreet # The Login Manager (Sometimes Referred To As Display Manager)
htop # Simple Terminal Based System Monitor
@ -91,6 +95,7 @@ in {
picard # For Changing Music Metadata & Getting Cover Art
pkg-config # Wrapper Script For Allowing Packages To Get Info On Others
playerctl # Allows Changing Media Volume Through Scripts
python3 # needeed for boot mirror install
rhythmbox # audio player
ripgrep # Improved Grep
socat # Needed For Screenshots
@ -100,6 +105,7 @@ in {
upower # noctalia shell battery
uwsm # Universal Wayland Session Manager (optional must be enabled)
v4l-utils # Used For Things Like OBS Virtual Camera
warp-terminal # Terminal with AI support build in
waypaper # Change wallpaper
wget # Tool For Fetching Files With Links
ytmdl # Tool For Downloading Audio From YouTube

View file

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

16
modules/core/scanners.nix Normal file
View file

@ -0,0 +1,16 @@
{
config,
lib,
pkgs,
username,
...
}:
lib.mkIf config.zaneyos.scannerEnable {
hardware.sane = {
enable = true;
extraBackends = [pkgs.sane-airscan];
disabledDefaultBackends = ["escl"];
};
users.users.${username}.extraGroups = ["scanner"];
}

View file

@ -3,7 +3,6 @@
pkgs,
config,
lib,
host,
...
}: let
foreground = config.stylix.base16Scheme.base00;
@ -62,33 +61,33 @@
};
};
in {
services.displayManager = {
sddm = {
package = pkgs.kdePackages.sddm;
extraPackages = [sddm-astronaut];
enable = true;
wayland.enable = true;
theme = "sddm-astronaut-theme";
settings = let
vars = import ../../hosts/${host}/variables.nix;
keyboardLayout = vars.keyboardLayout or "us";
keyboardVariant = vars.keyboardVariant or "";
in {
X11 = {
XkbLayout = keyboardLayout;
XkbVariant = keyboardVariant;
config = lib.mkIf (config.zaneyos.displayManager == "sddm") {
services.displayManager = {
sddm = {
package = pkgs.kdePackages.sddm;
extraPackages = [sddm-astronaut];
enable = true;
wayland.enable = true;
theme = "sddm-astronaut-theme";
settings = let
keyboardLayout = config.zaneyos.keyboardLayout;
keyboardVariant = config.zaneyos.keyboardVariant;
in {
X11 = {
XkbLayout = keyboardLayout;
XkbVariant = keyboardVariant;
};
};
};
};
# Ensure Wayland SDDM also sees XKB defaults
systemd.services.display-manager.environment = let
keyboardLayout = config.zaneyos.keyboardLayout;
keyboardVariant = config.zaneyos.keyboardVariant;
in ({XKB_DEFAULT_LAYOUT = keyboardLayout;}
// lib.optionalAttrs (keyboardVariant != "") {XKB_DEFAULT_VARIANT = keyboardVariant;});
environment.systemPackages = [sddm-astronaut];
};
# Ensure Wayland SDDM also sees XKB defaults
systemd.services.display-manager.environment = let
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;});
environment.systemPackages = [sddm-astronaut];
}

View file

@ -1,4 +1,6 @@
{profile, ...}: {
{config, ...}: let
inherit (config.zaneyos) enableSmartD;
in {
# Services to start
services = {
upower.enable = true; # noctalia shell battery
@ -20,10 +22,7 @@
gnome.gnome-keyring.enable = true;
smartd = {
enable =
if profile == "vm"
then false
else true;
enable = enableSmartD;
autodetect = true;
};
pipewire = {

View file

@ -1,4 +1,9 @@
{pkgs, ...}: {
{
lib,
pkgs,
...
}:
lib.mkIf pkgs.stdenv.hostPlatform.isx86_64 {
programs = {
steam = {
enable = false;

View file

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

View file

@ -1,6 +1,9 @@
{host, ...}: let
vars = import ../../hosts/${host}/variables.nix;
consoleKeyMap = vars.consoleKeyMap or "us";
{
config,
inputs,
...
}: let
inherit (config.zaneyos) consoleKeyMap;
in {
nix = {
settings = {
@ -29,7 +32,7 @@ in {
};
environment.variables = {
NIXOS_OZONE_WL = "1";
ZANEYOS_VERSION = "2.6.1";
ZANEYOS_VERSION = "2.6.Next";
ZANEYOS = "true";
};
console.keyMap = "${consoleKeyMap}";

View file

@ -1,16 +1,16 @@
{
host,
config,
pkgs,
...
}: let
inherit (import ../../hosts/${host}/variables.nix) thunarEnable;
inherit (config.zaneyos) thunarEnable;
in {
programs = {
thunar = {
enable = thunarEnable;
plugins = [
pkgs.thunar-archive-plugin
pkgs.thunar-volman
plugins = with pkgs.xfce; [
thunar-archive-plugin
thunar-volman
];
};
};

View file

@ -1,19 +1,22 @@
{
pkgs,
inputs,
username,
config,
host,
profile,
inputs,
pkgs,
username,
...
}: let
inherit (import ../../hosts/${host}/variables.nix) gitUsername;
inherit (config.zaneyos) 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 pkgs;
inherit (config) zaneyos;
};
users.${username} = {
imports = [./../home];
home = {
@ -33,7 +36,6 @@ in {
"libvirtd" #Virt manager/QEMU access
"lp"
"networkmanager"
"scanner"
"wheel" #sudo access
"vboxusers" #Virtual Box
];

View file

@ -1,7 +1,6 @@
{host, ...}: let
vars = import ../../hosts/${host}/variables.nix;
keyboardLayout = vars.keyboardLayout or "us";
keyboardVariant = vars.keyboardVariant or "";
{config, ...}: let
inherit (config.zaneyos) keyboardLayout;
inherit (config.zaneyos) keyboardVariant;
# Treat only known US-based variants as implying layout = "us".
usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"];

View file

@ -25,8 +25,8 @@ in {
config = mkIf cfg.enable {
# Enforce kernel 6.12 when this hybrid config is selected
# Not sure this is still neeeded but leaving just in case
# boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
# Not sure this is still needed leaving in just in case
#boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
services.xserver.videoDrivers = ["nvidia"];

View file

@ -1,4 +1,6 @@
{profile, ...}: {
{zaneyos, ...}: let
profile = zaneyos.hostName;
in {
programs.bash = {
enable = false;
enableCompletion = true;

View file

@ -1,10 +1,21 @@
{pkgs, ...}: {
{
lib,
osConfig,
pkgs,
...
}: let
package =
if (!pkgs.stdenv.hostPlatform.isx86_64)
then pkgs.btop
else
pkgs.btop.override {
rocmSupport = true;
cudaSupport = true;
};
in {
programs.btop = {
enable = true;
package = pkgs.btop.override {
rocmSupport = true;
cudaSupport = true;
};
inherit package;
settings = {
vim_keys = true;
rounded_corners = true;

View file

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

View file

@ -1,18 +1,7 @@
{host, ...}: let
vars = import ../../hosts/${host}/variables.nix;
inherit
(vars)
alacrittyEnable
barChoice
ghosttyEnable
tmuxEnable
waybarChoice
weztermEnable
vscodeEnable
helixEnable
doomEmacsEnable
antigravityEnable
;
{zaneyos, ...}: let
inherit (zaneyos) barChoice waybarChoice;
neovimConfig = zaneyos.neovimConfig or "nixvim";
# Select bar module based on barChoice
barModule =
if barChoice == "noctalia"
@ -21,88 +10,57 @@
in {
imports =
[
./amfora.nix
./bash.nix
./bashrc-personal.nix
./overview.nix
./python.nix
./cli/bat.nix
./cli/btop.nix
./cli/bottom.nix
./cli/cava.nix
./emoji.nix
./eza.nix
./fastfetch
./cli/fzf.nix
./cli/gh.nix
./cli/git.nix
./gtk.nix
./cli/htop.nix
./hyprland
./terminals/kitty.nix
./cli/lazygit.nix
./obs-studio.nix
#./editors/nvf.nix
./editors/nixvim.nix
./editors/nano.nix
./rofi
./qt.nix
./scripts
./scripts/gemini-cli.nix
./stylix.nix
./swappy.nix
./swaync.nix
./tealdeer.nix
./virtmanager.nix
barModule
./wlogout
./xdg.nix
./yazi
#./zen-browser.nix
./zoxide.nix
./zsh
./terminals/alacritty.nix
./amfora.nix
./editors/antigravity.nix
./bash.nix
./bashrc-personal.nix
./overview.nix
./python.nix
./cli/bat.nix
./cli/btop.nix
./cli/bottom.nix
./cli/cava.nix
./editors/doom-emacs.nix
./editors/doom-emacs-install.nix
./emoji.nix
./editors/evil-helix.nix
./eza.nix
./fastfetch
./cli/fzf.nix
./cli/gh.nix
./terminals/ghostty.nix
./cli/git.nix
./gtk.nix
./cli/htop.nix
./hyprland
./terminals/kitty.nix
./cli/lazygit.nix
./obs-studio.nix
./editors/nano.nix
./rofi
./qt.nix
./scripts
./scripts/gemini-cli.nix
./stylix.nix
./swappy.nix
./swaync.nix
./tealdeer.nix
./terminals/tmux.nix
./virtmanager.nix
./editors/vscode.nix
./terminals/wezterm.nix
barModule
./wlogout
./xdg.nix
./yazi
./zen-browser.nix
./zoxide.nix
./zsh
]
++ (
if helixEnable
then [./editors/evil-helix.nix]
else []
)
++ (
if vscodeEnable
then [./editors/vscode.nix]
else []
)
++ (
if antigravityEnable
then [./editors/antigravity.nix]
else []
)
++ (
if doomEmacsEnable
then [
./editors/doom-emacs-install.nix
./editors/doom-emacs.nix
]
else []
)
++ (
if weztermEnable
then [./terminals/wezterm.nix]
else []
)
++ (
if ghosttyEnable
then [./terminals/ghostty.nix]
else []
)
++ (
if tmuxEnable
then [./terminals/tmux.nix]
else []
)
++ (
if alacrittyEnable
then [./terminals/alacritty.nix]
else []
if neovimConfig == "nixvim"
then [./editors/nixvim.nix]
else [./editors/nvf.nix]
);
}

View file

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

View file

@ -1,9 +1,10 @@
{pkgs, ...}: let
doom-icon = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/jeetelongname/doom-banners/master/splashes/doom/doom-emacs-color2.svg";
sha256 = "1xxi5ra1z8njsqaqiaq96wyn1sc967l42kvjzbji1zrjj8za6bgq";
};
in {
{
lib,
pkgs,
zaneyos,
...
}:
lib.mkIf zaneyos.doomEmacsEnable {
# 1. Create a script to install Doom Emacs
home.packages = [
(pkgs.writeShellScriptBin "get-doom" ''
@ -63,7 +64,12 @@ in {
];
# 3. Create a desktop file
xdg.desktopEntries.doom-emacs = {
xdg.desktopEntries.doom-emacs = let
doom-icon = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/jeetelongname/doom-banners/master/splashes/doom/doom-emacs-color2.svg";
sha256 = "1xxi5ra1z8njsqaqiaq96wyn1sc967l42kvjzbji1zrjj8za6bgq";
};
in {
name = "Doom Emacs";
comment = "A configuration framework for GNU Emacs";
exec = "emacs";

View file

@ -1,4 +1,10 @@
{pkgs, ...}: {
{
lib,
pkgs,
zaneyos,
...
}:
lib.mkIf zaneyos.doomEmacsEnable {
home.packages = with pkgs; [
emacs-pgtk
git

View file

@ -1,88 +1,82 @@
{pkgs, ...}: let
enableEvilHelix = true; # Set to true to enable the configuration
in {
home.packages = with pkgs; (
if enableEvilHelix
then [
evil-helix
cmake-language-server
jsonnet-language-server
luaformatter
lua-language-server
#marksman # causes dotnet and dotnet-swr to build which takes hours
multimarkdown
taplo
nil
jq-lsp
vscode-langservers-extracted
bash-language-server
awk-language-server
vscode-extensions.llvm-vs-code-extensions.vscode-clangd
clang-tools
docker-compose-language-service
docker-compose
docker-language-server
typescript-language-server
]
else []
);
{
lib,
pkgs,
zaneyos,
...
}:
lib.mkIf zaneyos.helixEnable {
home.packages = with pkgs; [
evil-helix
cmake-language-server
jsonnet-language-server
luaformatter
lua-language-server
#Amarksman # NET based causes dotnet docnet-vmr to build (hours long)
multimarkdown
taplo
nil
jq-lsp
vscode-langservers-extracted
bash-language-server
awk-language-server
vscode-extensions.llvm-vs-code-extensions.vscode-clangd
clang-tools
docker-compose-language-service
docker-compose
docker-language-server
typescript-language-server
];
home.file.".config/helix/languages.toml".text =
if enableEvilHelix
then ''
[language-server.nil]
command = "nil"
home.file.".config/helix/languages.toml".text = ''
[language-server.nil]
command = "nil"
[language-server.lua]
command = "lua-language-server"
[language-server.lua]
command = "lua-language-server"
[language-server.json]
command = "vscode-json-languageserver"
[language-server.json]
command = "vscode-json-languageserver"
[language-server.markdown]
command = "marksman"
''
else "";
[language-server.markdown]
command = "marksman"
'';
home.file.".config/helix/config.toml".text =
if enableEvilHelix
then ''
theme = "catppuccin_mocha"
#theme = "ao"
home.file.".config/helix/config.toml".text = ''
theme = "catppuccin_mocha"
#theme = "ao"
[editor]
evil = true
end-of-line-diagnostics = "hint"
auto-pairs = true
mouse = true
middle-click-paste = true
shell = ["zsh", "-c"]
line-number = "absolute"
auto-completion = true
path-completion = true
auto-info = true
color-modes = true
popup-border = "all"
clipboard-provider = "wayland"
indent-heuristic = "hybrid"
[editor]
evil = true
end-of-line-diagnostics = "hint"
auto-pairs = true
mouse = true
middle-click-paste = true
shell = ["zsh", "-c"]
line-number = "absolute"
auto-completion = true
path-completion = true
auto-info = true
color-modes = true
popup-border = "all"
clipboard-provider = "wayland"
indent-heuristic = "hybrid"
[editor.statusline]
left = ["mode", "spinner"]
center = ["file-absolute-path", "total-line-numbers", "read-only-indicator", "file-modification-indicator"]
right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]
separator = "│"
mode.normal = "NORMAL"
mode.insert = "INSERT"
mode.select = "SELECT"
[editor.statusline]
left = ["mode", "spinner"]
center = ["file-absolute-path", "total-line-numbers", "read-only-indicator", "file-modification-indicator"]
right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]
separator = "│"
mode.normal = "NORMAL"
mode.insert = "INSERT"
mode.select = "SELECT"
[editor.lsp]
enable = true
display-messages = true
display-progress-messages = true
[editor.lsp]
enable = true
display-messages = true
display-progress-messages = true
[editor.inline-diagnostics]
cursor-line = "hint"
other-lines = "hint"
''
else "";
[editor.inline-diagnostics]
cursor-line = "hint"
other-lines = "hint"
'';
}

View file

@ -44,9 +44,6 @@
settings = {
flavour = "mocha";
transparent_background = false;
integrations = {
lualine = true;
};
};
};
@ -77,16 +74,11 @@
treesitter-context.enable = false;
# Project management
project-nvim = {
enable = true;
settings = {
history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim";
};
};
project-nvim.enable = true;
# Notifications and UI polish
notify.enable = true;
noice.enable = false;
noice.enable = true;
# Startup dashboard
alpha = {
@ -132,38 +124,14 @@
markdown-preview.enable = true;
# Completion and snippets
blink-cmp = {
cmp = {
enable = true;
settings = {
keymap = {
preset = "default";
"<CR>" = ["accept" "fallback"];
"<Tab>" = ["select_next" "fallback"];
"<S-Tab>" = ["select_prev" "fallback"];
};
appearance = {
nerd_font_variant = "mono";
};
completion = {
documentation = {
auto_show = true;
auto_show_delay_ms = 500;
};
};
sources = {
default = ["lsp" "path" "snippets" "buffer"];
};
snippets = {
preset = "luasnip";
};
fuzzy = {
implementation = "prefer_rust_with_warning";
};
signature = {
enabled = true;
};
};
};
# Completion sources for LSP, buffer, path, and snippets
cmp-nvim-lsp.enable = true;
cmp-buffer.enable = true;
cmp-path.enable = true;
cmp_luasnip.enable = true;
luasnip.enable = true;
friendly-snippets.enable = true;
@ -340,7 +308,9 @@
pyright
lua-language-server
zls
marksman
#markman is .NET based causes dotnet and dotnet-swr to build from source (hours long builds)
# switching to multimarkdown (C based)
#marksman
multimarkdown
clang-tools
prettierd
@ -349,8 +319,6 @@
nixpkgs-fmt
figlet
toilet
bash-language-server
tailwindcss-language-server
];
# Diagnostic UI and notify background tweaks
@ -396,6 +364,44 @@
vim.notify = notify
end
-- nvim-cmp setup: sources + mappings + snippet expansion
do
local ok_cmp, cmp = pcall(require, "cmp")
if ok_cmp then
local ok_snip, luasnip = pcall(require, "luasnip")
if ok_snip then
-- Load friendly-snippets lazily if available
pcall(function()
require("luasnip.loaders.from_vscode").lazy_load()
end)
end
cmp.setup({
snippet = {
expand = function(args)
if ok_snip then luasnip.lsp_expand(args.body) end
end,
},
mapping = cmp.mapping.preset.insert({
["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping.confirm({ select = true }),
["<Tab>"] = cmp.mapping.select_next_item(),
["<S-Tab>"] = cmp.mapping.select_prev_item(),
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" },
{ name = "luasnip" },
}, {
{ name = "path" },
{ name = "buffer" },
}),
})
-- nvim-cmp integration with nvim-autopairs (optional)
local ok_ap, cmp_autopairs = pcall(require, "nvim-autopairs.completion.cmp")
if ok_ap then
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
end
end
end
-- Startup dashboard (alpha-nvim)
do
@ -418,18 +424,17 @@
return #lines > 0 and lines or nil
end
header_lines = gen_banner('toilet -f ansi-shadow NIXVIM 2>/dev/null')
or gen_banner('figlet -f "ANSI Shadow" NIXVIM 2>/dev/null')
or gen_banner('figlet NIXVIM 2>/dev/null')
header_lines = gen_banner('toilet -f ansi-shadow NIXOS 2>/dev/null')
or gen_banner('figlet -f "ANSI Shadow" NIXOS 2>/dev/null')
or gen_banner('figlet NIXOS 2>/dev/null')
if not header_lines then
header_lines = {
"███╗ ██╗██╗██╗ ██╗██╗ ██╗██╗███╗ ███╗",
"████╗ ██║██║╚██╗██╔╝██║ ██║██║████╗ ████║",
"██╔██╗ ██║██║ ╚███╔╝ ██║ ██║██║██╔████╔██║",
"██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║",
"██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║",
"╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝",
" _ _ ___ __ __ ___ ___ ____ ",
"| \\ | |_ _| \\ \\/ / / _ \\ / _ \\\ | _ \\ ",
"| \\| || | \\ / | | | | | | || | | |",
"| |\\ || | / \\ | |_| | |_| || |_| |",
"|_| \\_|___| /_/\\_\\ \\___/ \\___/ |____/ ",
}
end
dashboard.section.header.val = header_lines
@ -460,9 +465,4 @@
end
'';
};
home.activation.projectNvimHistory = ''
mkdir -p "$HOME/.local/share/nvim/project_nvim"
find "$HOME/.local/share/nvim/project_nvim" -type f -size 0 -delete 2>/dev/null || true
'';
}

View file

@ -1,6 +1,7 @@
{
pkgs,
lib,
zaneyos,
...
}: let
inherit (pkgs.lib) attrByPath;
@ -62,7 +63,7 @@
};
in {
programs.vscode = {
enable = true;
enable = zaneyos.vscodeEnable;
profiles = {
default = {
extensions =

View file

@ -133,4 +133,15 @@
];
};
};
# Install additional Fastfetch JSON configs used by ff* wrappers
home.file = {
".config/fastfetch/fastfetch-system-times.config.jsonc".source = ./fastfetch-system-times.config.jsonc;
".config/fastfetch/fastfetch1.config.jsonc".source = ./fastfetch1.config.jsonc;
".config/fastfetch/fastfetch2.config.jsonc".source = ./fastfetch2.config.jsonc;
".config/fastfetch/fastfetch3.config.jsonc".source = ./fastfetch3.config.jsonc;
".config/fastfetch/fastfetch4.config.jsonc".source = ./fastfetch4.config.jsonc;
".config/fastfetch/fastfetch5.config.jsonc".source = ./fastfetch5.config.jsonc;
".config/fastfetch/nixos.png".source = ./nixos.png;
};
}

View file

@ -0,0 +1,170 @@
{
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
"logo": {
"source": "~/.config/fastfetch/nixos.png",
"type": "kitty",
"height": 8,
"width": 16,
"padding": {
"top": 1,
"left": 4
}
},
"modules": [
"break",
{
"type": "custom",
"format": "\u001b[32m┌─────────────────────────────────Hardware─────────────────────────────────┐",
"keyWidth": 20
},
{
"type": "board",
"key": " Motherboard:",
"format": "{1}",
"keyColor": "green",
"keyWidth": 20
},
{
"type": "bios",
"key": "│ ├ BIOS:",
"keyColor": "green",
"keyWidth": 20
},
{
"type": "battery",
"key": "│ └ Battery:",
"keyColor": "green",
"keyWidth": 20
},
{
"type": "cpu",
"key": "│ ├󰻠 CPU:",
"showPeCoreCount": true,
"keyColor": "green",
"keyWidth": 20
},
{
"type": "gpu",
"key": "│ ├󰢮 GPU:",
"keyColor": "green",
"format": "{2} {3}",
"keyWidth": 20
},
{
"type": "memory",
"key": "│ ├󰑭 RAM:",
"keyColor": "green",
"keyWidth": 20
},
{
"type": "disk",
"key": "│ └󰋊 Disk:",
"folders": "/",
"keyColor": "green",
"keyWidth": 20
},
{
"type": "custom",
"format": "\u001b[32m└──────────────────────────────────────────────────────────────────────────┘",
"keyWidth": 20
},
{
"type": "custom",
"format": "\u001b[33m┌─────────────────────────────────Software─────────────────────────────────┐",
"keyWidth": 20
},
{
"type": "os",
"key": " OS:",
"keyColor": "yellow",
"format": "{2}",
"keyWidth": 20
},
{
"type": "command",
"key": "│ ├ ZaneyOS:",
"keyColor": "yellow",
"text": "echo v${ZANEYOS_VERSION}",
"keyWidth": 20
},
{
"type": "initsystem",
"key": "│ ├ BootLoader:",
"format": "{1}",
"keyColor": "yellow",
"keyWidth": 20
},
{
"type": "kernel",
"key": "│ ├ Kernel:",
"keyColor": "yellow",
"keyWidth": 20
},
{
"type": "shell",
"key": "│ ├ Shell:",
"keyColor": "yellow",
"keyWidth": 20
},
{
"type": "packages",
"key": "│ ├󰏖 Packages:",
"keyColor": "yellow",
"keyWidth": 20
},
{
"type": "processes",
"key": "│ └ Processes:",
"keyColor": "yellow",
"keyWidth": 20
},
{
"type": "custom",
"format": "\u001b[33m└──────────────────────────────────────────────────────────────────────────┘",
"keyWidth": 20
},
{
"type": "custom",
"format": "\u001b[34m┌───────────────────────────Graphical Interface────────────────────────────┐",
"keyWidth": 20
},
{
"type": "wm",
"key": " WM:",
"keyColor": "blue",
"keyWidth": 20
},
{
"type": "theme",
"key": "│ ├󰉼 Theme:",
"format": "{2}",
"keyColor": "blue",
"keyWidth": 20
},
{
"type": "icons",
"key": "│ ├󰀻 Icons:",
"format": "{2}",
"keyColor": "blue",
"keyWidth": 20
},
{
"type": "terminal",
"key": "│ ├ Terminal:",
"keyColor": "blue",
"keyWidth": 20
},
{
"type": "font",
"key": "│ └ UI Font:",
"format": "{2}",
"keyColor": "blue",
"keyWidth": 20
},
{
"type": "custom",
"format": "\u001b[34m└──────────────────────────────────────────────────────────────────────────┘",
"keyWidth": 20
}
]
}

View file

@ -0,0 +1,119 @@
{
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
"logo": {
"type": "kitty-direct",
"source": "~/.config/fastfetch/nixos.png",
"height": 10,
"width": 21,
"padding": {
"top": 2,
"left": 2
}
},
"display": {
"separator": " "
},
"modules": [
"break",
{
"type": "title",
"keyWidth": 10
},
{
"type": "os",
"key": " OS",
"keyColor": "yellow"
},
{
"type": "command",
"key": "├ ZaneyOS",
"keyColor": "yellow",
"text": "echo v${ZANEYOS_VERSION}"
},
{
"type": "kernel",
"key": "├ Kernel",
"keyColor": "yellow"
},
{
"type": "packages",
"key": "├󰏖 Packages",
"keyColor": "yellow"
},
{
"type": "shell",
"key": "├ Shell",
"keyColor": "yellow"
},
{
"type": "command",
"key": "└ Age",
"keyColor": "yellow",
"text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
},
"break",
{
"type": "de",
"key": " DE",
"keyColor": "blue"
},
{
"type": "wm",
"key": "󰧨 Window Manager",
"keyColor": "blue"
},
{
"type": "lm",
"key": "├󰧨 Login Manager",
"keyColor": "blue"
},
{
"type": "wmtheme",
"key": "├󰉼 WM Theme",
"keyColor": "blue"
},
{
"type": "theme",
"format": "{1}",
"key": "├󰉼 Color Themes",
"keyColor": "blue"
},
{
"type": "terminal",
"key": "└ Terminal",
"keyColor": "blue"
},
"break",
{
"type": "chassis",
"key": "󰌢 PC",
"keyColor": "green"
},
{
"type": "cpu",
"key": "├󰻠 CPU",
"keyColor": "green"
},
{
"type": "gpu",
"key": "├󰍛 GPU",
"keyColor": "green"
},
{
"type": "opengl",
"key": "├󰍛 OpenGL",
"keyColor": "green"
},
{
"type": "vulkan",
"key": "├󰍛 Vulkan",
"keyColor": "green"
},
{
"type": "display",
"key": "└󰍹 Display(s)",
"keyColor": "green"
},
"break"
]
}

View file

@ -0,0 +1,128 @@
{
"display": {
"color": {
"keys": "35",
"output": "95"
},
"separator": " ➜ "
},
"logo": {
"height": 7,
"width": 14,
"padding": {
"left": 2,
"top": 2
},
"source": "~/.config/fastfetch/nixos.png",
"type": "kitty"
},
"modules": [
"break",
{
"type": "os",
"key": "OS",
"keyColor": "31"
},
{
"type": "command",
"key": " ├  ZaneyOS ",
"keyColor": "31",
"text": "echo v${ZANEYOS_VERSION}"
},
{
"key": " ├  ",
"keyColor": "31",
"type": "kernel"
},
{
"key": " ├ 󰏖 ",
"keyColor": "31",
"type": "packages"
},
{
"key": " └  ",
"keyColor": "31",
"type": "shell"
},
"break",
{
"key": "WM ",
"keyColor": "32",
"type": "wm"
},
{
"key": " ├ 󰉼 ",
"keyColor": "32",
"type": "wmtheme"
},
{
"key": " ├ 󰀻 ",
"keyColor": "32",
"type": "icons"
},
{
"key": " ├  ",
"keyColor": "32",
"type": "cursor"
},
{
"key": " ├  ",
"keyColor": "32",
"type": "terminal"
},
{
"key": " └  ",
"keyColor": "32",
"type": "terminalfont"
},
"break",
{
"format": "{5} {1} Type {2}",
"key": "PC ",
"keyColor": "33",
"type": "host"
},
{
"format": "{1} ({3}) @ {7} GHz",
"key": " ├  ",
"keyColor": "33",
"type": "cpu"
},
{
"format": "{1} {2} @ {12} GHz",
"key": " ├ 󰢮 ",
"keyColor": "33",
"type": "gpu"
},
{
"key": " ├  ",
"keyColor": "33",
"type": "memory"
},
{
"key": " ├ 󰋊 ",
"keyColor": "33",
"type": "disk"
},
{
"key": " ├  ",
"keyColor": "33",
"type": "monitor"
},
{
"key": " ├ 󰥠 ",
"keyColor": "33",
"type": "player"
},
{
"key": " └ 󰝚 ",
"keyColor": "33",
"type": "media"
},
"break",
{
"key": " Uptime ",
"type": "uptime"
}
]
}

View file

@ -0,0 +1,106 @@
{
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
"display": {
"separator": " | ",
"color": {
"output": "white"
}
},
"logo": {
"height": 6,
"width": 12,
"padding": {
"left": 0,
"top": 1,
"right": 4
},
"source": "~/.config/fastfetch/nixos.png",
"type": "kitty",
"color": {
"1": "#FE8019",
"2": "white"
}
},
"modules": [
{
"type": "title",
"key": " 󰌾",
"keyColor": "#FE8019",
"color": {
"user": "white",
"at": "#FE8019",
"host": "white"
}
},
"break",
{
"type": "os",
"key": " 󰌽",
"keyColor": "#FABD2F",
"format": "{pretty-name}"
},
{
"type": "kernel",
"key": " 󰒓",
"keyColor": "#FABD2F",
"format": "{1} {2}"
},
{
"type": "uptime",
"key": " 󰅐",
"keyColor": "#FABD2F"
},
{
"type": "host",
"key": " 󰾰",
"keyColor": "#83A598"
},
{
"type": "cpu",
"key": " 󰻠",
"keyColor": "#83A598"
},
{
"type": "gpu",
"key": " 󰍛",
"keyColor": "#83A598"
},
{
"type": "memory",
"key": " 󰇕",
"keyColor": "#83A598"
},
{
"type": "display",
"key": " 󰍹",
"keyColor": "#83A598"
},
"break",
{
"type": "wm",
"key": " 󰖲",
"keyColor": "#B8BB26"
},
{
"type": "shell",
"key": " 󰞷",
"keyColor": "#B8BB26"
},
{
"type": "terminal",
"key": " 󰹑",
"keyColor": "#B8BB26"
},
{
"type": "packages",
"key": " 󰏖",
"keyColor": "#B8BB26"
},
"break",
{
"type": "colors",
"paddingLeft": 2,
"symbol": "circle"
}
]
}

View file

@ -0,0 +1,104 @@
{
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
"logo": {
"type": "kitty",
"source": "~/.config/fastfetch/nixos.png",
"height": 8,
"width": 16,
"padding": {
"top": 2,
"left": 2
}
},
"display": {
"separator": " "
},
"modules": [
"break",
{
"type": "os",
"key": "󱄅 OS",
"keyColor": "blue"
},
{
"type": "command",
"key": "├ ZaneyOS",
"keyColor": "blue",
"text": "echo v${ZANEYOS_VERSION}"
},
{
"type": "kernel",
"key": "├ Kernel",
"keyColor": "blue"
},
{
"type": "packages",
"key": "├󰏖 Packages",
"keyColor": "blue"
},
{
"type": "shell",
"key": "└ Shell",
"keyColor": "blue"
},
"break",
{
"type": "wm",
"key": "󰝘 WM",
"keyColor": "cyan"
},
{
"type": "wmtheme",
"key": "├󰉼 WM Theme",
"keyColor": "cyan"
},
{
"type": "theme",
"format": "{1}",
"key": "├󰉼 Color Theme",
"keyColor": "cyan"
},
{
"type": "terminal",
"key": "├ Terminal",
"keyColor": "cyan"
},
{
"type": "terminalfont",
"key": "└󰌯 Font",
"keyColor": "cyan"
},
"break",
{
"type": "chassis",
"key": "󰌢 PC",
"keyColor": "green"
},
{
"type": "cpu",
"key": "├󰻠 CPU",
"keyColor": "green"
},
{
"type": "gpu",
"key": "├󰍛 GPU",
"keyColor": "green"
},
{
"type": "memory",
"key": "├󰍹 Memory",
"keyColor": "green"
},
{
"type": "disk",
"key": "└󰋊 Storage",
"keyColor": "green"
},
"break",
{
"type": "uptime",
"key": "󰥠 Uptime",
"keyColor": "magenta"
}
]
}

View file

@ -0,0 +1,118 @@
{
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
"logo": {
"type": "kitty",
"source": "~/.config/fastfetch/nixos.png",
"height": 8,
"width": 16,
"padding": {
"top": 2,
"left": 2
}
},
"display": {
"separator": "",
"constants": [
"\u001b[89G│\u001b[55G "
]
},
"modules": [
{
"type": "custom",
"key": "╭─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╮"
},
{
"type": "board",
"key": "├  ",
"format": "{name}"
},
{
"type": "cpu",
"key": "├  ",
"format": "{name}"
},
{
"type": "gpu",
"key": "├ 󰍛 ",
"format": "{name}"
},
{
"type": "memory",
"key": "├ 󰇕 ",
"format": "{used}/{total} ({percentage})"
},
{
"type": "disk",
"key": "├ 󰋊 ",
"format": "{size-used}/{size-total} ({size-percentage})"
},
{
"type": "custom",
"key": "╰─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╯"
},
"break",
{
"type": "custom",
"key": "╭─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╮"
},
{
"type": "os",
"key": "├ 󱄅 ",
"format": "{name} {version}"
},
{
"type": "kernel",
"key": "├  ",
"format": "{sysname} {release}"
},
{
"type": "uptime",
"key": "├  ",
"format": "{formatted}"
},
{
"type": "custom",
"key": "╰─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╯"
},
"break",
{
"type": "custom",
"key": "╭─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╮"
},
{
"type": "wm",
"key": "├ 󰝘 ",
"format": "{pretty-name} {version}"
},
{
"type": "terminal",
"key": "├  ",
"format": "{pretty-name} {version}"
},
{
"type": "shell",
"key": "├  ",
"format": "{pretty-name} {version}"
},
{
"type": "terminalfont",
"key": "├  ",
"format": "{name}"
},
{
"type": "cursor",
"key": "├ 󰇀 ",
"format": "{theme}"
},
{
"type": "custom",
"key": "╰─────── ⋅ ⋅ ───── ✩ ───── ⋅ ⋅ ───────╯"
},
"break",
{
"type": "colors",
"symbol": "circle",
"paddingLeft": 12
}
]
}

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
# Name: END-4-slide Modified to better support Hyprtrails
# Credit: END-4 project https://github.com/end-4/dots-hyprland

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
# Name: END-4-slide Modified to better support Hyprtrails
# Credit: END-4 project https://github.com/end-4/dots-hyprland

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
animations = {
enabled = true;

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
animations = {
enabled = true;

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
animations = {
enabled = true;

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
animations = {
enabled = true;

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
animations = {
enabled = true;

View file

@ -1,8 +1,4 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
_: {
wayland.windowManager.hyprland.settings = {
animations = {
enabled = true;

View file

@ -1,7 +1,6 @@
{host, ...}: let
vars = import ../../../hosts/${host}/variables.nix;
{zaneyos, ...}: let
inherit
(vars)
(zaneyos)
barChoice
browser
terminal
@ -10,18 +9,17 @@
noctaliaBind =
if barChoice == "noctalia"
then [
"$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
"$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
"$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
"$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory"
"$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory"
"$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard"
"$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
"$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
"$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
"$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
"$modifier CTRL,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockscreen lock"
"$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle"
"$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle"
"$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle"
"$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle"
"$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle"
"$modifier SHIFT,R, Restart Noctalia shell, exec, restart.noctalia"
]
else [];
# Rofi launcher bindings (only included when barChoice != "noctalia")
@ -70,7 +68,7 @@ in {
"$modifier,O, OBS Studio, exec, obs"
"$modifier ALT,C, Color Picker, exec, hyprpicker -a"
"$modifier,G, GIMP, exec, gimp"
"$modifier SHIFT,T, Dropdown Terminal, exec, sh -lc 'DropTerminal'"
"$modifier shift,T, Dropdown Terminal, exec, sh -lc 'DropTerminal \${TERM:-kitty}'"
"$modifier,T, Thunar, exec, thunar"
"$modifier ALT,M, Audio Control, exec, pavucontrol"
# ============= WINDOW MANAGEMENT =============

View file

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

View file

@ -1,10 +1,5 @@
{host, ...}: let
vars = import ../../../hosts/${host}/variables.nix;
inherit
(vars)
barChoice
stylixImage
;
{zaneyos, ...}: let
inherit (zaneyos) barChoice stylixImage;
# Noctalia-specific startup commands
noctaliaExec =
if barChoice == "noctalia"

View file

@ -1,15 +1,13 @@
{
host,
zaneyos,
config,
pkgs,
lib,
...
}: let
vars = import ../../../hosts/${host}/variables.nix;
extraMonitorSettings = vars.extraMonitorSettings or "";
keyboardLayout = vars.keyboardLayout or "us";
keyboardVariant = vars.keyboardVariant or "";
stylixImage = vars.stylixImage or null;
inherit (zaneyos) extraMonitorSettings;
keyboardLayout = zaneyos.keyboardLayout;
keyboardVariant = zaneyos.keyboardVariant;
# Treat only known US-based variants as implying layout = "us".
usVariants = ["dvorak" "colemak" "workman" "intl" "us-intl" "altgr-intl"];
@ -44,6 +42,7 @@
hyprKbVariant = variantFinal;
in {
home.packages = with pkgs; [
awww
grim
slurp
wl-clipboard
@ -108,17 +107,8 @@ in {
workspace_swipe_create_new = true;
workspace_swipe_forever = true;
};
"$modifier" = "SUPER";
scrolling = {
column_width = 0.80;
fullscreen_on_one_column = true;
direction = "right";
follow_focus = true;
};
monocle = {};
general = {
layout = "dwindle";
gaps_in = 6;
@ -209,6 +199,15 @@ in {
always_keep_position = false;
};
scrolling = {
column_width = 0.80;
fullscreen_on_one_column = true;
direction = "right";
follow_focus = true;
};
monocle = {};
# Ensure Xwayland windows render at integer scale; compositor scales them
xwayland = {
force_zero_scaling = true;

View file

@ -69,6 +69,14 @@ if ! command -v lspci &> /dev/null; then
exit 1
fi
# Check for python3 (required for helper scripts)
if ! command -v python3 &> /dev/null; then
print_error "python3 is not installed."
echo -e "Please install python3, then re-run the install script."
echo -e "Example: nix-shell -p python3"
exit 1
fi
if [ -n "$(grep -i nixos < /etc/os-release)" ]; then
echo -e "${GREEN}Verified this is NixOS.${NC}"
else
@ -101,19 +109,44 @@ has_nvidia=false
has_intel=false
has_amd=false
has_vm=false
detect_vm() {
if command -v systemd-detect-virt &>/dev/null; then
if systemd-detect-virt --quiet; then
return 0
fi
fi
for f in /sys/class/dmi/id/product_name /sys/class/dmi/id/sys_vendor; do
if [ -r "$f" ] && grep -Eqi 'qemu|kvm|vmware|virtualbox|hyper-v|microsoft corporation|xen|parallels' "$f"; then
return 0
fi
done
return 1
}
if detect_vm; then
has_vm=true
fi
if lspci | grep -qi 'vga\|3d\|display'; then
while read -r line; do
if echo "$line" | grep -qi 'nvidia'; then
if echo "$line" | grep -Eq '\[10de:'; then
has_nvidia=true
elif echo "$line" | grep -Eq '\[1002:'; then
has_amd=true
elif echo "$line" | grep -Eq '\[8086:'; then
has_intel=true
elif echo "$line" | grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then
has_vm=true
elif echo "$line" | grep -qi 'nvidia'; then
has_nvidia=true
elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then
has_amd=true
elif echo "$line" | grep -qi 'intel'; then
has_intel=true
elif echo "$line" | grep -qi 'virtio\|vmware'; then
elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then
has_vm=true
fi
done < <(lspci | grep -i 'vga\|3d\|display')
done < <(lspci -nn | grep -i 'vga\|3d\|display')
if $has_vm; then
DETECTED_PROFILE="vm"
@ -172,13 +205,15 @@ else
echo -e "${GREEN}I hope you find your time here enjoyable!${NC}"
fi
print_header "Cloning zaneyos Repository"
git clone https://gitlab.com/dwilliam62/zaneyos.git --depth=1 ~/zaneyos
cd ~/zaneyos || exit 1
# Use the repository where this script lives; no extra git clone needed
REPO_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
print_header "Using local ZaneyOS repository at: $REPO_DIR"
cd "$REPO_DIR" || exit 1
print_header "Configuring Host and Profile"
mkdir -p hosts/"$hostName"
cp hosts/default/*.nix hosts/"$hostName"
git add "hosts/$hostName"
installusername=$(echo $USER)
git config --global user.name "$installusername"
@ -210,6 +245,132 @@ sed -i "/^[[:space:]]*username[[:space:]]*=[[:space:]]*\"/ s/\"[^\"]*\"/\"$insta
print_header "Generating Hardware Configuration -- Ignore ERROR: cannot access /bin"
sudo nixos-generate-config --show-hardware-config > ./hosts/$hostName/hardware.nix
print_header "Bootloader Configuration"
mirror_boot=false
if grep -q '"/boot2"' "./hosts/$hostName/hardware.nix"; then
mirror_boot=true
elif [ -f /etc/nixos/hardware-configuration.nix ] && grep -q '"/boot2"' /etc/nixos/hardware-configuration.nix; then
mirror_boot=true
fi
grub_in_current=false
if [ -f /etc/nixos/configuration.nix ] && grep -q 'boot\.loader\.grub\.enable[[:space:]]*=[[:space:]]*true' /etc/nixos/configuration.nix; then
grub_in_current=true
fi
get_device_for_mount() {
local mountpoint="$1"
local device=""
if [ -f "./hosts/$hostName/hardware.nix" ]; then
device=$(sed -n "/fileSystems\\.\"${mountpoint//\//\\/}\"/,/};/p" "./hosts/$hostName/hardware.nix" | sed -n 's/.*device = "\(.*\)".*/\1/p' | head -n 1)
fi
if [ -z "$device" ] && [ -f /etc/nixos/hardware-configuration.nix ]; then
device=$(sed -n "/fileSystems\\.\"${mountpoint//\//\\/}\"/,/};/p" /etc/nixos/hardware-configuration.nix | sed -n 's/.*device = "\(.*\)".*/\1/p' | head -n 1)
fi
if [ -z "$device" ] && command -v findmnt >/dev/null 2>&1; then
device=$(findmnt -no SOURCE "$mountpoint" 2>/dev/null | head -n 1)
fi
echo "$device"
}
boot_device=$(get_device_for_mount "/boot")
boot2_device=$(get_device_for_mount "/boot2")
if $mirror_boot; then
python3 - <<PY
from pathlib import Path
import re
hw_path = Path("./hosts/$hostName/hardware.nix")
text = hw_path.read_text()
def patch_block(block: str) -> str:
if "nofail" in block:
return block
def repl(m):
inner = m.group(1).strip()
if inner:
inner = inner + " "
return f'options = [ {inner}"nofail" "x-systemd.device-timeout=10s" ];'
return re.sub(r'options\\s*=\\s*\\[(.*?)\\];', repl, block, flags=re.S)
text = re.sub(r'fileSystems\\."\\/boot2"\\s*=\\s*\\{.*?\\n\\s*\\};', lambda m: patch_block(m.group(0)), text, flags=re.S)
hw_path.write_text(text)
PY
fi
if [ -f "./hosts/$hostName/hardware.nix" ]; then
python3 - <<PY
from pathlib import Path
import re
hw_path = Path("./hosts/$hostName/hardware.nix")
text = hw_path.read_text()
def patch_block(block: str) -> str:
if "nofail" in block:
return block
def repl(m):
inner = m.group(1).strip()
if inner:
inner = inner + " "
return f'options = [ {inner}"nofail" "x-systemd.device-timeout=10s" "_netdev" ];'
return re.sub(r'options\\s*=\\s*\\[(.*?)\\];', repl, block, flags=re.S)
text = re.sub(r'fileSystems\\."\\/mnt\\/nas"\\s*=\\s*\\{.*?\\n\\s*\\};', lambda m: patch_block(m.group(0)), text, flags=re.S)
hw_path.write_text(text)
PY
fi
if $mirror_boot || $grub_in_current; then
vars_file="./hosts/$hostName/variables.nix"
python3 - <<PY
from pathlib import Path
import re
vars_path = Path("$vars_file")
text = vars_path.read_text()
text = re.sub(r"^\\s*bootLoader\\s*=.*\\n", "", text, flags=re.M)
text = re.sub(r"^\\s*grubMirroredBoots\\s*=\\s*\\[[\\s\\S]*?^\\s*];\\n", "", text, flags=re.M)
boot = ${boot_device@Q}
boot2 = ${boot2_device@Q}
insert_lines = [
' bootLoader = "grub";',
]
if $mirror_boot and boot and boot2:
insert_lines += [
' grubMirroredBoots = [',
f' {{ path = "/boot"; devices = [ "{boot}" ]; }}',
f' {{ path = "/boot2"; devices = [ "{boot2}" ]; }}',
' ];',
]
elif boot:
insert_lines += [
' grubMirroredBoots = [',
f' {{ path = "/boot"; devices = [ "{boot}" ]; }}',
' ];',
]
insert = "\\n".join(insert_lines) + "\\n"
text, n = re.subn(r"(^\\s*zaneyos\\s*=\\s*\\{\\n)", r"\\1" + insert, text, count=1, flags=re.M)
if n == 0:
raise SystemExit("Could not find zaneyos block to insert bootloader settings")
vars_path.write_text(text)
PY
if $mirror_boot && [ -n "$boot_device" ] && [ -n "$boot2_device" ]; then
echo -e "${GREEN}Detected mirrored /boot and /boot2; configuring GRUB with mirroredBoots.${NC}"
elif $mirror_boot; then
echo -e "${RED}Detected /boot2 but could not resolve devices; enabling GRUB without mirroredBoots.${NC}"
else
echo -e "${GREEN}Detected GRUB-based system; configuring GRUB.${NC}"
fi
else
echo -e "${GREEN}No mirrored /boot2 and no GRUB detected; leaving bootloader defaults.${NC}"
fi
print_header "Setting Nix Configuration"
NIX_CONFIG="experimental-features = nix-command flakes"
@ -221,7 +382,7 @@ if [[ ! $REPLY =~ ^[Yy]$ ]]; then
exit 1
fi
sudo nixos-rebuild boot --flake ~/zaneyos/#${profile}
sudo nixos-rebuild boot --flake ~/zaneyos/#${hostName}
# Check the exit status of the last command (nixos-rebuild)
if [ $? -eq 0 ]; then

View file

@ -21,6 +21,7 @@ in {
SRC="${configDir}"
if [ ! -d "$DEST" ]; then
$DRY_RUN_CMD rm -rf "$DEST"
$DRY_RUN_CMD mkdir -p "$HOME/.config/quickshell"
$DRY_RUN_CMD cp -R "$SRC" "$DEST"
$DRY_RUN_CMD chmod -R u+rwX "$DEST"

View file

@ -1,6 +1,10 @@
{pkgs, ...}: {
{
pkgs,
zaneyos,
...
}: {
programs.obs-studio = {
enable = true;
enable = zaneyos.obsStudioEnable;
#enableVirtualCamera = true;
plugins = with pkgs.obs-studio-plugins; [
wlrobs

View file

@ -56,7 +56,7 @@ pkgs.writeShellScriptBin "DropTerminal" ''
# Debug echo function
debug_echo() {
if [ "$DEBUG" = true ]; then
echo "$@" >&2
echo "$@"
fi
}
@ -95,11 +95,6 @@ pkgs.writeShellScriptBin "DropTerminal" ''
local target_y="$3"
local width="$4"
local height="$5"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid geometry for slide down; skipping animation"
return 1
fi
debug_echo "Animating slide down for window $addr to position $target_x,$target_y"
@ -131,11 +126,6 @@ pkgs.writeShellScriptBin "DropTerminal" ''
local start_y="$3"
local width="$4"
local height="$5"
if ! [[ "$start_x" =~ ^-?[0-9]+$ ]] || ! [[ "$start_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid geometry for slide up; skipping animation"
return 1
fi
debug_echo "Animating slide up for window $addr from position $start_x,$start_y"
@ -181,13 +171,6 @@ pkgs.writeShellScriptBin "DropTerminal" ''
local mon_height=$(echo $monitor_info | cut -d' ' -f4)
local mon_scale=$(echo $monitor_info | cut -d' ' -f5)
local mon_name=$(echo $monitor_info | cut -d' ' -f6)
# Ensure geometry values are numeric; Hyprland can emit non-JSON status lines during startup
if ! [[ "$mon_x" =~ ^-?[0-9]+$ ]] || ! [[ "$mon_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$mon_width" =~ ^[0-9]+$ ]] || ! [[ "$mon_height" =~ ^[0-9]+$ ]]; then
debug_echo "Error: Non-numeric monitor geometry; using fallback values"
echo "100 100 800 600 fallback-monitor"
return 1
fi
debug_echo "Monitor info: x=$mon_x, y=$mon_y, width=$mon_width, height=$mon_height, scale=$mon_scale"
@ -295,17 +278,12 @@ pkgs.writeShellScriptBin "DropTerminal" ''
if [ $? -ne 0 ]; then
debug_echo "Warning: Using fallback positioning"
fi
local target_x target_y width height monitor_name
read -r target_x target_y width height monitor_name <<<"$pos_info"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid position parsed; using fallback values"
target_x=100
target_y=100
width=800
height=600
monitor_name="fallback-monitor"
fi
local target_x=$(echo $pos_info | cut -d' ' -f1)
local target_y=$(echo $pos_info | cut -d' ' -f2)
local width=$(echo $pos_info | cut -d' ' -f3)
local height=$(echo $pos_info | cut -d' ' -f4)
local monitor_name=$(echo $pos_info | cut -d' ' -f5)
debug_echo "Target position: ''${target_x},''${target_y}, size: ''${width}x''${height}"
@ -366,16 +344,11 @@ pkgs.writeShellScriptBin "DropTerminal" ''
debug_echo "Monitor focus changed: moving dropdown to $focused_monitor"
# Calculate new position for focused monitor
pos_info=$(calculate_dropdown_position)
read -r target_x target_y width height monitor_name <<<"$pos_info"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid position parsed; using fallback values"
target_x=100
target_y=100
width=800
height=600
monitor_name="fallback-monitor"
fi
target_x=$(echo $pos_info | cut -d' ' -f1)
target_y=$(echo $pos_info | cut -d' ' -f2)
width=$(echo $pos_info | cut -d' ' -f3)
height=$(echo $pos_info | cut -d' ' -f4)
monitor_name=$(echo $pos_info | cut -d' ' -f5)
# Move and resize window
hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$TERMINAL_ADDR"
hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR"
@ -388,15 +361,10 @@ pkgs.writeShellScriptBin "DropTerminal" ''
# Calculate target position
pos_info=$(calculate_dropdown_position)
read -r target_x target_y width height monitor_name <<<"$pos_info"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid position parsed; using fallback values"
target_x=100
target_y=100
width=800
height=600
fi
target_x=$(echo $pos_info | cut -d' ' -f1)
target_y=$(echo $pos_info | cut -d' ' -f2)
width=$(echo $pos_info | cut -d' ' -f3)
height=$(echo $pos_info | cut -d' ' -f4)
# Use movetoworkspacesilent to avoid affecting workspace history
hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$TERMINAL_ADDR"

View file

@ -1,9 +1,9 @@
{
config,
pkgs,
inputs,
pkgs,
username,
profile,
zaneyos,
...
}: {
home.packages = [
@ -19,9 +19,15 @@
(import ./squirtle.nix {inherit pkgs;})
(import ./task-waybar.nix {inherit pkgs;})
(import ./DropTerminal.nix {inherit pkgs;})
# Fastfetch wrappers
(import ./ff.nix {inherit pkgs;})
(import ./ff1.nix {inherit pkgs;})
(import ./ff2.nix {inherit pkgs;})
(import ./ff3.nix {inherit pkgs;})
(import ./ff4.nix {inherit pkgs;})
(import ./ff5.nix {inherit pkgs;})
(import ./wallsetter.nix {
inherit pkgs inputs;
inherit username;
inherit inputs pkgs username;
})
(import ./web-search.nix {inherit pkgs;})
# Cheatsheets viewer + parser
@ -33,8 +39,8 @@
(import ./qs-vid-wallpapers-apply.nix {inherit pkgs;})
(import ./qs-vid-wallpapers-watchdog.nix {inherit pkgs;})
(import ./qs-wallpapers.nix {inherit pkgs;})
(import ./qs-wallpapers-apply.nix {inherit pkgs inputs;})
(import ./qs-wallpapers-restore.nix {inherit pkgs inputs;})
(import ./qs-wallpapers-apply.nix {inherit inputs pkgs;})
(import ./qs-wallpapers-restore.nix {inherit inputs pkgs;})
(import ./qs-wlogout.nix {inherit pkgs;})
(import ./qs-docs.nix {inherit pkgs;})
(import ./docs-parser.nix {inherit pkgs;})
@ -42,9 +48,9 @@
(import ./hyprland-change-layout.nix {inherit pkgs;})
(import ./launch-nwg-menu.nix {inherit pkgs;})
(import ./hyprland-dock.nix {inherit pkgs;})
(import ./restart.noctalia.nix {inherit pkgs;})
(import ./zcli.nix {
inherit pkgs profile;
inherit pkgs;
inherit zaneyos;
backupFiles = [
".config/mimeapps.list.backup"
];

View file

@ -0,0 +1,37 @@
{pkgs}:
pkgs.writeTextFile {
name = "ff";
executable = true;
destination = "/bin/ff";
text = ''
#!${pkgs.bash}/bin/bash
set -euo pipefail
cfg="$HOME/.config/fastfetch/fastfetch-system-times.config.jsonc"
parent_pid=$PPID
parent_name=""
if [[ -r "/proc/$parent_pid/comm" ]]; then
parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")"
else
parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)"
fi
if [[ -z "$parent_name" && -n "${SHELL:-}" ]]; then
parent_name="$(basename -- "$SHELL")"
fi
case "$parent_name" in
*zsh*) shell="${pkgs.zsh}/bin/zsh" ;;
*bash*) shell="${pkgs.bash}/bin/bash" ;;
*fish*) shell="${pkgs.fish}/bin/fish" ;;
*nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;;
*) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;;
esac
if [[ -z "${shell:-}" ]]; then
shell="${pkgs.zsh}/bin/zsh"
fi
exec "$shell" -c "fastfetch -c \"$cfg\""
'';
}

View file

@ -0,0 +1,37 @@
{pkgs}:
pkgs.writeTextFile {
name = "ff1";
executable = true;
destination = "/bin/ff1";
text = ''
#!${pkgs.bash}/bin/bash
set -euo pipefail
cfg="$HOME/.config/fastfetch/fastfetch1.config.jsonc"
parent_pid=$PPID
parent_name=""
if [[ -r "/proc/$parent_pid/comm" ]]; then
parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")"
else
parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)"
fi
if [[ -z "$parent_name" && -n "${SHELL:-}" ]]; then
parent_name="$(basename -- "$SHELL")"
fi
case "$parent_name" in
*zsh*) shell="${pkgs.zsh}/bin/zsh" ;;
*bash*) shell="${pkgs.bash}/bin/bash" ;;
*fish*) shell="${pkgs.fish}/bin/fish" ;;
*nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;;
*) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;;
esac
if [[ -z "${shell:-}" ]]; then
shell="${pkgs.zsh}/bin/zsh"
fi
exec "$shell" -c "fastfetch -c \"$cfg\""
'';
}

View file

@ -0,0 +1,37 @@
{pkgs}:
pkgs.writeTextFile {
name = "ff2";
executable = true;
destination = "/bin/ff2";
text = ''
#!${pkgs.bash}/bin/bash
set -euo pipefail
cfg="$HOME/.config/fastfetch/fastfetch2.config.jsonc"
parent_pid=$PPID
parent_name=""
if [[ -r "/proc/$parent_pid/comm" ]]; then
parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")"
else
parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)"
fi
if [[ -z "$parent_name" && -n "${SHELL:-}" ]]; then
parent_name="$(basename -- "$SHELL")"
fi
case "$parent_name" in
*zsh*) shell="${pkgs.zsh}/bin/zsh" ;;
*bash*) shell="${pkgs.bash}/bin/bash" ;;
*fish*) shell="${pkgs.fish}/bin/fish" ;;
*nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;;
*) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;;
esac
if [[ -z "${shell:-}" ]]; then
shell="${pkgs.zsh}/bin/zsh"
fi
exec "$shell" -c "fastfetch -c \"$cfg\""
'';
}

View file

@ -0,0 +1,37 @@
{pkgs}:
pkgs.writeTextFile {
name = "ff3";
executable = true;
destination = "/bin/ff3";
text = ''
#!${pkgs.bash}/bin/bash
set -euo pipefail
cfg="$HOME/.config/fastfetch/fastfetch3.config.jsonc"
parent_pid=$PPID
parent_name=""
if [[ -r "/proc/$parent_pid/comm" ]]; then
parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")"
else
parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)"
fi
if [[ -z "$parent_name" && -n "''${SHELL:-}" ]]; then
parent_name="$(basename -- "$SHELL")"
fi
case "$parent_name" in
*zsh*) shell="${pkgs.zsh}/bin/zsh" ;;
*bash*) shell="${pkgs.bash}/bin/bash" ;;
*fish*) shell="${pkgs.fish}/bin/fish" ;;
*nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;;
*) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;;
esac
if [[ -z "''${shell:-}" ]]; then
shell="${pkgs.zsh}/bin/zsh"
fi
exec "$shell" -c "fastfetch -c \"$cfg\""
'';
}

View file

@ -0,0 +1,37 @@
{pkgs}:
pkgs.writeTextFile {
name = "ff4";
executable = true;
destination = "/bin/ff4";
text = ''
#!${pkgs.bash}/bin/bash
set -euo pipefail
cfg="$HOME/.config/fastfetch/fastfetch4.config.jsonc"
parent_pid=$PPID
parent_name=""
if [[ -r "/proc/$parent_pid/comm" ]]; then
parent_name="$(tr -d '\0' < "/proc/$parent_pid/comm")"
else
parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)"
fi
if [[ -z "$parent_name" && -n "''${SHELL:-}" ]]; then
parent_name="$(basename -- "$SHELL")"
fi
case "$parent_name" in
*zsh*) shell="${pkgs.zsh}/bin/zsh" ;;
*bash*) shell="${pkgs.bash}/bin/bash" ;;
*fish*) shell="${pkgs.fish}/bin/fish" ;;
*nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;;
*) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;;
esac
if [[ -z "''${shell:-}" ]]; then
shell="${pkgs.zsh}/bin/zsh"
fi
exec "$shell" -c "fastfetch -c \"$cfg\""
'';
}

View file

@ -0,0 +1,37 @@
{pkgs}:
pkgs.writeTextFile {
name = "ff5";
executable = true;
destination = "/bin/ff5";
text = ''
#!${pkgs.bash}/bin/bash
set -euo pipefail
cfg="$HOME/.config/fastfetch/fastfetch5.config.jsonc"
parent_pid=$PPID
parent_name=""
if [[ -r "/proc/$parent_pid/comm" ]]; then
parent_name="$(tr -d '\\0' < "/proc/$parent_pid/comm")"
else
parent_name="$(ps -o comm= -p "$parent_pid" 2>/dev/null || true)"
fi
if [[ -z "$parent_name" && -n "''${SHELL:-}" ]]; then
parent_name="$(basename -- "$SHELL")"
fi
case "$parent_name" in
*zsh*) shell="${pkgs.zsh}/bin/zsh" ;;
*bash*) shell="${pkgs.bash}/bin/bash" ;;
*fish*) shell="${pkgs.fish}/bin/fish" ;;
*nu*|*nushell*) shell="${pkgs.nushell}/bin/nu" ;;
*) shell="$(command -v "$parent_name" 2>/dev/null || true)" ;;
esac
if [[ -z "''${shell:-}" ]]; then
shell="${pkgs.zsh}/bin/zsh"
fi
exec "$shell" -c "fastfetch -c \"$cfg\""
'';
}

View file

@ -18,9 +18,8 @@ pkgs.writeShellScriptBin "dock" ''
MENU="nwg-drawer -mb 100 -mt 100 -ml 300 -mr 300"
# Masked apps won't show in DOCK.
# I am running pyprland scratchpads
# They don't show up correctly so I mask it off
MASK_APPS="kitty-dropterm"
# Dropdown terminal doesn't show correctly in the dock, so mask it off
MASK_APPS="dropterminal"
ICON_SIZE=32
MARGIN_BOTTOM=10

View file

@ -1,54 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
# Restart the Noctalia QuickShell session by terminating only the noctalia-shell
# processes, avoiding any signals to unrelated process groups (e.g. Hyprland).
log() { printf "[restart.noctalia] %s\n" "$*"; }
list_target_pids() {
# Collect only PIDs whose command explicitly runs noctalia-shell
# - direct wrapper: ".../noctalia-shell"
# - quickshell/qs with "-c noctalia-shell"
ps -eo pid=,cmd= \
| ${GREP:-grep} -E "(^|/)(noctalia-shell)( |$)|(^| )((qs|quickshell))( | ).*-c( |=)?noctalia-shell( |$)" \
| awk '{print $1}'
}
terminate_targets() {
local pids left tries
mapfile -t pids < <(list_target_pids || true)
if ((${#pids[@]} > 0)); then
kill -TERM "${pids[@]}" 2>/dev/null || true
fi
# Wait up to ~3s for clean exit
for tries in {1..15}; do
mapfile -t left < <(list_target_pids || true)
((${#left[@]} == 0)) && break
sleep 0.2
done
# Force kill leftovers only (do not touch anything else)
if ((${#left[@]} > 0)); then
kill -KILL "${left[@]}" 2>/dev/null || true
fi
}
start_noctalia() {
# Prefer the noctalia-shell wrapper to ensure proper env and runtime flags
if command -v noctalia-shell >/dev/null 2>&1; then
nohup setsid noctalia-shell >/dev/null 2>&1 &
elif command -v quickshell >/dev/null 2>&1; then
nohup setsid quickshell -c noctalia-shell >/dev/null 2>&1 &
elif command -v qs >/dev/null 2>&1; then
nohup setsid qs -c noctalia-shell >/dev/null 2>&1 &
else
echo "Error: noctalia-shell/quickshell/qs not found in PATH" >&2
exit 1
fi
}
terminate_targets
start_noctalia

View file

@ -1,24 +0,0 @@
{pkgs, ...}: let
binPath = pkgs.lib.makeBinPath [
pkgs.coreutils
pkgs.procps
pkgs.psmisc
pkgs.gnugrep
pkgs.findutils
pkgs.util-linux
pkgs.bash
];
script = builtins.readFile ./restart.noctalia;
in
pkgs.writeShellScriptBin "restart.noctalia" ''
set -euo pipefail
export PATH=${binPath}:$PATH
tmp_script=$(mktemp)
trap 'rm -f "$tmp_script"' EXIT
cat > "$tmp_script" <<'BASH_EOF'
${script}
BASH_EOF
chmod +x "$tmp_script"
exec ${pkgs.bash}/bin/bash "$tmp_script" "$@"
''

View file

@ -1,6 +1,6 @@
{
zaneyos,
pkgs,
profile,
backupFiles ? [".config/mimeapps.list.backup"],
...
}: let
@ -90,7 +90,7 @@ in
# Purpose: NixOS system management utility for ZaneyOS distribution
# Author: Don Williams (ddubs) & Zaney
# Start Date: June 7th, 2025
# Version: 1.0.2
# Version: 1.0.3
#
# Architecture:
# - Nix-generated shell script using writeShellScriptBin
@ -129,55 +129,29 @@ in
# --- Configuration ---
PROJECT="zaneyos" #ddubos or zaneyos
PROFILE_DEFAULT="${profile}"
PROJECT="zaneyos" # ddubos or zaneyos
VERSION="1.0.3"
BACKUP_FILES_STR="${backupFilesString}"
VERSION="1.0.2"
FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix"
FLAKE_DIR="$HOME/$PROJECT"
FLAKE_NIX_PATH="$FLAKE_DIR/flake.nix"
read -r -a BACKUP_FILES <<< "$BACKUP_FILES_STR"
# --- Helper Functions ---
get_flake_profile() {
local flake_profile=""
if [ -f "$FLAKE_NIX_PATH" ]; then
flake_profile=$(${pkgs.gnugrep}/bin/grep -E '^[[:space:]]*profile[[:space:]]*=' "$FLAKE_NIX_PATH" | ${pkgs.gnused}/bin/sed 's/.*=[[:space:]]*"\([^"]*\)".*/\1/')
fi
echo "$flake_profile"
}
verify_hostname() {
local current_hostname
local flake_hostname
current_hostname="$(${pkgs.nettools}/bin/hostname)"
current_hostname="$(hostname)"
# Extract the host value from flake.nix
if [ -f "$FLAKE_NIX_PATH" ]; then
flake_hostname=$(${pkgs.gnugrep}/bin/grep -E '^[[:space:]]*host[[:space:]]*=' "$FLAKE_NIX_PATH" | ${pkgs.gnused}/bin/sed 's/.*=[[:space:]]*"\([^"]*\)".*/\1/')
if [ -z "$flake_hostname" ]; then
echo "Error: Could not find 'host' variable in $FLAKE_NIX_PATH" >&2
exit 1
fi
if [ "$current_hostname" != "$flake_hostname" ]; then
echo "Error: Hostname mismatch!" >&2
echo " Current hostname: '$current_hostname'" >&2
echo " Flake.nix host: '$flake_hostname'" >&2
echo "" >&2
echo "Hint: Run 'zcli update-host' to automatically update flake.nix" >&2
echo " or manually edit $FLAKE_NIX_PATH" >&2
exit 1
fi
else
if [ ! -f "$FLAKE_NIX_PATH" ]; then
echo "Error: Flake.nix not found at $FLAKE_NIX_PATH" >&2
exit 1
fi
# Also check if host folder exists
local folder="$HOME/$PROJECT/hosts/$current_hostname"
# Check if a matching host folder exists under hosts/
local folder="$FLAKE_DIR/hosts/$current_hostname"
if [ ! -d "$folder" ]; then
echo "Error: Matching host not found in $PROJECT, Missing folder: $folder" >&2
echo "Error: Matching host not found in $PROJECT. Missing: $folder" >&2
echo "Hint: Run 'zcli update-host' to create it (copies hosts/default) or run 'zcli update-host $current_hostname <profile>'." >&2
exit 1
fi
}
@ -188,31 +162,40 @@ in
echo "Usage: zcli [command] [options]"
echo ""
echo "Commands:"
echo " cleanup - Clean up old system generations. Can specify a number to keep."
echo " diag - Create a system diagnostic report."
echo " (Filename: homedir/diag.txt)"
echo " list-gens - List user and system generations."
echo " rebuild - Rebuild the NixOS system configuration."
echo " rebuild-boot - Rebuild and set as boot default (activates on next restart)."
echo " trim - Trim filesystems to improve SSD performance."
echo " update - Update the flake and rebuild the system."
echo " update-host - Auto set host and profile in flake.nix."
echo " (Opt: zcli update-host [hostname] [profile])"
echo " Host management:"
echo " add-host - Create host from template and add to flake.nix hosts list."
echo " (Opt: zcli add-host [hostname] [profile])"
echo " del-host - Remove host directory and prune from flake.nix hosts list."
echo " (Usage: zcli del-host [hostname])"
echo " list-hosts - Show current hosts from flake.nix (prints the hosts array)."
echo " update-host - Auto set host and profile in flake.nix."
echo " (Opt: zcli update-host [hostname] [profile])"
echo ""
echo " Build and updates:"
echo " rebuild - Rebuild the NixOS system configuration."
echo " rebuild-boot - Rebuild and set as boot default (activates on next restart)."
echo " update - Update the flake and rebuild the system."
echo ""
echo " Maintenance:"
echo " cleanup - Clean up old system generations. Can specify a number to keep."
echo " diag - Create a system diagnostic report (saved to ~/diag.txt)."
echo " list-gens - List user and system generations."
echo " trim - Trim filesystems to improve SSD performance."
echo ""
echo " Doom Emacs:"
echo " doom install - Install Doom Emacs using get-doom script."
echo " doom status - Check if Doom Emacs is installed."
echo " doom remove - Remove Doom Emacs installation."
echo " doom update - Update Doom Emacs (runs doom sync)."
echo ""
echo "Options for rebuild, rebuild-boot, and update commands:"
echo " --dry, -n - Show what would be done without doing it"
echo " --ask, -a - Ask for confirmation before proceeding"
echo " --cores N - Limit build to N cores (useful for VMs)"
echo " --verbose, -v - Show verbose output"
echo " --no-nom - Don't use nix-output-monitor"
echo " --dry, -n - Show what would be done without doing it"
echo " --ask, -a - Ask for confirmation before proceeding"
echo " --cores N - Limit build to N cores (useful for VMs)"
echo " --verbose, -v - Show verbose output"
echo " --no-nom - Don't use nix-output-monitor"
echo ""
echo "Doom Emacs:"
echo " doom install - Install Doom Emacs using get-doom script."
echo " doom status - Check if Doom Emacs is installed."
echo " doom remove - Remove Doom Emacs installation."
echo " doom update - Update Doom Emacs (runs doom sync)."
echo ""
echo " help - Show this help message."
echo " help - Show this help message."
}
handle_backups() {
@ -355,11 +338,42 @@ in
echo "$args_string"
}
# Resolve the nixosConfigurations target name for nh
get_nh_target() {
local current_hostname
current_hostname="$(${pkgs.nettools}/bin/hostname)"
if [ -d "$FLAKE_DIR/hosts/$current_hostname" ]; then
echo "$current_hostname"
elif [ -d "$FLAKE_DIR/hosts/default" ]; then
echo "default"
else
echo ""
fi
}
# --- flake.nix host list helpers ---
hosts_block() {
${pkgs.gnused}/bin/sed -n '/^\s*hosts\s*=\s*\[/,/\];/p' "$FLAKE_NIX_PATH"
}
list_hosts_from_flake() {
hosts_block | ${pkgs.gnugrep}/bin/grep -o '"[^"]\+"' | ${pkgs.coreutils}/bin/tr -d '"'
}
ensure_host_in_flake_hosts() {
local h="$1"
if ! list_hosts_from_flake | ${pkgs.gnugrep}/bin/grep -qx "$h"; then
echo "Adding '$h' to flake hosts list..."
${pkgs.gnused}/bin/sed -i '/^\s*hosts\s*=\s*\[/a\ \"'"$h"'\"' "$FLAKE_NIX_PATH"
fi
}
remove_host_from_flake_hosts() {
local h="$1"
${pkgs.gnused}/bin/sed -i '/^\s*hosts\s*=\s*\[/,/\];/ { /^\s*"'"$h"'"\s*$/d }' "$FLAKE_NIX_PATH"
}
# --- Main Logic ---
PROFILE="$(get_flake_profile)"
if [ -z "$PROFILE" ]; then
PROFILE="$PROFILE_DEFAULT"
fi
if [ "$#" -eq 0 ]; then
echo "Error: No command provided." >&2
print_help
@ -389,12 +403,6 @@ in
fi
fi
LOG_DIR="$HOME/zcli-cleanup-logs"
mkdir -p "$LOG_DIR"
LOG_FILE="$LOG_DIR/zcli-cleanup-$(${pkgs.coreutils}/bin/date +%Y-%m-%d_%H-%M-%S).log"
echo "Cleaning up old log files..." >> "$LOG_FILE"
${pkgs.findutils}/bin/find "$LOG_DIR" -type f -mtime +3 -name "*.log" -delete >> "$LOG_FILE" 2>&1
echo "Cleanup process logged to $LOG_FILE"
;;
diag)
echo "Generating system diagnostic report..."
@ -411,6 +419,14 @@ in
echo "--- System Generations ---"
${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system || echo "Could not list system generations."
;;
list-hosts)
if [ ! -f "$FLAKE_NIX_PATH" ]; then
echo "Error: flake.nix not found at $FLAKE_NIX_PATH" >&2
exit 1
fi
echo "Hosts defined in flake.nix:"
list_hosts_from_flake | ${pkgs.coreutils}/bin/sort | ${pkgs.coreutils}/bin/uniq
;;
rebuild)
verify_hostname
handle_backups
@ -418,8 +434,14 @@ in
# Parse additional arguments
extra_args=$(parse_nh_args "$@")
echo "Starting NixOS rebuild for host: $(${pkgs.nettools}/bin/hostname)"
if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname '$PROFILE' $extra_args"; then
target="$(get_nh_target)"
if [ -z "$target" ]; then
echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2
exit 1
fi
echo "Starting NixOS rebuild for config: $target"
if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname \"$target\" $extra_args"; then
echo "Rebuild finished successfully"
else
echo "Rebuild Failed" >&2
@ -433,9 +455,15 @@ in
# Parse additional arguments
extra_args=$(parse_nh_args "$@")
echo "Starting NixOS rebuild (boot) for host: $(${pkgs.nettools}/bin/hostname)"
target="$(get_nh_target)"
if [ -z "$target" ]; then
echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2
exit 1
fi
echo "Starting NixOS rebuild (boot) for config: $target"
echo "Note: Configuration will be activated on next reboot"
if eval "${pkgs.nh}/bin/nh os boot --diff always --hostname '$PROFILE' $extra_args"; then
if eval "${pkgs.nh}/bin/nh os boot --diff always --hostname \"$target\" $extra_args"; then
echo "Rebuild-boot finished successfully"
echo "New configuration set as boot default - restart to activate"
else
@ -462,8 +490,14 @@ in
# Parse additional arguments
extra_args=$(parse_nh_args "$@")
echo "Updating flake and rebuilding system for host: $(${pkgs.nettools}/bin/hostname)"
if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname '$PROFILE' --update $extra_args"; then
target="$(get_nh_target)"
if [ -z "$target" ]; then
echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2
exit 1
fi
echo "Updating flake and rebuilding system for config: $target"
if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname \"$target\" --update $extra_args"; then
echo "Update and rebuild finished successfully"
else
echo "Update and rebuild Failed" >&2
@ -495,25 +529,28 @@ in
exit 1
fi
echo "Updating $FLAKE_NIX_PATH..."
echo "Preparing host '$target_hostname' (profile: $target_profile)..."
# Update host
if ${pkgs.gnused}/bin/sed -i "s/^[[:space:]]*host[[:space:]]*=[[:space:]]*\".*\"/ host = \"$target_hostname\"/" "$FLAKE_NIX_PATH"; then
echo "Successfully updated host to: $target_hostname"
# Ensure host directory exists (copy from hosts/default if missing)
if [ ! -d "$FLAKE_DIR/hosts/$target_hostname" ]; then
echo "Creating $FLAKE_DIR/hosts/$target_hostname from hosts/default..."
${pkgs.coreutils}/bin/cp -r "$FLAKE_DIR/hosts/default" "$FLAKE_DIR/hosts/$target_hostname"
fi
# Update variables.nix (hostName and gpuProfile)
host_vars_file="$FLAKE_DIR/hosts/$target_hostname/variables.nix"
if [ -f "$host_vars_file" ]; then
${pkgs.gnused}/bin/sed -i "s/\(hostName[[:space:]]*=\)[[:space:]]*\"[^\"]*\"/\1 \"$target_hostname\"/" "$host_vars_file"
${pkgs.gnused}/bin/sed -i "s/\(gpuProfile[[:space:]]*=\)[[:space:]]*\"[^\"]*\"/\1 \"$target_profile\"/" "$host_vars_file"
else
echo "Error: Failed to update host in $FLAKE_NIX_PATH" >&2
echo "Error: missing $host_vars_file" >&2
exit 1
fi
# Update profile
if ${pkgs.gnused}/bin/sed -i "s/^[[:space:]]*profile[[:space:]]*=[[:space:]]*\".*\"/ profile = \"$target_profile\"/" "$FLAKE_NIX_PATH"; then
echo "Successfully updated profile to: $target_profile"
else
echo "Error: Failed to update profile in $FLAKE_NIX_PATH" >&2
exit 1
fi
# Ensure the host appears in the flake 'hosts' array
ensure_host_in_flake_hosts "$target_hostname"
echo "Flake.nix updated successfully!"
echo "Host '$target_hostname' is ready. You can now run: zcli rebuild"
;;
add-host)
hostname=""
@ -568,6 +605,9 @@ in
echo "hardware.nix generated."
fi
# Ensure the host appears in flake.nix hosts list
ensure_host_in_flake_hosts "$hostname"
echo "Adding new host to git..."
${pkgs.git}/bin/git -C "$HOME/$PROJECT" add .
echo "hostname: $hostname added"
@ -590,6 +630,8 @@ in
if [[ $REPLY =~ ^[Yy]$ ]]; then
echo "Deleting host '$hostname'..."
${pkgs.coreutils}/bin/rm -rf "$HOME/$PROJECT/hosts/$hostname"
# Remove from flake.nix hosts list as well
remove_host_from_flake_hosts "$hostname"
${pkgs.git}/bin/git -C "$HOME/$PROJECT" add .
echo "hostname: $hostname removed"
else
@ -645,7 +687,12 @@ in
echo "Enabling Doom Emacs in $host_vars_file..."
ensure_doom_enabled
echo "Rebuilding system so user modules are applied..."
if ${pkgs.nh}/bin/nh os switch --diff always --hostname "$PROFILE"; then
target="$(get_nh_target)"
if [ -z "$target" ]; then
echo "Error: Could not resolve flake config (no hosts/$(${pkgs.nettools}/bin/hostname) or hosts/default)." >&2
exit 1
fi
if ${pkgs.nh}/bin/nh os switch --diff always --hostname "$target"; then
echo "Rebuild complete. Proceeding with Doom installation."
else
echo "Error: Rebuild failed. Please fix the build and re-run 'zcli doom install'." >&2

View file

@ -1,7 +1,5 @@
_: {
stylix.targets = {
# Avoid fetching GNOME Shell sources on non-GNOME systems (breaks on some remotes)
gnome.enable = false;
waybar.enable = false;
rofi.enable = false;
hyprland.enable = false;

View file

@ -1,8 +1,9 @@
{
pkgs,
lib,
zaneyos,
...
}: {
}:
lib.mkIf zaneyos.alacrittyEnable {
programs.alacritty = let
font_family = lib.mkDefault "Maple mono NF";
in {

View file

@ -1,8 +1,11 @@
{
pkgs,
config,
lib,
pkgs,
zaneyos,
...
}: let
}:
lib.mkIf zaneyos.ghosttyEnable (let
ghostHome = "${config.xdg.configHome}/ghostty";
shaderFile = "${ghostHome}/shaders/shader.glsl";
in {
@ -219,4 +222,4 @@ in {
fi
'')
];
}
})

View file

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

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