Compare commits

..

106 commits

Author SHA1 Message Date
dwilliams
fb12d82468 Updated flake 2026-05-11 14:36:06 -04:00
Don Williams
93c05ad88e Added cpufreq to default but left disabled
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   hosts/default/host-packages.nix
2026-05-09 14:48:57 -04:00
dwilliams
927e38e5dc Updated flake 2026-05-08 10:59:48 -04:00
dwilliams
b2165ec35e Updated flake to resolve install issues (hopefully)
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
2026-05-05 15:43:09 -04:00
dwilliams
145d98da1d Updated FLAKE 2026-05-01 11:28:53 -04:00
Don Williams
60b97fe42c Added override for openssl-v.1.1.1w alert
discord and direnv use older pkgs that call it, it's EOL

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

 Changes to be committed:
	modified:   modules/core/packages.nix
	modified:   modules/home/editors/vscode.nix
2026-05-01 11:22:23 -04:00
dwilliams
affa1f0ce6 Updated CHANGELOG 2026-04-30 12:58:25 -04:00
dwilliams
6fe106eccc Upd: flake, removed discord, disabled zen browser
Discord uses a version of electron that uses openssl 1.1.1w
Which is end-of-life and nixos flags as insecure
Discord will have to either update or ppl can use vesktop
or other alternative clients

Disabled zen broswer in `zaneyos/modules/home/default.nix``

It needs to be enabled via a variable

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

 Changes to be committed:
	modified:   flake.lock
	modified:   hosts/zaneyos-24-vm/variables.nix
	modified:   modules/core/packages.nix
	modified:   modules/home/default.nix
2026-04-30 12:52:18 -04:00
Don Williams
72de16b9bf Trying to fix project history 2026-04-25 05:25:06 -04:00
Don Williams
05550da619 Fixed projects error on startup
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/editors/nixvim.nix
2026-04-25 05:18:58 -04:00
Don Williams
6607eb598f set projects.nvim to local writable dir for history
On branch main
 Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
   (use "git pull" to update your local branch)

 Changes to be committed:
	modified:   modules/home/editors/nixvim.nix
2026-04-25 05:13:35 -04:00
dwilliams
6027ada4d1 Upd flake, changed to latest kernel, disable HL vfr
Linux 7.0 is better kernel than current 6.19_zen

VTR isn't supported in hyprland post v0.54.3

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

 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:21:01 -04:00
dwilliams
f5106616b5 Updted flake - add: Nixpkg gearlever
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
	modified:   modules/core/flatpak.nix
	modified:   modules/core/packages.nix
2026-04-17 08:44:25 -04:00
Don Williams
b797cac700 Aligned zlci gpu code with install-zaneyos.sh
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/home/scripts/zcli.nix
2026-04-09 18:41:13 -04:00
dwilliams
f95a583a96 Upd: Flake to fix CVE with NIX
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
2026-04-07 19:59:31 -04:00
Don Williams
605b66fbb4 Added hyprshutdown 2026-04-05 17:33:55 -04:00
Don Williams
400f8510dc Fixing gpu detection in install and zcli
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/home/scripts/zcli.nix
2026-04-04 06:11:20 -04:00
Don Williams
e81ea5a023 Fixed GPU detection was always reporting AMD
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2026-04-04 05:47:06 -04:00
Don Williams
6b7acb7fa5 Fixed syntax error
On branch main

 Changes to be committed:
	modified:   modules/core/packages.nix
2026-04-04 05:33:00 -04:00
Don Williams
4f02995d0d Forgot to add inputs to pacakges.nix (duh)
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/core/packages.nix
2026-04-04 05:29:39 -04:00
Don Williams
2e29f9fabc Removed nodePackages not supported
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/editors/nixvim.nix
2026-04-04 05:26:57 -04:00
Don Williams
d2c0128e01 had to change form pkgs.awww to awwwPkg variable
Moving to a flake input I  updated the awww references

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

 Changes to be committed:
	modified:   modules/home/scripts/default.nix
	modified:   modules/home/scripts/qs-wallpapers-apply.nix
	modified:   modules/home/scripts/qs-wallpapers-restore.nix
	modified:   modules/home/scripts/wallsetter.nix
2026-04-04 05:16:16 -04:00
Don Williams
0bbcb7866d Added awww as falke input to support 25.11
When installing from 25.11 or earlier awww isn't there
in  nixpkgs Added awww as flake input

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

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   flake.nix
	modified:   modules/core/packages.nix
	modified:   modules/home/hyprland/hyprland.nix
2026-04-04 05:08:45 -04:00
Don Williams
10f3587c6a Updated CHANGELOG 2026-04-03 14:06:14 -04:00
Don Williams
4f7e54a218 Changed SWWW to AWWW as it's no longer maintined
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   FAQ.es.md
	modified:   FAQ.md
	modified:   modules/home/hyprland/exec-once.nix
	modified:   modules/home/hyprland/hyprland.nix
	modified:   modules/home/scripts/keybinds-parser.nix
	modified:   modules/home/scripts/qs-vid-wallpapers-apply.nix
	modified:   modules/home/scripts/qs-wallpapers-apply.nix
	modified:   modules/home/scripts/qs-wallpapers-restore.nix
	modified:   modules/home/scripts/wallsetter.nix
2026-04-03 14:00:55 -04:00
dwilliams
27ba6b3935 Updated flake to check reported issue 2026-03-24 14:14:39 -04:00
Don Williams
9bc46719d5 Fixed nvim error, and eval warnings for GTK/GIT
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/cli/git.nix
	modified:   modules/home/editors/nixvim.nix
	modified:   modules/home/gtk.nix
2026-03-24 00:59:16 -04:00
Don Williams
34ab1c370e Fixed nvim config error, set lualine theme 2026-03-24 00:53:01 -04:00
dwilliams
8e16811c60 Updated flakie 2026-03-24 00:52:07 -04:00
dwilliams
9ba72c53fa Updated flake HL 0.54.2 2026-03-20 22:44:06 -04:00
Don Williams
c5b6ec2840 Merge branch 'port-zos-next' into 'main'
Porting ZOS-NEXT updates back to ZOS

See merge request Zaney/zaneyos!193
2026-03-20 22:13:58 -04:00
Don Williams
33476ce562 Porting ZOS-NEXT updates back to ZOS 2026-03-20 22:13:58 -04:00
dwilliams
a7753d4945 Updated flake main branch 2026-03-20 21:30:37 -04:00
Don Williams
3773b596a3 Merge branch 'fix-wallpaper' into 'main'
Fixed qs-wallpaper qs-logout didn't work from rofi or binding

See merge request Zaney/zaneyos!192
2026-03-16 04:17:28 -04:00
Don Williams
d3880758b2 Fixed qs-wallpaper qs-logout didn't work from rofi or binding 2026-03-16 04:17:28 -04:00
Don Williams
856ea7d37b Updated salutaions and URLs 2026-03-13 04:36:33 -04:00
Don Williams
0a3e015b22 Fixing formatting errors added guide on adding GNOME
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   README.md
	new file:   cheatsheets/add-gnome.md
2026-03-13 04:29:34 -04:00
dwilliams
60f11d70c3 Updated flake to test GPU detection 2026-03-02 04:40:33 -05:00
Don Williams
117b4c0039 Fixed issue in get gpu profile
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/scripts/zcli.nix
2026-03-02 04:31:02 -05:00
Don Williams
d10a9bc6de Fixed gpu profile detection code wasn't building for vm but for AMD
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/scripts/zcli.nix
2026-03-02 04:24:20 -05:00
Don Williams
39b8117fcf Updated flake and overlay to fix deno build issue
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.nix
	modified:   modules/core/overlays.nix
2026-03-02 04:09:26 -05:00
Don Williams
2ababcca8b Updated CHANGELOG 2026-02-26 15:31:18 -05:00
Don Williams
a9c573e59e Fixing GPU detection 2026-02-26 15:22:04 -05:00
dwilliams
0d2b750e37 Updated flake, fixed togglesplit binding 2026-02-26 15:15:21 -05:00
Don Williams
da962b3169 Merge branch 'development' into 'main'
Updated install script with newer AMD GPU support

See merge request Zaney/zaneyos!187
2026-02-24 18:26:18 -05:00
Don Williams
4f8d983ab3 Updated install script with newer AMD GPU support 2026-02-24 18:26:18 -05:00
dwilliams
a5c1fb2064 Updted flake, disabled zls, marksman 2026-02-19 19:44:38 -05:00
Don Williams
bd7e402430 Updated CHANGELOG 2026-02-19 18:35:21 -05:00
Don Williams
5957df54fd Fixed GPU detection for newer AMD video cards
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/scripts/zcli.nix
2026-02-19 18:32:43 -05:00
Don Williams
e3c98cd633 Removed kill binding didn't work 2026-02-16 23:16:19 -05:00
dwilliams
abd97421cb Removed kill hyprland binding doesn't work 2026-02-16 23:15:06 -05:00
dwilliams
e5dac51840 Fixed hyprland kill binding 2026-02-16 23:13:34 -05:00
Don Williams
6a2df211f9 Added binding to kill Hyprland
```
 Force quit the compositor even if locked/frozen
"$modifier CONTROL, BACKSPACE, exec, killall -9 Hyprland"
```
I.e. hyprlock crash that doesn't recover

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

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/hyprland/binds.nix
2026-02-16 22:55:31 -05:00
Don Williams
6dc70452ef Removed hyprpanel not supported replaced by noctalia-shell
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	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:39:42 -05:00
Don Williams
3a7a54c208 Removed audacity, added overlay to disable libepub
Audacity and tumbler libepub call webgitkit to be built from source
(Takes hours on every rebuild)  EPUB files won't get thumbnails
All formats not impacted

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

 Changes to be committed:
	modified:   default/host-packages.nix
	modified:   zaneyos-24-vm/host-packages.nix
	modified:   zaneyos-oem/host-packages.nix
	modified:   ../modules/core/overlays.nix
2026-02-16 22:10:12 -05:00
Don Williams
11134e8cd2 Merge branch 'add-per-host-services' into 'main'
Add per host flatpak and services

See merge request Zaney/zaneyos!185
2026-02-13 13:30:30 -05:00
Jesse Stoltz
ce02cc2ead Add per host flatpak and services
Thank you for this.   I am going make one small change and add some commented out examples to make it easier for new users to understand the syntax
2026-02-13 13:30:30 -05:00
dwilliams
127ff7cf1e Updated flake 2026-02-08 14:20:43 -05:00
dwilliams
6583ee73ab Removed legacy keybind search, added retart.noctalia
SUPER SHIFT R restarts noctalia

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

 Changes to be committed:
	modified:   flake.lock
	modified:   modules/home/hyprland/binds.nix
        modified:   modules/home/scripts/default.nix
	new file:   modules/home/scripts/restart.noctalia
	new file:   modules/home/scripts/restart.noctalia.nix
2026-01-31 20:11:44 -05:00
Don Williams
e2bd8d74cb Updated CHANGELOG 2026-01-31 19:38:40 -05:00
Don Williams
1f55d99d33 Setting Display Mgr to TUI by default
Been seeing issues with SDDM  (recently with AMD)
Issue is black screen with cursor but TTY login
and starting hyprland works

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

 Changes to be committed:
	modified:   hosts/default/variables.nix
2026-01-31 19:32:44 -05:00
Don Williams
dc3b40e0e9 Updated CHANGELOG 2026-01-28 00:02:57 -05:00
Don Williams
e3cb8291c5 Disabling gnome in stylix breaks install
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/stylix.nix
2026-01-27 23:05:01 -05:00
Don Williams
a453eb5a8e Removed Zaney's old system
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	deleted:    hosts/nixstation/default.nix
	deleted:    hosts/nixstation/hardware.nix
	deleted:    hosts/nixstation/host-packages.nix
	deleted:    hosts/nixstation/variables.nix
2026-01-26 20:44:06 -05:00
Don Williams
0862894fa9 fixed install from branches set ver 2.6.0
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   README.es.md
	modified:   README.md
	modified:   modules/core/system.nix
2026-01-26 20:41:38 -05:00
Don Williams
3ec7b4cbc5 Updated CHANGELOG
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
2026-01-26 20:35:48 -05:00
dwilliams
1af724aba9 Removed noctalia systemd service - updated flake
Fixed bindngs for noctalia

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

 Changes to be committed:
	modified:   ../../../flake.lock
	modified:   binds.nix
	modified:   ../noctalia.nix
2026-01-26 20:21:16 -05:00
Don Williams
d1c93fe273 Fixing noctalia bindings - merge error 2026-01-26 19:14:31 -05:00
Don Williams
e94ac6f918 Merge branch 'development' into 'main'
Added fonts, added support for setting app defaults per host

See merge request Zaney/zaneyos!184
2026-01-26 18:59:17 -05:00
Don Williams
f612693b8f Added fonts, added support for setting app defaults per host 2026-01-26 18:59:17 -05:00
dwilliams
220d94c798 Updated flake 2026-01-23 23:01:34 -05:00
Don Williams
694cc69cc4 Added additional nerd fonts
nerd-fonts.iosevka-term
      nerd-fonts.lilex
      nerd-fonts.ubuntu
      nerd-fonts.jetbrains-mono
      nerd-fonts.fira-mono

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

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/core/fonts.nix
2026-01-23 09:54:11 -05:00
Don Williams
7901507f74 Merge branch 'fix/fix_hypridle_config' into 'main'
Add `systemdTarget` to hypridle config

See merge request Zaney/zaneyos!183
2026-01-23 09:37:23 -05:00
Kexuan Yang
4afc385c16 Add systemdTarget to hypridle config 2026-01-23 09:37:22 -05:00
Don Williams
90409769ad Edit README.es.md Updated dated, fixed discord link
Removed wiki links
2026-01-16 18:50:16 -05:00
Don Williams
278a680f15 Edit README.md Fixed date 2026-01-16 18:46:47 -05:00
Don Williams
b52b0b635e Edit README.md Removed other Wiki references 2026-01-16 18:42:16 -05:00
Don Williams
75a72df7ae Edit README.md Removed bad link to Wiki 2026-01-16 18:30:11 -05:00
Don Williams
7322a8ed85 Edit README.md upd discord and current release links 2026-01-16 18:27:36 -05:00
dwilliams
ae758cccef pck mardown caused dotnet to src build
Changed to multimarkdown in nixvim and helix
now markedown comes as wrapped pkg
The build for dotnet and dotnet-vmr would be hours

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

 Changes to be committed:
	modified:   flake.lock
	modified:   hosts/zaneyos-24-vm/variables.nix
	modified:   modules/home/editors/evil-helix.nix
	modified:   modules/home/editors/nixvim.nix
2026-01-15 17:01:52 -05:00
dwilliams
80f8bfb41a Updated flake
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
2026-01-07 20:48:58 -05:00
Don Williams
e9272827a8 Removed dup entry 2026-01-05 17:49:02 -05:00
Don Williams
8ab6f8d444 Fixed where noctalia-shell starts
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/hyprland/exec-once.nix
2026-01-05 17:48:20 -05:00
dwilliams
49f7fb1819 Updterd flake fixed noctalia-shell startup
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
       modified:   modules/home/hyprland/exec-once.nix
2026-01-05 17:09:53 -05:00
Don Williams
0c443c1efb Fixed revision info
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   FAQ.es.md
	modified:   FAQ.md
        modified:   modules/core/system.nix
2026-01-05 17:01:11 -05:00
Don Williams
d26b8450fa Disabled noctalia-shell systemd service - remmaped bindings
Starting from systemd loaded older revison of noctalia-shell
Fixed the bindings to properly call functions
noctalia-shell is now started from Hyprland exec-once

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

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/core/system.nix
	modified:   modules/home/hyprland/binds.nix
	modified:   modules/home/hyprland/exec-once.nix
	modified:   modules/home/noctalia.nix
2026-01-05 16:55:39 -05:00
Don Williams
6740674304 Merge branch 'noctalia-fix' into 'main'
Fixed systemd service for noctalia & newline in exec-once.nix

See merge request Zaney/zaneyos!182
2026-01-05 07:28:48 -05:00
Don Williams
6f408c9732 Fixed systemd service for noctalia & newline in exec-once.nix 2026-01-05 07:28:48 -05:00
Don Williams
1eaa3e3e36 Fixing syntax error in waybar file 2026-01-04 17:03:14 -05:00
Don Williams
d207b2481f Revert "fix: remove stray closing paren in waybar-jwt-catppuccin.nix"
This reverts commit 3f9126b8e8.
2026-01-04 17:02:23 -05:00
Don Williams
3f9126b8e8 fix: remove stray closing paren in waybar-jwt-catppuccin.nix
Co-Authored-By: Warp <agent@warp.dev>
2026-01-04 17:00:00 -05:00
Don Williams
8011d85dc4 Updated CHANGELOG on dpms change 2026-01-01 01:09:01 -05:00
Don Williams
3f13aed775 Keypress to wake up from DPMS was disable now enabled
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/hyprland/hyprland.nix
2026-01-01 01:07:49 -05:00
dwilliams
ed3883a36c Updated flake
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
2025-12-31 01:50:17 -05:00
Don Williams
5e815311f8 removed extra noctalia-shell startup
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/hyprland/exec-once.nix
2025-12-29 09:31:56 -05:00
Don Williams
b1188be273 Enabled amd-nvidia-hybrid support
Updated install script to support that config

I don't have a system to test with

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

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   flake.nix
	modified:   install-zaneyos.sh
	modified:   modules/drivers/nvidia-amd-hybrid.nix
	renamed:    profiles/amd-hybrid/default.nix -> profiles/amd-nvidia-hybrid/default.nix
2025-12-28 08:21:00 -05:00
Don Williams
1560ddd95d Merge branch 'development' into 'main'
Created service for noctalia-shell updated nixvim

See merge request Zaney/zaneyos!177
2025-12-26 20:34:18 -05:00
Don Williams
f2dfddff6a Created service for noctalia-shell updated nixvim 2025-12-26 20:34:18 -05:00
Don Williams
7ed6c34777 Merge branch 'development' into 'main'
Created service for noctalia-shell

See merge request Zaney/zaneyos!176
2025-12-26 18:36:38 -05:00
Don Williams
cdec0772a5 Created service for noctalia-shell 2025-12-26 18:36:38 -05:00
dwilliams
ab4cdf6368 Updated flake
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
2025-12-24 21:23:48 -05:00
Don Williams
c8bc71c34d Merge branch 'nixvim' into 'main'
Changed nixvim to blink-cmp

See merge request Zaney/zaneyos!168
2025-12-21 09:01:36 -05:00
Don Williams
248f497ae0 Changed nixvim to blink-cmp 2025-12-21 09:01:36 -05:00
Don Williams
6266205508 Updated CHANGELOG 2025-12-21 00:47:35 -05:00
Don Williams
ef354742c6 Merge branch 'zos-next' into 'main'
Merging zos-next to main -- zcli fix

See merge request Zaney/zaneyos!167
2025-12-21 00:43:38 -05:00
Don Williams
9bc44bb149 Merging zos-next to main -- zcli fix 2025-12-21 00:43:38 -05:00
131 changed files with 4926 additions and 3644 deletions

View file

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

View file

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

58
FAQ.md
View file

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

View file

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

View file

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

View file

@ -54,8 +54,6 @@ 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

@ -1,25 +0,0 @@
# 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.

58
cheatsheets/add-gnome.md Normal file
View file

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

View file

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

View file

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

View file

@ -50,7 +50,7 @@ Lista de aplicaciones/comandos que se lanzan al iniciar Hyprland.
# ...
exec-once = [
# ...
"DropTerminal --spawn-only" # precarga terminal desplegable (Super+Shift+T)
"pypr &" # pyprland para terminal desplegable SUPERSHIFT + 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 = [
# ...
"DropTerminal --spawn-only" # preload dropdown terminal (Super+Shift+T)
"pypr &" # pyprland for drop down term SUPERSHIFT + T
];
# ...
```
@ -83,7 +83,7 @@ If you want to start the `copyq` application every time you log in, you can add
# ...
exec-once = [
# ...
"DropTerminal --spawn-only" # preload dropdown terminal (Super+Shift+T)
"pypr &" # pyprland for drop down term SUPERSHIFT + T
"copyq"
];
# ...

283
flake.lock generated
View file

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

View file

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

View file

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

View file

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

View file

@ -1,148 +1,148 @@
_: {
# 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";
{
# Git Configuration ( For Pulling Software Repos )
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 = "my-hostname";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "tui";
gpuProfile = "vm";
# 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;
# Set Display Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "sddm";
# Python development tools are included by default
# 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";
# Hyprland Settings
# Examples:
# extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1";
# extraMonitorSettings = "monitor = HDMI-A-1,1920x1080@60,auto,1";
# You can configure multiple monitors.
# Inside the quotes, create a new line for each monitor.
extraMonitorSettings = "
monitor = Virtual-1,1920x1080@60,auto,1
";
# 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
# };
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
# 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";
# Bootloader selection
# bootLoader = "systemd-boot"; # or "grub"
# grubMirroredBoots = [
# { path = "/boot"; devices = [ "/dev/disk/by-uuid/XXXX" ]; }
# { path = "/boot2"; devices = [ "/dev/disk/by-uuid/YYYY" ]; }
# ];
# 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 alternate File Manager
thunarEnable = true;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
# 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";
}

View file

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

View file

@ -1,172 +1,149 @@
_: {
# 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";
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "dwilliams";
gitEmail = "don.e.williams@gmail.com";
hostName = "zaneyos-24-vm";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "tui";
enableSmartD = false;
# 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;
gpuProfile = "vm";
# Python development tools
pythonEnable = false;
# 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 = "
# 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 = "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 = "google-chrome";
# Default applications for this host (written to ~/.config/mimeapps.list)
# Uncomment and adjust to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Text files
# "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop
# # Images and video
# "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop
# "video/mp4" = ["mpv.desktop"]; # or vlc.desktop
# # Folders (file manager)
# "inode/directory" = ["thunar.desktop"]; # Thunar; or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop
# };
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
# Setting it here does not enable it. Kitty is installed by default
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# Enable NFS
enableNFS = true;
# Enable NFS
enableNFS = true;
# Enable Printing Support
printEnable = false;
# Enable Printing Support
printEnable = false;
# Enable Thunar GUI File Manager
# Yazi is default File Manager
thunarEnable = true;
# Enable Thunar GUI File Manager
# Yazi is default File Manager
thunarEnable = true;
# Themes, waybar and animation.
# Only uncomment your selection
# The others much be commented out.
# Themes, waybar and animation.
# Only uncomment your selection
# The others much be commented out.
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
#stylixImage = ../../wallpapers/Rainnight.jpg;
stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Waybar
# Available Options:
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Waybar
# Available Options:
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
}

View file

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

View file

@ -1,41 +0,0 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/52c176b4-8de0-4607-b52f-8ca391f8b469";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6EA3-CBC7";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/mnt/nas" = {
device = "192.168.40.11:/volume1/DiskStation54TB";
fsType = "nfs";
};
swapDevices = [];
security.sudo.wheelNeedsPassword = false;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

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

View file

@ -1,141 +0,0 @@
_: {
# 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,6 +2,5 @@
imports = [
./hardware.nix
./host-packages.nix
./variables.nix
];
}

View file

@ -1,141 +1,129 @@
_: {
# 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";
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Don Williams";
gitEmail = "don.e.williams@gmail.com";
gpuProfile = "vm";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI
# SDDM background is set with stylixImage
displayManager = "sddm";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI
# SDDM background is set with stylixImage
displayManager = "sddm";
# 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;
# 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";
# Python development tools
pythonEnable = false;
# Hyprland Settings
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
# P10K or starship prompt
userPrompt = "starship";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Hyprland Settings
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# 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";
# Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
# Enable NFS
enableNFS = true;
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";
consoleKeyMap = "us";
# Enable Printing Support
printEnable = false;
# 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 Thunar GUI File Manager
thunarEnable = true;
# Enable NFS
enableNFS = 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;
# Enable Printing Support
printEnable = false;
# 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;
# Enable Thunar GUI File Manager
thunarEnable = true;
# 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 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 network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
};
# Set Waybar
# Available options:
waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
animChoice = ../../modules/home/hyprland/animations-end4.nix;
#animChoice = ../../modules/home/hyprland/animations-def.nix;
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
# Set network hostId if required (needed for zfs)
# Otherwise leave as-is
hostId = "5ab03f50";
}

View file

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

View file

@ -1,63 +0,0 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# --- Btrfs Mirror (RAID1) Configuration ---
# Using UUID ensures the mirror mounts even if /dev/sda fails
fileSystems."/" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@" "compress=zstd" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@home" "compress=zstd" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@nix" "compress=zstd" "noatime" ];
};
fileSystems."/.snapshots" =
{ device = "/dev/disk/by-uuid/ef8c5c09-a94b-4e58-91c6-b1a3ebe0bf51";
fsType = "btrfs";
options = [ "subvol=@snapshots" "compress=zstd" ];
};
# --- Mirrored EFI Partitions ---
# Added 'nofail' so the VM boots even if one virtual disk is missing
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0C60-CCDC";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" "nofail" ];
};
fileSystems."/boot2" =
{ device = "/dev/disk/by-uuid/0C61-7F7C";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" "nofail" ];
};
fileSystems."/mnt/nas" =
{ device = "192.168.40.11:/volume1/DiskStation54TB";
fsType = "nfs";
options = [ "rw" "bg" "tcp" "_netdev" ];
};
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

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

View file

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

View file

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

View file

@ -28,22 +28,19 @@ print_header() {
echo -e "${GREEN}╚═══════════════════════════════════════════════════════════════════════╝${NC}"
}
# Function to print a configuration summary (robust formatting)
# Function to print a configuration summary
print_summary() {
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}"
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}"
}
# Function to print an error message
@ -90,14 +87,6 @@ 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
@ -233,16 +222,47 @@ Please type out your choice: " profile
echo -e "${GREEN}Selected GPU profile: $profile${NC}"
fi
print_header "Repository Setup"
print_header "⚠️ CRITICAL WARNING - Existing ZaneyOS Detected"
backupname=$(date +"%Y-%m-%d-%H-%M-%S")
if [ -d "$HOME/zaneyos" ]; then
echo -e "${YELLOW}Backing up existing zaneyos-${backupname}${NC}"
mv "$HOME/zaneyos" "$HOME/zaneyos-${backupname}"
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}"
fi
print_header "Cloning ZaneyOS Repository"
git clone https://gitlab.com/zaney/zaneyos.git -b zos-next-grub --depth=1 ~/zaneyos
git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
cd ~/zaneyos || exit 1
print_header "Git Configuration"
@ -360,8 +380,7 @@ echo ""
print_summary "$hostName" "$profile" "$installusername" "$timezone" "$keyboardLayout" "$keyboardVariant" "$consoleKeyMap"
echo ""
echo -e "${YELLOW}Please review the configuration above.${NC}"
printf "%b" "${YELLOW}Continue with installation? (Y/N): ${NC}"
read -r REPLY
read -p "$(echo -e "${YELLOW}Continue with installation? (Y/N): ${NC}")" -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo -e "${RED}Installation cancelled.${NC}"
@ -372,45 +391,48 @@ 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 safely without removing existing hosts
# Update flake.nix (simple pattern replacements that work)
# Create backup first, before any changes
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
# 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)
# Update timezone in system.nix
cp ./modules/core/system.nix ./modules/core/system.nix.bak
python3 ./scripts/update_timezone.py ./modules/core/system.nix "$timezone" || {
print_error "Failed to update time.timeZone in modules/core/system.nix"
exit 1
}
awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak >./modules/core/system.nix
rm ./modules/core/system.nix.bak
# Update variables in host file; support both old style and new zaneyos options block
# Update variables in host file (do all keys in one pass to avoid quoting issues)
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
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
}
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
rm ./hosts/$hostName/variables.nix.bak
echo "Configuration files updated successfully!"
@ -422,22 +444,21 @@ git add .
git config --global --unset-all user.name
git config --global --unset-all user.email
print_header "Generating Hardware Configuration"
print_header "Generating Hardware Configuration -- Ignore ERROR: cannot access /bin"
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"
printf "%s" "Ready to run initial build? [y/N]: "
read -r REPLY
if ! [[ "$REPLY" =~ ^[Yy]$ ]]; then
read -p "Ready to run initial build? (Y/N): " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo -e "${RED}Build cancelled.${NC}"
exit 1
fi
# Build using the selected HOST (GPU profile is configured inside the host files)
sudo nixos-rebuild boot --flake ~/zaneyos#${hostName}
sudo nixos-rebuild boot --flake ~/zaneyos/#${profile}
# Check the exit status of the last command (nixos-rebuild)
if [ $? -eq 0 ]; then

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,9 +1,13 @@
{
config,
host,
lib,
...
}: {
config = lib.mkIf (config.zaneyos.displayManager == "tui") {
}: let
# Import the host-specific variables.nix
vars = import ../../hosts/${host}/variables.nix;
useLy = vars.displayManager == "tui";
in {
config = lib.mkIf useLy {
# 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 (config.zaneyos) hostName hostId;
inherit (import ../../hosts/${host}/variables.nix) hostId;
in {
networking = {
inherit hostName;
inherit hostId;
hostName = "${host}";
hostId = hostId;
networkmanager.enable = true;
timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
firewall = {

View file

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

View file

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

View file

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

View file

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

View file

@ -1,16 +0,0 @@
{
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,6 +3,7 @@
pkgs,
config,
lib,
host,
...
}: let
foreground = config.stylix.base16Scheme.base00;
@ -61,33 +62,33 @@
};
};
in {
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;
};
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;
};
};
};
# 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,6 +1,4 @@
{config, ...}: let
inherit (config.zaneyos) enableSmartD;
in {
{profile, ...}: {
# Services to start
services = {
upower.enable = true; # noctalia shell battery
@ -22,7 +20,10 @@ in {
gnome.gnome-keyring.enable = true;
smartd = {
enable = enableSmartD;
enable =
if profile == "vm"
then false
else true;
autodetect = true;
};
pipewire = {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,7 +1,18 @@
{zaneyos, ...}: let
inherit (zaneyos) barChoice waybarChoice;
neovimConfig = zaneyos.neovimConfig or "nixvim";
{host, ...}: let
vars = import ../../hosts/${host}/variables.nix;
inherit
(vars)
alacrittyEnable
barChoice
ghosttyEnable
tmuxEnable
waybarChoice
weztermEnable
vscodeEnable
helixEnable
doomEmacsEnable
antigravityEnable
;
# Select bar module based on barChoice
barModule =
if barChoice == "noctalia"
@ -10,57 +21,88 @@
in {
imports =
[
./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
./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
]
++ (
if neovimConfig == "nixvim"
then [./editors/nixvim.nix]
else [./editors/nvf.nix]
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 []
);
}

View file

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

View file

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

View file

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

View file

@ -1,82 +1,88 @@
{
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
];
{pkgs, ...}: let
enableEvilHelix = true; # Set to true to enable the configuration
in {
home.packages = with pkgs; (
if enableEvilHelix
then [
evil-helix
cmake-language-server
jsonnet-language-server
luaformatter
lua-language-server
#marksman # causes dotnet and dotnet-swr to build which takes hours
multimarkdown
taplo
nil
jq-lsp
vscode-langservers-extracted
bash-language-server
awk-language-server
vscode-extensions.llvm-vs-code-extensions.vscode-clangd
clang-tools
docker-compose-language-service
docker-compose
docker-language-server
typescript-language-server
]
else []
);
home.file.".config/helix/languages.toml".text = ''
[language-server.nil]
command = "nil"
home.file.".config/helix/languages.toml".text =
if enableEvilHelix
then ''
[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"
'';
[language-server.markdown]
command = "marksman"
''
else "";
home.file.".config/helix/config.toml".text = ''
theme = "catppuccin_mocha"
#theme = "ao"
home.file.".config/helix/config.toml".text =
if enableEvilHelix
then ''
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"
'';
[editor.inline-diagnostics]
cursor-line = "hint"
other-lines = "hint"
''
else "";
}

View file

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

View file

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

View file

@ -133,15 +133,4 @@
];
};
};
# 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

@ -1,170 +0,0 @@
{
"$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

@ -1,119 +0,0 @@
{
"$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

@ -1,128 +0,0 @@
{
"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

@ -1,106 +0,0 @@
{
"$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

@ -1,104 +0,0 @@
{
"$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

@ -1,118 +0,0 @@
{
"$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,4 +1,8 @@
_: {
{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,4 +1,8 @@
_: {
{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,4 +1,8 @@
_: {
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
;
in {
wayland.windowManager.hyprland.settings = {
animations = {
enabled = true;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,9 +1,9 @@
{
config,
inputs,
pkgs,
inputs,
username,
zaneyos,
profile,
...
}: {
home.packages = [
@ -19,15 +19,9 @@
(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 inputs pkgs username;
inherit pkgs inputs;
inherit username;
})
(import ./web-search.nix {inherit pkgs;})
# Cheatsheets viewer + parser
@ -39,8 +33,8 @@
(import ./qs-vid-wallpapers-apply.nix {inherit pkgs;})
(import ./qs-vid-wallpapers-watchdog.nix {inherit pkgs;})
(import ./qs-wallpapers.nix {inherit pkgs;})
(import ./qs-wallpapers-apply.nix {inherit inputs pkgs;})
(import ./qs-wallpapers-restore.nix {inherit inputs pkgs;})
(import ./qs-wallpapers-apply.nix {inherit pkgs inputs;})
(import ./qs-wallpapers-restore.nix {inherit pkgs inputs;})
(import ./qs-wlogout.nix {inherit pkgs;})
(import ./qs-docs.nix {inherit pkgs;})
(import ./docs-parser.nix {inherit pkgs;})
@ -48,9 +42,9 @@
(import ./hyprland-change-layout.nix {inherit pkgs;})
(import ./launch-nwg-menu.nix {inherit pkgs;})
(import ./hyprland-dock.nix {inherit pkgs;})
(import ./restart.noctalia.nix {inherit pkgs;})
(import ./zcli.nix {
inherit pkgs;
inherit zaneyos;
inherit pkgs profile;
backupFiles = [
".config/mimeapps.list.backup"
];

View file

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

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

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

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

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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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