Compare commits

...
Sign in to create a new pull request.

145 commits

Author SHA1 Message Date
Don Williams
611e752c32 Updated flake 2026-05-11 14:30:39 -04:00
Don Williams
1b34c0902a Added cpu-freq code but left disabled
{config,pkgs, ...}: {

  environment.systemPackages = with pkgs; [
  ];

  services.auto-cpufreq.enable = false;
  services.auto-cpufreq.settings = {
    battery = {
       governor = "powersave";
       turbo = "never";
    };
    charger = {
       governor = "performance";
       turbo = "auto";
    };
  };

}

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

 Changes to be committed:
	modified:   hosts/default/host-packages.nix
2026-05-09 14:46:05 -04:00
Don Williams
193d081fb7 Updated flake 2026-05-08 12:31:56 -04:00
Don Williams
4fd242962f Updated flake
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/host-packages.nix
2026-05-01 11:20:36 -04:00
Don Williams
e7dcca1d02 Added override for opensshl v1.1.1w
Discord and direnv still call for that
Added override until they update electron / pkgs

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

 Changes to be committed:
	modified:   modules/core/packages.nix
	modified:   modules/home/editors/vscode.nix
2026-05-01 11:05:02 -04:00
Don Williams
059a29fb9b Didsabled noice to remove press any key popop
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/editors/nixvim.nix
2026-04-25 05:16:48 -04:00
Don Williams
f17b75f385 Moved kernel to latest, disbled vfr in hyprland cfg
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/core/boot.nix
	modified:   modules/home/hyprland/hyprland.nix
2026-04-25 03:27:46 -04:00
Don Williams
ebda3aeb0d removed bugsvim from zaneyos-next
It's not compatible with current neovim and treesitter

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

 Changes to be committed:
	modified:   CHANGELOG.md
	deleted:    cheatsheets/Intro-bugsvim-neovim-cfg.md
	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/core/overlays.nix
	modified:   modules/home/default.nix
	deleted:    modules/home/editors/bugsvim-nvim/.luacheckrc
	deleted:    modules/home/editors/bugsvim-nvim/.luarc.json
	deleted:    modules/home/editors/bugsvim-nvim/.stylua.toml
	deleted:    modules/home/editors/bugsvim-nvim/init.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/config/globals.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/config/keymaps.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/config/lazy.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/config/options.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/blink-cmp.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/colortheme.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/conform.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/gitsigns.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/lazydev.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/lualine.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/markdown-preview.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/markdown.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/mini-nvim.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/noice.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/nvim-dap.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lint.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/nvim-lspconfig.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/nvim-treesitter.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/persistance.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/snacks.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/todo-comments.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/plugins/which-key.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/bashls.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/clangd.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/cssls.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/html.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/hyprls.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/init.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/lua_ls.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/nil_ls.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/pyright.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/rust_analyzer.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/tailwindcss.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/servers/ts_ls.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/utils/diagnostics.lua
	deleted:    modules/home/editors/bugsvim-nvim/lua/utils/lsp.lua
	deleted:    modules/home/editors/bugsvim.nix
	modified:   modules/options.nix
2026-04-17 16:18:36 -04:00
Don Williams
f419f84ab5 made zcli GPU detection match install-zaneyos.sh
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-04-09 18:39:21 -04:00
Don Williams
f77a3dfbb0 Upd flake to fix CVE in NIX
On branch zos-next
 Your branch is up to date with 'origin/zos-next'.

 Changes to be committed:
	modified:   flake.lock
2026-04-07 19:58:20 -04:00
Don Williams
3b3356410a Change ver to 3.0 add bugsvim cheatsheet
Update flake, created into doc for bugsvim nvim config
 Disable neovim restore cursor last position feature

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

 Changes to be committed:
	modified:   CHANGELOG.md
	new file:   cheatsheets/Intro-bugsvim-neovim-cfg.md
	modified:   modules/core/system.nix
	modified:   modules/home/editors/bugsvim-nvim/lua/config/autocmds.lua
2026-04-07 01:11:35 -04:00
Don Williams
81308899ce Added zramswap to zos-next upd flake 2026-04-07 00:54:46 -04:00
Don Williams
0cc7d6f2d2 Added hyprshutdown 2026-04-05 17:33:19 -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
148 changed files with 4425 additions and 4723 deletions

View file

@ -5,7 +5,145 @@
---
# 🚀 **Current Release - ZaneyOS v2.5.6**
# 🚀 **Current Release - ZaneyOS v3.0**
#### 📅 **Updated: April 25th, 2026**
- Moved from `zen` to `latest` kernel
- Kernel v7.0.x is a better kernel than 6.19.zen
- Disabled `vfr` in Hyprland config
- Not supported post Hyprland v0.54.3
- `nixvim.nix` disabled `noice`
- Caused `press any key` popup after nevoim update
- Created wrtitable directory for neovim project.nvim
- A format update failed to update history
#### 📅 **Updated: April 7rd, 2026**
- Improved GPU detection in `install-zaneyos.sh` and `zcli`
- Added `hyprshutdown`
- Not yet wired in
- Changed `zos-next` version to 3.0
- Added `awww` to flake input
- Had issues installing from nixpkgs on older NixOS versions
#### 📅 **Updated: April 3rd, 2026**
- Swapped `awww` for `swww`
- `swww` is no longer maintained
- 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**
- 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**
- `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
- 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:
- 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

@ -164,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
@ -238,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>
@ -453,7 +481,7 @@ agrega tus paquetes.
ncdu
nvtopPackages.full
oh-my-posh
pyprland
DropTerminal
shellcheck
multimarkdown
nodejs_23
@ -799,7 +827,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
<summary>** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? **</summary>
1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file.
2. Comenta la línea `sleep 1.5 && swww img ...`
2. Comenta la línea `sleep 1.5 && awww img ...`
3. Agrega nueva línea después de eso con `sleep 1 && wallsetter`
```json
@ -807,13 +835,13 @@ settings = {
exec-once = [
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"killall -q swww;sleep .5 && swww init"
"killall -q awww;sleep .5 && awww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"DropTerminal --spawn-only"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```

50
FAQ.md
View file

@ -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
@ -228,6 +228,34 @@ Below are the keybindings for Hyprland, formatted for easy reference.
<div style="margin-left: 20px;">
<details>
<summary>**How do I set default apps (PDF, browser) per host?**</summary>
- 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
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>
<details>
<summary>**How to I add flatpaks? ?**</summary>
@ -441,7 +469,7 @@ packages.
ncdu
nvtopPackages.full
oh-my-posh
pyprland
DropTerminal
shellcheck
multimarkdown
nodejs_23
@ -785,7 +813,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
2. Comment out the line `sleep 1.5 && swww img ...`
2. Comment out the line `sleep 1.5 && awww img ...`
3. Add new line after that with `sleep 1 && wallsetter`
```json
@ -793,13 +821,13 @@ settings = {
exec-once = [
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"killall -q swww;sleep .5 && swww init"
"killall -q awww;sleep .5 && awww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"DropTerminal --spawn-only"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```
@ -1636,7 +1664,7 @@ packages.
ncdu
nvtopPackages.full
oh-my-posh
pyprland
DropTerminal
shellcheck
multimarkdown
nodejs_23
@ -1976,7 +2004,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
2. Comment out the line `sleep 1.5 && swww img ...`
2. Comment out the line `sleep 1.5 && awww img ...`
3. Add new line after that with `sleep 1 && wallsetter`
```json
@ -1984,13 +2012,13 @@ settings = {
exec-once = [
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"killall -q swww;sleep .5 && swww init"
"killall -q awww;sleep .5 && awww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"DropTerminal --spawn-only"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```

View file

@ -139,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

View file

@ -156,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

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

@ -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"
];
# ...

532
flake.lock generated
View file

@ -1,27 +1,5 @@
{
"nodes": {
"alejandra": {
"inputs": {
"fenix": "fenix",
"flakeCompat": "flakeCompat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1751513446,
"narHash": "sha256-pnRh5ysSgMSOQxvL82sNJRwD/CiSYWplrGRU2WLoNKQ=",
"owner": "kamadorueda",
"repo": "alejandra",
"rev": "c68bef57c1db3add865493d9cb741a14618bdc28",
"type": "github"
},
"original": {
"owner": "kamadorueda",
"repo": "alejandra",
"type": "github"
}
},
"antigravity-nix": {
"inputs": {
"flake-utils": "flake-utils",
@ -30,11 +8,11 @@
]
},
"locked": {
"lastModified": 1765361927,
"narHash": "sha256-tLmcNQktKdMpiQDtULTXSO4lcGvFpup6w+z2aRABbXU=",
"lastModified": 1776411505,
"narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=",
"owner": "jacopone",
"repo": "antigravity-nix",
"rev": "c2bf2c9bee379c9a50f532567056cf0befcd82c9",
"rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f",
"type": "github"
},
"original": {
@ -43,6 +21,28 @@
"type": "github"
}
},
"awww": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1777136912,
"narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=",
"ref": "refs/heads/main",
"rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66",
"revCount": 1363,
"type": "git",
"url": "https://codeberg.org/LGFae/awww"
},
"original": {
"type": "git",
"url": "https://codeberg.org/LGFae/awww"
}
},
"base16": {
"inputs": {
"fromYaml": "fromYaml"
@ -81,11 +81,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1760703920,
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"lastModified": 1776754714,
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
"type": "github"
},
"original": {
@ -111,36 +111,14 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"alejandra",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1730615655,
"narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
"owner": "nix-community",
"repo": "fenix",
"rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1764724327,
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
"lastModified": 1776136500,
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
"rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
"type": "github"
},
"original": {
@ -150,6 +128,22 @@
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1751685974,
@ -173,11 +167,11 @@
]
},
"locked": {
"lastModified": 1765495779,
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github"
},
"original": {
@ -194,11 +188,11 @@
]
},
"locked": {
"lastModified": 1760948891,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github"
},
"original": {
@ -215,11 +209,11 @@
]
},
"locked": {
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@ -246,40 +240,6 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakeCompat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -299,20 +259,18 @@
"gnome-shell": {
"flake": false,
"locked": {
"host": "gitlab.gnome.org",
"lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "gitlab"
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
},
"original": {
"host": "gitlab.gnome.org",
"owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell",
"type": "gitlab"
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
}
},
"home-manager": {
@ -322,16 +280,16 @@
]
},
"locked": {
"lastModified": 1765859973,
"narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=",
"lastModified": 1778503501,
"narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7df150f0d3857cf68dae443813b27acfb201b2d8",
"rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.11",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
@ -344,11 +302,11 @@
]
},
"locked": {
"lastModified": 1762964643,
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
"lastModified": 1777594677,
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
"type": "github"
},
"original": {
@ -357,41 +315,13 @@
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1754860581,
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.1.1",
"repo": "ixx",
"type": "github"
}
},
"mnw": {
"locked": {
"lastModified": 1758834834,
"narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
"lastModified": 1777828893,
"narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
"rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
"type": "github"
},
"original": {
@ -402,29 +332,33 @@
},
"ndg": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": [
"nvf",
"nixpkgs"
]
},
"locked": {
"lastModified": 1765720983,
"narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
"lastModified": 1776882296,
"narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
"owner": "feel-co",
"repo": "ndg",
"rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
"rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
"type": "github"
},
"original": {
"owner": "feel-co",
"ref": "refs/tags/v2.6.0",
"repo": "ndg",
"type": "github"
}
},
"nix-flatpak": {
"locked": {
"lastModified": 1739444422,
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"lastModified": 1767983141,
"narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"rev": "440818969ac2cbd77bfe025e884d0aa528991374",
"type": "github"
},
"original": {
@ -436,88 +370,40 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1765937330,
"narHash": "sha256-qRHfURG4wcEw70th8Pn/7xE8ZIJja56l+MP4QUMtQkQ=",
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "284facc0aa28fba98bc43506ccdd1fed3b97e2a3",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1764081664,
"narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1764522689,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
"systems": "systems_3"
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1765796859,
"narHash": "sha256-c2YaJUsLGk3WNqIHIU/Pt1fGjNH02ePsHfD5MJlfEe4=",
"lastModified": 1778510615,
"narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "d8c9d8451d4592dd7de647230f407d4d6370bd8e",
"rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "nixos-25.11",
"repo": "nixvim",
"type": "github"
}
@ -526,14 +412,15 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
]
],
"noctalia-qs": "noctalia-qs"
},
"locked": {
"lastModified": 1765939407,
"narHash": "sha256-7wlCANcMdIBNsAz0LGF/IBwkjicxCbCN1K2lrwt/MFk=",
"lastModified": 1778464608,
"narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"rev": "c74139c51dbdd47b8123c7186a8af613b840f493",
"rev": "761869a561548874fe7e293b157fd7841576b367",
"type": "github"
},
"original": {
@ -542,6 +429,29 @@
"type": "github"
}
},
"noctalia-qs": {
"inputs": {
"nixpkgs": [
"noctalia",
"nixpkgs"
],
"systems": "systems_2",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1778377995,
"narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=",
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"rev": "d8327a723eed6dd9aebe8e0b162126f390e827df",
"type": "github"
},
"original": {
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": [
@ -554,11 +464,11 @@
]
},
"locked": {
"lastModified": 1764773531,
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
"lastModified": 1777598946,
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
"type": "github"
},
"original": {
@ -567,44 +477,25 @@
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1761730856,
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
"owner": "NuschtOS",
"repo": "search",
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"nvf": {
"inputs": {
"flake-compat": "flake-compat",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"mnw": "mnw",
"ndg": "ndg",
"nixpkgs": "nixpkgs_3",
"systems": "systems_4"
"nixpkgs": [
"nixpkgs"
],
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1765894398,
"narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=",
"lastModified": 1778408907,
"narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
"owner": "notashelf",
"repo": "nvf",
"rev": "cd81bbb904571b538397d72a29e4c84b98480ee1",
"rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
"type": "github"
},
"original": {
@ -615,8 +506,8 @@
},
"root": {
"inputs": {
"alejandra": "alejandra",
"antigravity-nix": "antigravity-nix",
"awww": "awww",
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
@ -624,23 +515,28 @@
"noctalia": "noctalia",
"nvf": "nvf",
"stylix": "stylix",
"systems": "systems_3",
"zen-browser": "zen-browser"
}
},
"rust-analyzer-src": {
"flake": false,
"rust-overlay": {
"inputs": {
"nixpkgs": [
"awww",
"nixpkgs"
]
},
"locked": {
"lastModified": 1730555913,
"narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
"lastModified": 1764038373,
"narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
@ -653,26 +549,29 @@
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_3",
"gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_4",
"nixpkgs": [
"nixpkgs"
],
"nur": "nur",
"systems": "systems_5",
"tinted-foot": "tinted-foot",
"systems": [
"systems"
],
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1765900102,
"narHash": "sha256-Ea1R+dGLu/psLNMgYKoDpVLg9psGq9drKUOOcety1fo=",
"lastModified": 1778104276,
"narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
"owner": "danth",
"repo": "stylix",
"rev": "259af48fe5dc004c11aa2b1339814138517616bf",
"rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
"type": "github"
},
"original": {
"owner": "danth",
"ref": "release-25.11",
"ref": "master",
"repo": "stylix",
"type": "github"
}
@ -694,78 +593,31 @@
},
"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"
}
},
"systems_3": {
"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",
"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-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"repo": "default-linux",
"type": "github"
}
},
@ -788,11 +640,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1763914658,
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
"lastModified": 1777041405,
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
"type": "github"
},
"original": {
@ -804,11 +656,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1764465359,
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
"lastModified": 1777169200,
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
"type": "github"
},
"original": {
@ -820,11 +672,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1764464512,
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
"lastModified": 1777463218,
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
"type": "github"
},
"original": {
@ -833,6 +685,28 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"noctalia",
"noctalia-qs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"zen-browser": {
"inputs": {
"home-manager": "home-manager_2",
@ -841,11 +715,11 @@
]
},
"locked": {
"lastModified": 1765715981,
"narHash": "sha256-rAWVEEbfWZKTaiqBA/ogkeHvbzlkDHZjZPHbjWUnpw8=",
"lastModified": 1778377655,
"narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "463d3f091ad2b0ba2a4982f4181d22e452b2659d",
"rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3",
"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/release-25.11";
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
nvf.url = "github:notashelf/nvf";
stylix.url = "github:danth/stylix/release-25.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
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 = {
@ -18,8 +27,9 @@
# Checking nixvim to see if it's better
nixvim = {
url = "github:nix-community/nixvim/nixos-25.11";
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
};
# Google Antigravity (IDE)
@ -32,8 +42,8 @@
url = "github:0xc000022070/zen-browser-flake/beta";
inputs.nixpkgs.follows = "nixpkgs";
};
alejandra = {
url = "github:kamadorueda/alejandra";
awww = {
url = "git+https://codeberg.org/LGFae/awww";
inputs.nixpkgs.follows = "nixpkgs";
};
};
@ -43,40 +53,41 @@
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-hybrid = mkNixosConfig "amd-hybrid";
intel = mkNixosConfig "intel";
vm = mkNixosConfig "vm";
};
formatter.x86_64-linux = inputs.alejandra.packages.x86_64-linux.default;
hosts = [
"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,7 +1,18 @@
{pkgs, ...}: {
{config,pkgs, ...}: {
environment.systemPackages = with pkgs; [
audacity
discord
nodejs
];
services.auto-cpufreq.enable = false;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
}

View file

@ -1,133 +1,141 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Tyler Kelley";
gitEmail = "tylerzanekelley@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 = "sddm";
# 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 = "
# 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";
# 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";
# 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 NFS
enableNFS = true;
# 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 Printing Support
printEnable = false;
# 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;
# Enable Thunar GUI File Manager
# Yazi is default File Manager
thunarEnable = false;
# 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

@ -1,59 +0,0 @@
{
config,
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot = {
initrd = {
availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"nvme"
"usbhid"
"sd_mod"
];
kernelModules = [];
luks.devices = {
"luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f";
};
};
kernelModules = ["kvm-intel"];
extraModulePackages = [];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/8bac633b-c4e6-44bc-83b3-97b5472594e8";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/BC0C-F843";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
"/home/zaney/BFD" = {
device = "/dev/disk/by-uuid/5A30E2CC30E2AE67";
fsType = "ntfs";
options = [
"defaults"
"umask=000"
"dmask=027"
"fmask=137"
"uid=1000"
"gid=1000"
"windows_names"
];
};
};
swapDevices = [];
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -1,13 +0,0 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
audacity
discord
nodejs
obs-studio
handbrake
yt-dlp
android-studio
android-studio-tools
android-tools
];
}

View file

@ -1,112 +0,0 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Tyler Kelly";
gitEmail = "tylerzanekelly@gmail.com";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI
# SDDM background is set with stylixImage
displayManager = "sddm";
# Emable/disable bundled applications
tmuxEnable = false;
alacrittyEnable = false;
weztermEnable = false;
ghosttyEnable = false;
vscodeEnable = false;
antigravityEnable = false; # Google port of vscodium
helixEnable = false;
#To install rebuild, then run zcli doom install
doomEmacsEnable = false;
# Python development tools
pythonEnable = false;
# P10K or starship prompt
userPrompt = "starship";
# Hyprland Settings
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
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";
# Enable NFS
enableNFS = true;
# Enable Printing Support
printEnable = false;
# Enable Thunar GUI File Manager
thunarEnable = true;
# 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-simple.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-dwm-2.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";
}

View file

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

View file

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

View file

@ -1,134 +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 = true;
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 = "waybar";
# 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 = "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";
# 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
# 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
# };
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# 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
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
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
# Yazi is default File Manager
thunarEnable = true;
# Enable Printing Support
printEnable = false;
# Themes, waybar and animation.
# Only uncomment your selection
# The others much be commented out.
# Enable Thunar GUI File Manager
# Yazi is default File Manager
thunarEnable = true;
# 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;
# Themes, waybar and animation.
# Only uncomment your selection
# The others much be commented out.
# 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 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-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 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 network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
# 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

@ -0,0 +1,48 @@
# 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 = [];
zramSwap = {
enable = true;
algorithm = "zstd";
memoryPercent = 50;
priority = 100;
};
security.sudo.wheelNeedsPassword = false;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

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

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,12 +1,10 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
nodejs
atop
bottom
dua
fd
gping
lunarvim
luarocks
mission-center
resources

View file

@ -1,113 +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)
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# 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";
# 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
thunarEnable = true;
# Enable Thunar GUI File Manager
thunarEnable = true;
# 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-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 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 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

@ -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
@ -138,24 +149,51 @@ 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 lspci | grep -qi 'vga\|3d'; then
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 -qi 'amd'; then
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')
done < <(lspci -nn | grep -i 'vga\|3d\|display')
if $has_vm; then
DETECTED_PROFILE="vm"
elif $has_nvidia && $has_amd; then
DETECTED_PROFILE="amd-nvidia-hybrid"
elif $has_nvidia && $has_intel; then
DETECTED_PROFILE="hybrid"
DETECTED_PROFILE="nvidia-laptop"
elif $has_nvidia; then
DETECTED_PROFILE="nvidia"
elif $has_amd; then
@ -183,9 +221,10 @@ if [ -z "$profile" ]; then
read -rp "Enter Your Hardware Profile (GPU)
Options:
[ amd ]
amd-nvidia-hybrid
intel
nvidia
nvidia-laptop
intel
vm
Please type out your choice: " profile
if [ -z "$profile" ]; then
@ -194,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 --depth=1 ~/zaneyos
cd ~/zaneyos || exit 1
print_header "Git Configuration"
@ -352,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}"
@ -363,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!"
@ -416,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,30 @@
pkgs,
config,
...
}: {
}: let
inherit (pkgs.stdenv.hostPlatform) isx86_64 isAarch64;
in {
boot = {
kernelPackages = pkgs.linuxPackages_zen;
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 = false;
systemd-boot.enable = isx86_64;
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;
};
# 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;
@ -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,11 +9,17 @@
ibm-plex
inter
jetbrains-mono
lilex
material-icons
maple-mono.NF
minecraftia
nerd-fonts.im-writing
nerd-fonts.blex-mono
nerd-fonts.iosevka-term
nerd-fonts.lilex
nerd-fonts.ubuntu
nerd-fonts.jetbrains-mono
nerd-fonts.fira-mono
noto-fonts
noto-fonts-color-emoji
noto-fonts-cjk-sans

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,5 +2,15 @@
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 // {
tumbler = prev.xfce.tumbler.overrideAttrs (old: {
buildInputs = prev.lib.remove prev.libgepub old.buildInputs;
});
};
})
];
}

View file

@ -1,19 +1,24 @@
{
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 noctalia-shell
power-profiles-daemon # needed for noctalia-shell power cycle
]
else [];
in {
programs = {
neovim = {
@ -29,7 +34,6 @@ in {
seahorse.enable = true;
fuse.userAllowOther = true;
mtr.enable = true;
adb.enable = true;
hyprlock.enable = true;
gnupg.agent = {
enable = true;
@ -38,15 +42,20 @@ in {
};
nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
environment.systemPackages = with pkgs;
noctaliaPkgs
[
inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
]
++ noctaliaPkgs
++ [
alejandra # nix formatter
amfora # Fancy Terminal Browser For Gemini Protocol
appimage-run # Needed For AppImage Support
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
@ -59,10 +68,8 @@ in {
ffmpeg # Terminal Video / Audio Editing
file-roller # Archive Manager
gedit # Simple Graphical Text Editor
gemini-cli # CLI AI client ONLY (optional)
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
@ -76,7 +83,7 @@ in {
mdcat # CLI markdown parser
mpv # Incredible Video Player
ncdu # Disk Usage Analyzer With Ncurses Interface
nixfmt-rfc-style # Nix Formatter
nixfmt # Nix Formatter
nwg-displays # configure monitor configs via GUI
nwg-drawer # Application launcher for wayland
nwg-dock-hyprland # Dock for hyprland

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,7 +1,12 @@
{pkgs, ...}: {
{
lib,
pkgs,
...
}:
lib.mkIf pkgs.stdenv.hostPlatform.isx86_64 {
programs = {
steam = {
enable = true;
enable = false;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = false;
gamescopeSession.enable = true;

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,9 +32,9 @@ in {
};
environment.variables = {
NIXOS_OZONE_WL = "1";
ZANEYOS_VERSION = "2.5.6";
ZANEYOS_VERSION = "3.0";
ZANEYOS = "true";
};
console.keyMap = "${consoleKeyMap}";
system.stateVersion = "23.11"; # Do not change!
system.stateVersion = "25.11"; # Do not change!
}

View file

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

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

@ -10,22 +10,23 @@ in {
options.drivers.nvidia-amd-hybrid = {
enable = mkEnableOption "Enable AMD iGPU + NVIDIA dGPU (Prime offload)";
# AMD iGPU Bus ID (e.g., PCI:5:0:0). Expose as option for future host wiring.
amdgpuBusID = mkOption {
amdgpuBusId = mkOption {
type = types.str;
default = "PCI:5:0:0";
description = "PCI Bus ID for AMD iGPU (amdgpuBusId)";
description = "PCI Bus ID for AMD iGPU";
};
# NVIDIA dGPU Bus ID (e.g., PCI:1:0:0)
nvidiaBusID = mkOption {
nvidiaBusId = mkOption {
type = types.str;
default = "PCI:1:0:0";
description = "PCI Bus ID for NVIDIA dGPU (nvidiaBusId)";
description = "PCI Bus ID for NVIDIA dGPU";
};
};
config = mkIf cfg.enable {
# Enforce kernel 6.12 when this hybrid config is selected
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"];
@ -47,8 +48,8 @@ in {
};
# Wire from options
amdgpuBusId = cfg.amdgpuBusID;
nvidiaBusId = cfg.nvidiaBusID;
amdgpuBusId = cfg.amdgpuBusId;
nvidiaBusId = cfg.nvidiaBusId;
};
};
};

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,8 +1,9 @@
{host, ...}: let
inherit (import ../../../hosts/${host}/variables.nix) gitUsername gitEmail;
{zaneyos, ...}: let
inherit (zaneyos) gitUsername gitEmail;
in {
programs.git = {
enable = true;
signing.format = null;
settings = {
user = {

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,87 +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
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

@ -53,7 +53,7 @@
lualine = {
enable = true;
settings = {
options = {theme = "catppuccin";};
options = {theme = "auto";};
};
};
bufferline.enable = true;
@ -78,7 +78,7 @@
# Notifications and UI polish
notify.enable = true;
noice.enable = true;
noice.enable = false;
# Startup dashboard
alpha = {
@ -150,8 +150,8 @@
html.enable = true;
cssls.enable = true;
clangd.enable = true;
zls.enable = true;
marksman.enable = true;
zls.enable = false;
marksman.enable = false;
hyprls.enable = true;
# hyprls is optional; keep tools available via extraPackages
};
@ -302,13 +302,16 @@
lazygit
nil
hyprls
nodePackages.typescript-language-server
nodePackages.typescript
typescript-language-server
typescript
vscode-langservers-extracted
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
stylua

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 =
@ -90,4 +91,5 @@ in {
};
};
nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
}

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,5 +1,6 @@
{pkgs, ...}: {
{config, pkgs, ...}: {
gtk = {
gtk4.theme = null;
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;

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,17 +9,17 @@
noctaliaBind =
if barChoice == "noctalia"
then [
"$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
"$modifier SHIFT,Return, 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,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,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend"
"$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,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 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,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"
]
else [];
# Rofi launcher bindings (only included when barChoice != "noctalia")
@ -53,7 +52,7 @@ in {
# ============= APPLICATION LAUNCHERS =============
"$modifier,K, Keybinds Search Tool, exec, qs-keybinds"
"$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets"
"$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds"
"$modifier SHIFT,K, Keybinds Search Tool, exec, qs-keybinds"
"$modifier SHIFT,D, Discord, exec, discord"
"$modifier ALT,W, Web Search, exec, web-search"
"$modifier SHIFT,W, QS Wallpaper Setter, exec, qs-wallpapers-apply"
@ -69,16 +68,22 @@ 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, pypr toggle term"
"$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 =============
"$modifier,Q, Kill Active Window, killactive,"
"$modifier,P, Pseudo Tile, pseudo,"
"$modifier SHIFT,I, Toggle Split, togglesplit,"
"$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit"
"$modifier,F, Maximize, fullscreen,"
"$modifier SHIFT,F, Toggle Floating, togglefloating,"
"$modifier ALT,F, Float All Windows, workspaceopt, allfloat"
"$modifier ALT,F, Float All Windows, exec, hyprland-float-all"
# ============= LAYOUTS =============
"$modifier ALT,L, Toggle Layouts, exec, hyprland-change-layout toggle"
"$modifier ALT,1, Layout Dwindle, exec, hyprland-change-layout dwindle"
"$modifier ALT,2, Layout Master, exec, hyprland-change-layout master"
"$modifier ALT,3, Layout Scrolling, exec, hyprland-change-layout scrolling"
"$modifier ALT,4, Layout Monocle, exec, hyprland-change-layout monocle"
"$modifier SHIFT,C, Exit/Logout of Hyprland, exit,"
# ============= WINDOW MOVEMENT (ARROW KEYS) =============
"$modifier SHIFT,left, Move Left, movewindow, l"

View file

@ -1,5 +1,5 @@
{host, ...}: let
inherit (import ../../../hosts/${host}/variables.nix) animChoice;
{zaneyos, ...}: let
inherit (zaneyos) animChoice;
in {
imports = [
animChoice
@ -9,7 +9,6 @@ in {
./hypridle.nix
./hyprland.nix
./hyprlock.nix
./pyprland.nix
./windowrules.nix
];
}

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"
@ -13,19 +8,19 @@
"pkill waybar"
"killall -q swaync"
"pkill swaync"
"noctalia-shell"
"noctalia-shell &"
]
else [];
# Waybar-specific startup commands
waybarExec =
if barChoice != "noctalia"
then [
"killall -q swww;sleep .5 && swww-daemon"
"killall -q awww;sleep .5 && awww-daemon"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
# Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change
"sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'"
"sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'"
]
else [];
in {
@ -34,12 +29,11 @@ in {
[
"wl-paste --type text --watch cliphist store" # Saves text
"wl-paste --type image --watch cliphist store" # Saves images
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
"
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user start hyprpolkitagent"
"pypr &"
"qs -c overview" # Start quickshell-overview daemon
"hyprland-change-layout init"
]
++ noctaliaExec ++ waybarExec;
};

View file

@ -2,6 +2,7 @@
services = {
hypridle = {
enable = true;
systemdTarget = "hyprland-session.target";
settings = {
general = {
after_sleep_cmd = "hyprctl dispatch dpms on";

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,7 +42,7 @@
hyprKbVariant = variantFinal;
in {
home.packages = with pkgs; [
swww
awww
grim
slurp
wl-clipboard
@ -52,6 +50,7 @@ in {
ydotool
hyprpolkitagent
hyprshot
hyprshutdown
hyprpicker
#hyprland-qtutils # needed for banners and ANR messages
];
@ -109,8 +108,8 @@ in {
workspace_swipe_forever = true;
};
"$modifier" = "SUPER";
general = {
"$modifier" = "SUPER";
layout = "dwindle";
gaps_in = 6;
gaps_out = 8;
@ -124,11 +123,11 @@ in {
layers_hog_keyboard_focus = true;
initial_workspace_tracking = 0;
mouse_move_enables_dpms = true;
key_press_enables_dpms = false;
key_press_enables_dpms = true;
disable_hyprland_logo = true;
disable_splash_rendering = true;
enable_swallow = false;
vfr = true; # Variable Frame Rate
# vfr = true; # Variable Frame Rate not supported post v0.54.3
vrr = 2; # Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES
# Screen flashing to black momentarily or going black when app is fullscreen
# Try setting vrr to 0
@ -139,9 +138,15 @@ in {
};
dwindle = {
pseudotile = true;
pseudotile = false;
preserve_split = true;
force_split = 2;
smart_resizing = true;
use_active_for_splits = true;
smart_split = false;
default_split_ratio = 1.0;
split_bias = 0;
precise_mouse_move = false;
special_scale_factor = 0.8;
};
decoration = {
@ -182,11 +187,27 @@ in {
};
master = {
new_status = "master";
new_on_top = 1;
mfact = 0.5;
new_status = "slave";
new_on_top = false;
new_on_active = "none";
orientation = "left";
mfact = 0.55;
slave_count_for_center_master = 2;
center_master_fallback = "left";
smart_resizing = true;
drop_at_cursor = true;
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

@ -1,18 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [pyprland];
home.file.".config/hypr/pyprland.toml".text = ''
[pyprland]
plugins = [
"scratchpads",
]
[scratchpads.term]
animation = "fromTop"
command = "kitty --class kitty-dropterm"
class = "kitty-dropterm"
size = "70% 70%"
max_size = "1920px 100%"
position = "150px 150px"
'';
}

View file

@ -1,130 +1,436 @@
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
extraMonitorSettings
;
in {
_: {
wayland.windowManager.hyprland = {
settings = {
windowrule = [
#"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps
# downside it can impact other xwayland apps
# This rule is a template for a more targeted approach
"noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve
"tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$"
"tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$"
"tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$"
"tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$"
"tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$"
"tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$"
"tag +projects, class:^(codium|codium-url-handler|VSCodium)$"
"tag +projects, class:^(VSCode|code-url-handler)$"
"tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$"
"tag +im, class:^([Ff]erdium)$"
"tag +im, class:^([Ww]hatsapp-for-linux)$"
"tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$"
"tag +im, class:^(teams-for-linux)$"
"tag +games, class:^(gamescope)$"
"tag +games, class:^(steam_app_\d+)$"
"tag +gamestore, class:^([Ss]team)$"
"tag +gamestore, title:^([Ll]utris)$"
"tag +gamestore, class:^(com.heroicgameslauncher.hgl)$"
"tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$"
"tag +settings, class:^([Rr]ofi)$"
"tag +settings, class:^(file-roller|org.gnome.FileRoller)$"
"tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$"
"tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
"tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$"
"tag +settings, class:(xdg-desktop-portal-gtk)"
"tag +settings, class:(.blueman-manager-wrapped)"
"tag +settings, class:(nwg-displays)"
"move 72% 7%,title:^(Picture-in-Picture)$"
# qs-keybinds floating viewer
"float, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
"center, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
"size 55% 66%, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
# qs-cheatsheets floating viewer
"float, title:^(Cheatsheets Viewer)$"
"center, title:^(Cheatsheets Viewer)$"
"size 65% 60%, title:^(Cheatsheets Viewer)$"
"center, class:^([Ff]erdium)$"
"float, class:^([Ww]aypaper)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"center, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"center, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"center, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"noblur, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
# qs-keybinds, qs-docs, qs-chevron floating viewer
"float, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$"
"center, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$"
"size 55% 66%, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$"
"center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
"center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
"center, title:^(Authentication Required)$"
"idleinhibit fullscreen, class:^(*)$"
"idleinhibit fullscreen, title:^(*)$"
"idleinhibit fullscreen, fullscreen:1"
"float, tag:settings*"
"float, class:^([Ff]erdium)$"
"float, title:^(Picture-in-Picture)$"
"float, class:^(mpv|com.github.rafostar.Clapper)$"
"float, title:^(Authentication Required)$"
"float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)"
"float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)"
"float, class:^([Ss]team)$, title:negative:^([Ss]team)$"
"float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
"float, initialTitle:(Add Folder to Workspace)"
"float, initialTitle:(Open Files)"
"float, initialTitle:(wants to save)"
"size 70% 60%, initialTitle:(Open Files)"
"size 70% 60%, initialTitle:(Add Folder to Workspace)"
"size 70% 70%, tag:settings*"
"size 60% 70%, class:^([Ff]erdium)$"
"opacity 1.0 1.0, tag:browser*"
"opacity 0.9 0.8, tag:projects*"
"opacity 0.94 0.86, tag:im*"
"opacity 0.9 0.8, tag:file-manager*"
"opacity 0.8 0.7, tag:terminal*"
"opacity 0.8 0.7, tag:settings*"
"opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$"
"opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui"
"opacity 0.95 0.75, title:^(Picture-in-Picture)$"
"pin, title:^(Picture-in-Picture)$"
"keepaspectratio, title:^(Picture-in-Picture)$"
"noblur, tag:games*"
"fullscreen, tag:games*"
];
windowrulev2 = [
# qs-wallpapers styling via compositor
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"noblur, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
extraConfig = ''
# Set float and centering for dialog boxes
rule = float(true), match:modal:1
rule = center(true), match:modal:1
# qs-vid-wallpapers styling via compositor
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"noblur, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
windowrule {
name = Resolve
match:class = ^(\bresolve\b)$
match:xwayland = 1
no_blur = on
}
# qs-wlogout styling via compositor - power menu overlay
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"rounding 20, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"opacity 1.0 1.0, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
windowrule {
name = Thunar
match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
tag = +file-manager
}
# qs-docs / qs-cheatsheets overlay windows
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$"
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$"
];
};
windowrule {
name = Terminals
match:class = ^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm|dropterminal)$
tag = +terminal
}
windowrule {
name = Brave-browser
match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$
tag = +browser
}
windowrule {
name = Firefox
match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
tag = +browser
}
windowrule {
name = Google-chrome
match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
tag = +browser
}
windowrule {
name = Thorium-browser
match:class = ^([Tt]horium-browser|[Cc]achy-browser)$
tag = +browser
}
windowrule {
name = vscodium
match:class = ^(codium|codium-url-handler|VSCodium)$
tag = +projects
}
windowrule {
name = vscode
match:class = ^(VSCode|code-url-handler)$
tag = +projects
}
windowrule {
name = Discord
match:class = ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
tag = +im
}
windowrule {
name = Ferdium
match:class = ^([Ff]erdium)$
center = on
float = on
size = 60% = 70%
tag = +im
}
windowrule {
name = Whatsapp
match:class = ^([Ww]hatsapp-for-linux)$
tag = +im
}
windowrule {
name = Telegram-desktop
match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
tag = +im
}
windowrule {
name = teams-for-linux
match:class = ^(teams-for-linux)$
tag = +im
}
windowrule {
name = gamescope
match:class = ^(gamescope)$
tag = +games
}
windowrule {
name = steam-app
match:class = ^(steam_app\d+)$
tag = +games
}
windowrule {
name = Steam
match:class = ^([Ss]team)$
tag = +gamestore
}
windowrule {
name = Lutris
match:title = ^([Ll]utris)$
tag = +gamestore
}
windowrule {
name = heroicgameslauncher
match:class = ^(com.heroicgameslauncher.hgl)$
tag = +gamestore
}
windowrule {
name = gnome-disks
match:class = ^(gnome-disks|wihotspot(-gui)?)$
tag = +settings
}
windowrule {
name = rofi
match:class = ^([Rr]ofi)$
tag = +settings
no_blur = off
}
windowrule {
name = FileRoller
match:class = ^(file-roller|org.gnome.FileRoller)$
tag = +settings
}
windowrule {
name = NetworkManger
match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$
tag = +settings
}
windowrule {
name = PlusAudio
match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
center = on
tag = +settings
no_blur = off
}
windowrule {
name = nwg-look
match:class = ^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
tag = +settings
}
windowrule {
name = xdg-desktop-portal-gtk
match:class = (xdg-desktop-portal-gtk)
tag = +settings
}
windowrule {
name = blueman
match:class = (.blueman-manager-wrapped)
tag = +settings
}
windowrule {
name = nwg-displays
match:class = (nwg-displays)
tag = +settings
}
windowrule {
name = Picture-in-Picture
match:title = ^(Picture-in-Picture)$
float = on
move = 72% = 7%
opacity = 0.95 = 0.75
pin = 0
keep_aspect_ratio = on
}
windowrule {
name = ThunarFileMgr
match:class = ([Tt]hunar)
match:title = negative:(.*[Tt]hunar.*)
center = on
float = on
}
windowrule {
name = Authentication-Required
match:title = ^(Authentication Required)$
center = on
float = on
}
windowrule {
name = IdleInhibit-fullscreen-1
match:class = ^(*)$
idle_inhibit = fullscreen
}
windowrule {
name = IdleInhibit-fullscreen-2
match:title = ^(*)$
idle_inhibit = fullscreen
}
windowrule {
name = IdleInhibit-fullscreen-3
match:fullscreen = 1
idle_inhibit = fullscreen
}
windowrule {
name = Settings-Tag
match:tag = settings*
float = on
opacity = 0.8 = 0.7
size = 70% = 70%
no_blur = off
}
windowrule {
name = WayPaper
match:class = ^([Ww]aypaper)$
float = on
no_blur = off
}
windowrule {
name = mpv-or-clapper
match:class = ^(mpv|com.github.rafostar.Clapper)$
float = on
}
windowrule {
name = codium-url-handler
match:class = (codium|codium-url-handler|VSCodium)
match:title = negative:(.*codium.*|.*VSCodium.*)
float = on
}
windowrule {
name = heroicgameslauncher-1
match:class = ^(com.heroicgameslauncher.hgl)$
match:title = negative:(Heroic Games Launcher)
float = on
}
windowrule {
name = Steam
match:class = ^([Ss]team)$
match:title = negative:^([Ss]team)$
float = on
}
windowrule {
name = Add-Folder
match:initial_title = (Add Folder to Workspace)
float = on
size = 70% = 60%
}
windowrule {
name = Open-File
match:initial_title = (Open Files)
float = on
size = 70% = 60%
}
windowrule {
name = Wants-to-Save
match:initial_title = (wants to save)
float = on
}
windowrule {
name = Browsers
match:tag = browser*
opacity = 1.0 = 1.0
}
windowrule {
name = Projects
match:tag = projects*
opacity = 0.9 = 0.8
}
windowrule {
name = Instant-Messaging
match:tag = im*
opacity = 0.94 = 0.86
}
windowrule {
name = File-Managers
match:tag = file-manager*
opacity = 0.9 = 0.8
}
windowrule {
name = Terminals-opacity
match:tag = terminal*
opacity = 0.8 = 0.7
no_blur = off
}
windowrule {
name = windowrule-77
match:class = ^(gedit|org.gnome.TextEditor|mousepad)$
opacity = 0.8 = 0.7
}
windowrule {
name = windowrule-78
match:class = ^(seahorse)$
opacity = 0.9 = 0.8
}
windowrule {
name = windowrule-79
match:tag = games*
no_blur = on
}
windowrule {
name = windowrule-80
match:tag = games*
fullscreen = on
}
windowrule {
name = qs-keybinds
match:title = ^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$
float = on
center = on
size = 55% = 66%
}
windowrule {
name = qs-cheatsheets
match:title = ^(Cheatsheets Viewer)$
float = on
center = on
size = 65% = 60%
}
windowrule {
name = qs-extended-viewers
match:title = ^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$
float = on
center = on
size = 55% = 66%
}
windowrule {
name = QS-Wallpapers
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Wallpapers)$
border_size = 0
float = on
no_blur = on
no_shadow = on
rounding = 12
}
windowrule {
name = QA-Video-Wallpapers
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Video Wallpapers)$
border_size = 0
center = on
float = on
no_blur = on
no_shadow = on
rounding = 12
}
windowrule {
name = QS-wlogout
match:class = ^(org\.qt-project\.qml)$
match:title = ^(qs-wlogout)$
border_size = 0
center = on
float = on
opacity = 1.0 = 1.0
rounding = 20
}
windowrule {
name = QA-Panels
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Panels)$
center = on
float = on
no_blur = on
no_shadow = on
rounding = 12
}
windowrule {
name = QS-Cheatsheets
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Cheatsheets Viewer)$
border_size = 0
center = on
float = on
no_shadow = on
rounding = 12
}
windowrule {
name = QS-Documentation-Viewer
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Documentation Viewer)$
border_size = 0
center = on
float = on
no_shadow = on
rounding = 12
}
'';
};
}

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 lspci | grep -qi 'vga\|3d'; then
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 -qi 'amd'; then
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')
done < <(lspci -nn | grep -i 'vga\|3d\|display')
if $has_vm; then
DETECTED_PROFILE="vm"
@ -172,9 +205,10 @@ 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"

View file

@ -1,30 +1,30 @@
{
config,
pkgs,
inputs,
lib,
...
}: let
system = pkgs.stdenv.hostPlatform.system;
noctaliaPath = inputs.noctalia.packages.${system}.default;
configDir = "${noctaliaPath}/share/noctalia-shell";
noctaliaPkg = inputs.noctalia.packages.${system}.default;
configDir = "${noctaliaPkg}/share/noctalia-shell";
in {
# Install the Noctalia package for this user (CLI, assets, etc.)
# Install the Noctalia package
home.packages = [
noctaliaPath
noctaliaPkg
pkgs.quickshell # Ensure quickshell is available for the service
];
# Seed the Noctalia QuickShell shell code into ~/.config/quickshell/noctalia-shell
# once, then leave it writable so the GUI and the user can tweak it.
# Seed the configuration
home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] ''
set -eu
DEST="$HOME/.config/quickshell/noctalia-shell"
SRC="${configDir}"
if [ ! -d "$DEST" ]; then
mkdir -p "$HOME/.config/quickshell"
cp -R "$SRC" "$DEST"
chmod -R u+rwX "$DEST"
$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"
fi
'';
}

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

@ -0,0 +1,414 @@
{pkgs}:
pkgs.writeShellScriptBin "DropTerminal" ''
#!/usr/bin/env bash
# Dropdown Terminal for Hyprland (Nix-managed)
# Source: adapted from Dropterminal.sh by Kiran George (SherLock707)
# Usage:
# DropTerminal [-d] [<terminal_command>]
# Behavior:
# - If <terminal_command> is omitted, uses $TERM, with fallback to kitty when $TERM is unset/empty
set -euo pipefail
DEBUG=false
# Use a dedicated special workspace so preload never flashes on screen
SPECIAL_WS="special:dropterminal"
ADDR_FILE="/tmp/dropdown_terminal_addr"
SPAWN_ONLY=false # if true, just create hidden in scratchpad and exit
# Sanitize Hyprland JSON to strict JSON (work around NaN/Inf issues)
hyprjson() {
# Usage: hyprjson <hyprctl subcommand...>
# Emits strict JSON, replacing invalid numeric literals with null
hyprctl "$@" -j 2>/dev/null | sed -E 's/: *nan([,}])/ : null\1/gi; s/: *-nan([,}])/ : null\1/gi; s/: *inf([,}])/ : null\1/gi; s/: *-inf([,}])/ : null\1/gi'
}
# Dropdown size and position configuration (percentages)
WIDTH_PERCENT=65 # Width as percentage of screen width
HEIGHT_PERCENT=65 # Height as percentage of screen height
Y_PERCENT=10 # Y position as percentage from top (X is auto-centered)
# Animation settings
ANIMATION_DURATION=100 # milliseconds
SLIDE_STEPS=5
SLIDE_DELAY=5 # milliseconds between steps
# Parse arguments
if [ "''${1-}" = "-d" ] || [ "''${1-}" = "--debug" ]; then
DEBUG=true
shift || true
fi
if [ "''${1-}" = "-S" ] || [ "''${1-}" = "--spawn-only" ]; then
SPAWN_ONLY=true
shift || true
fi
# Env override for startup usage
if [ "''${DROPTERM_SPAWN_ONLY-}" = "1" ]; then
SPAWN_ONLY=true
fi
# Terminal command: prefer explicit arg; otherwise always use kitty
TERMINAL_CMD="''${1-}"
if [ -z "''${TERMINAL_CMD}" ]; then
TERMINAL_CMD="kitty"
fi
# Debug echo function
debug_echo() {
if [ "$DEBUG" = true ]; then
echo "$@"
fi
}
# Wait until Hyprland returns sane JSON (monitors/workspace ready)
wait_for_hypr() {
for i in $(seq 1 60); do
if hyprjson monitors | ${pkgs.jq}/bin/jq -e 'length > 0' >/dev/null 2>&1 \
&& hyprjson activeworkspace | ${pkgs.jq}/bin/jq -e '.id | numbers' >/dev/null 2>&1; then
return 0
fi
sleep 0.05
done
return 0
}
# Function to get window geometry
get_window_geometry() {
local addr="$1"
hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | "\(.at[0]) \(.at[1]) \(.size[0]) \(.size[1])"'
}
# Ensure a window is floating
ensure_floating() {
local addr="$1"
local is_float=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | .floating // false')
if [ "$is_float" != "true" ]; then
hyprctl dispatch togglefloating "address:$addr" >/dev/null 2>&1 || true
sleep 0.02
fi
}
# Function to animate window slide down (show)
animate_slide_down() {
local addr="$1"
local target_x="$2"
local target_y="$3"
local width="$4"
local height="$5"
debug_echo "Animating slide down for window $addr to position $target_x,$target_y"
# Start position (above screen)
local start_y=$((target_y - height - 50))
# Calculate step size
local step_y=$(((target_y - start_y) / SLIDE_STEPS))
# Move window to start position instantly (off-screen)
hyprctl dispatch movewindowpixel "exact $target_x $start_y,address:$addr" >/dev/null 2>&1
sleep 0.05
# Animate slide down
for i in $(seq 1 $SLIDE_STEPS); do
local current_y=$((start_y + (step_y * i)))
hyprctl dispatch movewindowpixel "exact $target_x $current_y,address:$addr" >/dev/null 2>&1
sleep 0.03
done
# Ensure final position is exact
hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$addr" >/dev/null 2>&1
}
# Function to animate window slide up (hide)
animate_slide_up() {
local addr="$1"
local start_x="$2"
local start_y="$3"
local width="$4"
local height="$5"
debug_echo "Animating slide up for window $addr from position $start_x,$start_y"
# End position (above screen)
local end_y=$((start_y - height - 50))
# Calculate step size
local step_y=$(((start_y - end_y) / SLIDE_STEPS))
# Animate slide up
for i in $(seq 1 $SLIDE_STEPS); do
local current_y=$((start_y - (step_y * i)))
hyprctl dispatch movewindowpixel "exact $start_x $current_y,address:$addr" >/dev/null 2>&1
sleep 0.03
done
debug_echo "Slide up animation completed"
}
# Function to get monitor info including scale and name of focused monitor
get_monitor_info() {
local monitor_data=$(hyprjson monitors | ${pkgs.jq}/bin/jq -r '.[] | select(.focused == true) | "\(.x) \(.y) \(.width) \(.height) \(.scale // 1) \(.name)"')
if [ -z "$monitor_data" ] || [[ "$monitor_data" =~ ^null ]]; then
debug_echo "Error: Could not get focused monitor information"
return 1
fi
echo "$monitor_data"
}
# Function to calculate dropdown position with proper scaling and centering
calculate_dropdown_position() {
local monitor_info=$(get_monitor_info)
if [ $? -ne 0 ] || [ -z "$monitor_info" ]; then
debug_echo "Error: Failed to get monitor info, using fallback values"
echo "100 100 800 600 fallback-monitor"
return 1
fi
local mon_x=$(echo $monitor_info | cut -d' ' -f1)
local mon_y=$(echo $monitor_info | cut -d' ' -f2)
local mon_width=$(echo $monitor_info | cut -d' ' -f3)
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)
debug_echo "Monitor info: x=$mon_x, y=$mon_y, width=$mon_width, height=$mon_height, scale=$mon_scale"
# Validate scale value and provide fallback
if [ -z "$mon_scale" ] || [ "$mon_scale" = "null" ] || [ "$mon_scale" = "0" ]; then
debug_echo "Invalid scale value, using 1.0 as fallback"
mon_scale="1.0"
fi
# Calculate logical dimensions by dividing physical dimensions by scale
local logical_width logical_height
if [ -x "${pkgs.bc}/bin/bc" ]; then
logical_width=$(echo "scale=0; $mon_width / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1)
logical_height=$(echo "scale=0; $mon_height / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1)
else
# Fallback to integer math (multiply by 100 for precision, then divide)
local scale_int=$(echo "$mon_scale" | sed 's/\.///' | sed 's/^0*//')
if [ -z "$scale_int" ]; then scale_int=100; fi
logical_width=$(((mon_width * 100) / scale_int))
logical_height=$(((mon_height * 100) / scale_int))
fi
# Ensure we have valid integer values
if ! [[ "$logical_width" =~ ^-?[0-9]+$ ]]; then logical_width=$mon_width; fi
if ! [[ "$logical_height" =~ ^-?[0-9]+$ ]]; then logical_height=$mon_height; fi
debug_echo "Physical resolution: ''${mon_width}x''${mon_height}"
debug_echo "Logical resolution: ''${logical_width}x''${logical_height} (physical ÷ scale)"
# Calculate window dimensions based on LOGICAL space percentages
local width=$((logical_width * WIDTH_PERCENT / 100))
local height=$((logical_height * HEIGHT_PERCENT / 100))
# Calculate Y position from top based on percentage of LOGICAL height
local y_offset=$((logical_height * Y_PERCENT / 100))
# Calculate centered X position in LOGICAL space
local x_offset=$(((logical_width - width) / 2))
# Apply monitor offset to get final positions in logical coordinates
local final_x=$((mon_x + x_offset))
local final_y=$((mon_y + y_offset))
debug_echo "Window size: ''${width}x''${height} (logical pixels)"
debug_echo "Final position: x=$final_x, y=$final_y (logical coordinates)"
debug_echo "Hyprland will scale these to physical coordinates automatically"
echo "$final_x $final_y $width $height $mon_name"
}
# Ensure Hyprland is ready and get the current workspace
wait_for_hypr
CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty')
if [ -z "''${CURRENT_WS}" ]; then
# Try once more after a short wait
sleep 0.1
CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty')
fi
if [ -z "''${CURRENT_WS}" ]; then
debug_echo "Warning: unable to read active workspace; using workspace 1"
CURRENT_WS="1"
fi
# Function to get stored terminal address
get_terminal_address() {
if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then
cut -d' ' -f1 "$ADDR_FILE"
fi
}
# Function to get stored monitor name
get_terminal_monitor() {
if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then
cut -d' ' -f2- "$ADDR_FILE"
fi
}
# Function to check if terminal exists
terminal_exists() {
local addr=$(get_terminal_address)
if [ -n "$addr" ]; then
hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" 'map(select(.address == $ADDR)) | any' >/dev/null 2>&1
else
return 1
fi
}
# Function to check if terminal is in special workspace
terminal_in_special() {
local addr=$(get_terminal_address)
if [ -n "$addr" ]; then
hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" --arg WS "$SPECIAL_WS" 'map(select(.address == $ADDR and .workspace.name == $WS)) | any' >/dev/null 2>&1
else
return 1
fi
}
# Function to spawn terminal and capture its address
spawn_terminal() {
debug_echo "Creating new dropdown terminal with command: $TERMINAL_CMD"
# Calculate dropdown position for later use
local pos_info=$(calculate_dropdown_position)
if [ $? -ne 0 ]; then
debug_echo "Warning: Using fallback positioning"
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}"
# Create a unique title so we can robustly identify the new window
local token=$(date +%s%N)
local title="dropterm-$token"
local spawn_cmd="$TERMINAL_CMD --class dropterminal --instance-group dropterminal --title $title"
# Launch in scratchpad to avoid visible spawn; size will be enforced after detection
hyprctl dispatch exec "[float; workspace $SPECIAL_WS silent] $spawn_cmd" >/dev/null 2>&1 || true
# Wait for the new window with our unique class/title (up to ~3s)
local new_addr=""
for i in $(seq 1 60); do
new_addr=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg CLS "dropterminal" --arg TITLE "$title" \
'.[] | select(.class == $CLS and .title == $TITLE) | .address' | head -1)
if [ -n "$new_addr" ]; then break; fi
sleep 0.05
done
if [ -n "$new_addr" ] && [ "$new_addr" != "null" ]; then
# Store the address and monitor name
echo "$new_addr $monitor_name" >"$ADDR_FILE"
debug_echo "Terminal created with address: $new_addr in special workspace on monitor $monitor_name"
# Ensure scratchpad placement (in case exec flags were ignored)
hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$new_addr" >/dev/null 2>&1 || true
ensure_floating "$new_addr"
hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" >/dev/null 2>&1 || true
if [ "$SPAWN_ONLY" = true ]; then
# Keep it hidden for startup preload
debug_echo "Spawn-only: leaving terminal hidden in scratchpad"
return 0
fi
# Bring to current workspace and set up geometry/animation
hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$new_addr"
ensure_floating "$new_addr"
hyprctl dispatch pin "address:$new_addr"
hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr"
animate_slide_down "$new_addr" "$target_x" "$target_y" "$width" "$height"
return 0
fi
debug_echo "Failed to detect new kitty window; aborting spawn"
return 1
}
# Main logic
if terminal_exists; then
TERMINAL_ADDR=$(get_terminal_address)
debug_echo "Found existing terminal: $TERMINAL_ADDR"
focused_monitor=$(get_monitor_info | awk '{print $6}')
dropdown_monitor=$(get_terminal_monitor)
if [ "$focused_monitor" != "$dropdown_monitor" ]; then
debug_echo "Monitor focus changed: moving dropdown to $focused_monitor"
# Calculate new position for focused monitor
pos_info=$(calculate_dropdown_position)
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"
# Update ADDR_FILE
echo "$TERMINAL_ADDR $monitor_name" >"$ADDR_FILE"
fi
if terminal_in_special; then
debug_echo "Bringing terminal from scratchpad with slide down animation"
# Calculate target position
pos_info=$(calculate_dropdown_position)
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"
ensure_floating "$TERMINAL_ADDR"
hyprctl dispatch pin "address:$TERMINAL_ADDR"
# Set size and animate slide down
hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR"
animate_slide_down "$TERMINAL_ADDR" "$target_x" "$target_y" "$width" "$height"
hyprctl dispatch focuswindow "address:$TERMINAL_ADDR"
else
debug_echo "Hiding terminal to scratchpad with slide up animation"
# Get current geometry for animation
geometry=$(get_window_geometry "$TERMINAL_ADDR")
if [ -n "$geometry" ]; then
curr_x=$(echo $geometry | cut -d' ' -f1)
curr_y=$(echo $geometry | cut -d' ' -f2)
curr_width=$(echo $geometry | cut -d' ' -f3)
curr_height=$(echo $geometry | cut -d' ' -f4)
debug_echo "Current geometry: ''${curr_x},''${curr_y} ''${curr_width}x''${curr_height}"
# Animate slide up first
animate_slide_up "$TERMINAL_ADDR" "$curr_x" "$curr_y" "$curr_width" "$curr_height"
# Small delay then move to special workspace and unpin
sleep 0.1
hyprctl dispatch pin "address:$TERMINAL_ADDR" # Unpin (toggle)
hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR"
else
debug_echo "Could not get window geometry, moving to scratchpad without animation"
hyprctl dispatch pin "address:$TERMINAL_ADDR"
hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR"
fi
fi
else
debug_echo "No existing terminal found, creating new one"
if spawn_terminal; then
TERMINAL_ADDR=$(get_terminal_address)
if [ "$SPAWN_ONLY" = false ] && [ -n "$TERMINAL_ADDR" ]; then
hyprctl dispatch focuswindow "address:$TERMINAL_ADDR"
fi
fi
fi
''

View file

@ -1,8 +1,9 @@
{
config,
inputs,
pkgs,
username,
profile,
zaneyos,
...
}: {
home.packages = [
@ -17,9 +18,16 @@
(import ./screenshootin.nix {inherit pkgs;})
(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;
inherit username;
inherit inputs pkgs username;
})
(import ./web-search.nix {inherit pkgs;})
# Cheatsheets viewer + parser
@ -31,18 +39,32 @@
(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;})
(import ./qs-wallpapers-restore.nix {inherit pkgs;})
(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;})
(import ./hyprland-float-all.nix {inherit pkgs;})
(import ./hyprland-change-layout.nix {inherit pkgs;})
(import ./launch-nwg-menu.nix {inherit pkgs;})
(import ./hyprland-dock.nix {inherit pkgs;})
(import ./zcli.nix {
inherit pkgs profile;
inherit pkgs;
inherit zaneyos;
backupFiles = [
".config/mimeapps.list.backup"
];
})
];
xdg.desktopEntries.dropterminal = {
name = "Drop Terminal";
comment = "Dropdown terminal (Hyprland)";
exec = "DropTerminal";
terminal = false;
type = "Application";
icon = "kitty";
settings.StartupWMClass = "dropterminal";
categories = ["System" "Utility" "TerminalEmulator"];
};
}

View file

@ -16,7 +16,7 @@ pkgs.writeShellScriptBin "docs-parser" ''
Usage: docs-parser [MODE] [CATEGORY] [LANGUAGE]
MODE: files|content
CATEGORY: AI|Hyprpanel|Zed|ddubsos|etc.
CATEGORY: AI|Zed|ddubsos|etc.
LANGUAGE: en|es
Examples:

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

@ -0,0 +1,85 @@
{pkgs}:
pkgs.writeShellScriptBin "hyprland-change-layout" ''
#!/usr/bin/env bash
set -euo pipefail
notif="''${XDG_CONFIG_HOME:-$HOME/.config}/swaync/images/catppuccin-macchiato.png"
layouts=(dwindle master scrolling monocle)
get_layout() {
${pkgs.hyprland}/bin/hyprctl -j getoption general:layout | ${pkgs.jq}/bin/jq -r '.str'
}
next_layout() {
local current="$1"
local i
for i in "''${!layouts[@]}"; do
if [[ "''${layouts[i]}" == "$current" ]]; then
echo "''${layouts[((i + 1) % ''${#layouts[@]})]}"
return
fi
done
echo "''${layouts[0]}"
}
set_layout() {
local target="$1"
${pkgs.hyprland}/bin/hyprctl keyword general:layout "$target"
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,J || true
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,K || true
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,O || true
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER_SHIFT,M || true
case "$target" in
"dwindle")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,O,layoutmsg,togglesplit
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Dwindle Layout"
;;
"master")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Master Layout"
;;
"scrolling")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Scrolling Layout"
;;
"monocle")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER_SHIFT,M,layoutmsg,swapnext
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Monocle Layout"
;;
*)
echo "Unknown layout: $target" >&2
return 1
;;
esac
}
current="$(get_layout)"
arg="''${1:-toggle}"
case "$arg" in
init)
set_layout "$current"
;;
toggle|next)
set_layout "$(next_layout "$current")"
;;
set)
set_layout "''${2:-}"
;;
master|dwindle|scrolling|monocle)
set_layout "$arg"
;;
*)
echo "Usage: $(basename "$0") [toggle|next|init|set <layout>|master|dwindle|scrolling|monocle]" >&2
exit 1
;;
esac
''

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

@ -0,0 +1,11 @@
{pkgs}:
pkgs.writeShellScriptBin "hyprland-float-all" ''
#!/usr/bin/env bash
set -euo pipefail
ws="$(${pkgs.hyprland}/bin/hyprctl activeworkspace -j | ${pkgs.jq}/bin/jq -r .id)"
${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg ws "$ws" '.[] | select(.workspace.id == ($ws|tonumber)) | .address' \
| while read -r addr; do
[ -n "''${addr:-}" ] && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating "address:$addr"
done
''

View file

@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" ''
else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor"
else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher"
else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser"
else if (low ~ /(swww|wallpaper)/) category="wallpaper"
else if (low ~ /(awww|wallpaper)/) category="wallpaper"
else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media"
else category="app"
} else {

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